Fix:gui_gtk:Update .po.in files with new msgids for GTK menu items, because of previous commit (GTK menu items now contain a "_").

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

54 files changed, 10236 insertions, 1723 deletions

diff --git a/po/af.po.in b/po/af.po.in
index 475fda731..b7d99ef01 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 20:36+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Loop vanaf bron gids\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "verander '%s' na '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nulste"
 
@@ -47,6 +49,7 @@ msgstr "vyfde"
 msgid "sixth"
 msgstr "sesde"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nulste uitgang"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "na %d meter"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "na %d meter"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "na %d.%d kilometer"
 
 #, 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] "een kilometer"
@@ -167,18 +198,18 @@ msgstr "Gaan kortliks in die sirkel in"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "In %s, gaan in die sirkel in"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Verlaat die sirkel by die %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "verlaat dan die sirkel by die %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Verlaat die sirkel by die %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Volg die pad vir die volgende %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Boekmerk"
 msgid "Destination"
 msgstr "Bestemming"
 
-msgid "Display"
+#. 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 "Skerm"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Roete"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Voorige bestemmings"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Boekmerke"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kaart"
+
+msgid "_Layout"
 msgstr "Uitleg"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Skatting"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Voertuig"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "ZoomUit"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "ZoomIn"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Herbereken"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Inligting"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stop Navigasie"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Toets"
 msgid "_Quit"
 msgstr "_Sluit af"
 
-msgid "Cursor"
-msgstr "Plekaanduier"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Koppel aan Pad"
 
-msgid "Northing"
-msgstr "Draai kaart noord"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Padkaart"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Outozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Volskerm"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Terug"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Boekmerke"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Boekmerk %s"
 
+msgid "Former Destinations"
+msgstr "Voorige bestemmings"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Huis Nommer"
 
+msgid "Layout"
+msgstr "Uitleg"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kaarte"
 
@@ -1508,18 +1603,30 @@ msgstr "Wys satelliet inligting"
 msgid "Show NMEA data"
 msgstr "Wys NMEA data"
 
+msgid "Vehicle"
+msgstr "Voertuig"
+
 msgid "Rules"
 msgstr "Reëls"
 
 msgid "Lock on road"
 msgstr "Koppel aan pad"
 
+msgid "Northing"
+msgstr "Draai kaart noord"
+
 msgid "Map follows Vehicle"
 msgstr "Kaart volg voertuig"
 
 msgid "Message"
 msgstr "Boodskap"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Kaart punt"
+
+msgid "Vehicle Position"
+msgstr "Voertuig posisie"
+
 msgid "Main menu"
 msgstr "Hoofkieslys"
 
@@ -1559,12 +1683,20 @@ msgstr "Instellings"
 msgid "Tools"
 msgstr "Gereedskap"
 
+msgid "Route"
+msgstr "Roete"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Aksies"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Verlaat"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "Stop\n"
 "Navigasie"
 
+msgid "Display"
+msgstr "Skerm"
+
+msgid "Fullscreen"
+msgstr "Volskerm"
+
 msgid "Window Mode"
 msgstr "Venster Modus"
 
 msgid "Description"
 msgstr "Beskrywing"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "Kaart punt"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Voertuig posisie"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "In %s, gaan in die sirkel in"
+
+#~ msgid "Cursor"
+#~ msgstr "Plekaanduier"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometer"
diff --git a/po/ar.po.in b/po/ar.po.in
index 83b8ad7c9..300d995cc 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-02-01 17:37+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr "جاري التنفيذ من المجلد المصدر\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "وضع حالة  '%s' إلى '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "(الرقم) صفر"
 
@@ -48,6 +50,7 @@ msgstr "الخامس"
 msgid "sixth"
 msgstr "السادس"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "المخرج ذو الرقم صفر"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "بعد %d متر"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d متر"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "بعد %d متر"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d كلم"
 
@@ -94,6 +113,26 @@ msgid "in %d.%d kilometers"
 msgstr "بعد %d%d كلم"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "كلم واحد"
@@ -176,18 +215,18 @@ msgstr "قريباً الدخول إلى المستديرة"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "بعد %s ، أدخل المسستديرة"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "أخرج من المستديرة عند الــ  %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "ثم أخرج من المستديرة عند الــ%s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "أخرج من المستديرة عند الــ  %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "تابع الطريق لل- %s التالية"
 
@@ -1309,40 +1348,59 @@ msgstr "إشارة مرجعية"
 msgid "Destination"
 msgstr "الهدف"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "الطريق"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "الأهداف السابقة"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "إشارات مرجعية"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "الخريطة"
+
+msgid "_Layout"
 msgstr "التصميم"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "الإسقاط"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "وسيلة التنقل"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "صغّر الروئية"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "كبّر الروئية"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "إعادة الحساب"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "معلومات"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "قف الملاحة"
 
 msgid "Test"
@@ -1351,19 +1409,34 @@ msgstr "اختبار"
 msgid "_Quit"
 msgstr "_إنهاء"
 
-msgid "Cursor"
-msgstr "المزلاق"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "إقفال على الطريق"
 
-msgid "Northing"
-msgstr "شمالي دائم"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "سجل خريطة الطريق"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "تكبير/تصغير تلقائي"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "ملء الشاشة"
 
 msgid "Data"
@@ -1427,6 +1500,7 @@ msgstr "السابق"
 msgid "Add Bookmark"
 msgstr "أضف إشارة مرجعية"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1466,6 +1540,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "إشارات مرجعية"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1473,9 +1551,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "علّم %s كإشارة مرجعية"
 
+msgid "Former Destinations"
+msgstr "الأهداف السابقة"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "رقم المنزل"
 
+msgid "Layout"
+msgstr "التصميم"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "الخرائط"
 
@@ -1517,18 +1620,30 @@ msgstr "أعرض حالة القمر الإسطناعي"
 msgid "Show NMEA data"
 msgstr "أعرض المعطيات NMEA"
 
+msgid "Vehicle"
+msgstr "وسيلة التنقل"
+
 msgid "Rules"
 msgstr "القواعد"
 
 msgid "Lock on road"
 msgstr "إقفال على الطريق"
 
+msgid "Northing"
+msgstr "شمالي دائم"
+
 msgid "Map follows Vehicle"
 msgstr "الخريطة تتبع وسيلة التنقل"
 
 msgid "Message"
 msgstr "الرسالة"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "وصف الطريق"
 
@@ -1552,6 +1667,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "النقطة على الخريطة"
+
+msgid "Vehicle Position"
+msgstr "موقع وسيلة التنقل"
+
 msgid "Main menu"
 msgstr "اللائحة الرئيسية"
 
@@ -1568,12 +1700,20 @@ msgstr "الإعدادات"
 msgid "Tools"
 msgstr "العدة"
 
+msgid "Route"
+msgstr "الطريق"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "أفعال"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "أخرج"
 
@@ -1582,21 +1722,57 @@ msgid ""
 "Navigation"
 msgstr "قفّ"
 
+msgid "Display"
+msgstr "المظهار"
+
+msgid "Fullscreen"
+msgstr "ملء الشاشة"
+
 msgid "Window Mode"
 msgstr "نمط النافذة"
 
 msgid "Description"
 msgstr "الوصف"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "خيل/فرس"
 
-msgid "Map Point"
-msgstr "النقطة على الخريطة"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "موقع وسيلة التنقل"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "بعد %s ، أدخل المسستديرة"
+
+#~ msgid "Cursor"
+#~ msgstr "المزلاق"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d كلم"
diff --git a/po/ast.po.in b/po/ast.po.in
index 5acbad2b3..bd3321129 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-21 17:35+0000\n"
 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
 "Language-Team: Asturian <ast@li.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Executando dende'l direutoriu fonte.\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "Conseñando '%s' como '%s'.\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "cero-ésimu"
 
@@ -47,6 +49,7 @@ msgstr "quintu"
 msgid "sixth"
 msgstr "sestu"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "cero-ésima salida"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "en %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "en %d metros"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d,%d quilómetros"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "en %d,%d quilómetros"
 
 #, 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 quilómetru"
@@ -167,18 +198,18 @@ msgstr "Entre ceo na rotonda"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "En %s, entre na rotonda"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Dexe la rotonda pola %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "llueu dexe la rotonda pola %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Dexe la rotonda pola %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga pela carretera los siguientes %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Marcador"
 msgid "Destination"
 msgstr "Destín"
 
-msgid "Display"
+#. 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 "Amosar"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Ruta"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinos anteriores"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Marcadores"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Disposición"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Proyeición"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vehiculu"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Amenorgar"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Aumentar"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalcular"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Parar navegación"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Probar"
 msgid "_Quit"
 msgstr "_Colar"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Arcoxar carretera"
 
-msgid "Northing"
-msgstr "Llatitú"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Llibru de ruta"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Pantalla completa"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Atrás"
 msgid "Add Bookmark"
 msgstr "Amestar marcador"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Amestar carpeta de marcadores"
 
@@ -1457,6 +1523,10 @@ msgstr "Apegar marcador"
 msgid "Delete Bookmark"
 msgstr "Desaniciar marcador"
 
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Apegar marcador"
 
@@ -1464,9 +1534,34 @@ msgstr "Apegar marcador"
 msgid "Bookmark %s"
 msgstr "Marcador %s"
 
+msgid "Former Destinations"
+msgstr "Destinos anteriores"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Númberu de portal"
 
+msgid "Layout"
+msgstr "Disposición"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapes"
 
@@ -1508,18 +1603,30 @@ msgstr "Amosar estáu de satélite"
 msgid "Show NMEA data"
 msgstr "Amosar datos NMEA"
 
+msgid "Vehicle"
+msgstr "Vehiculu"
+
 msgid "Rules"
 msgstr "Regles"
 
 msgid "Lock on road"
 msgstr "Arcoxar a carretera"
 
+msgid "Northing"
+msgstr "Llatitú"
+
 msgid "Map follows Vehicle"
 msgstr "El mapa sigue al vehículu"
 
 msgid "Message"
 msgstr "Mensax"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descripción de ruta"
 
@@ -1543,6 +1650,23 @@ msgstr "Y tou l'equipu de Navit"
 msgid "members and contributors."
 msgstr "miembros y collaboradores."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Puntu del mapa"
+
+msgid "Vehicle Position"
+msgstr "Posición del vehículu"
+
 msgid "Main menu"
 msgstr "Menú principal"
 
@@ -1559,12 +1683,20 @@ msgstr "Axustes"
 msgid "Tools"
 msgstr "Ferramientes"
 
+msgid "Route"
+msgstr "Ruta"
+
 msgid "About"
 msgstr "Tocante a"
 
 msgid "Actions"
 msgstr "Aiciones"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Colar"
 
@@ -1575,17 +1707,54 @@ msgstr ""
 "Parar\n"
 "Navegación"
 
+msgid "Display"
+msgstr "Amosar"
+
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
 msgid "Window Mode"
 msgstr "Mou ventana"
 
 msgid "Description"
 msgstr "Descripción"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "caballu"
 
-msgid "Map Point"
-msgstr "Puntu del mapa"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Posición del vehículu"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "En %s, entre na rotonda"
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
diff --git a/po/bg.po.in b/po/bg.po.in
index bbdd32abe..75cb7c4fb 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 20:36+0000\n"
 "Last-Translator: Alex Stanev <alex@stanev.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "нулев"
 
@@ -47,6 +49,7 @@ msgstr "пети"
 msgid "sixth"
 msgstr "шести"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "няма изход"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "след %d м"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d метра"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "след %d метра"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "след %d.%d километра"
 
 #, 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] "един километър"
@@ -167,18 +198,18 @@ msgstr "Скоро навлизате в кръгово"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "След %s влезте в кръговото"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Излезте от кръговото на %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "след това излезте от кръговото на %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Излезте от кръговото на %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Следвайте пътя през следващите %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Отметка"
 msgid "Destination"
 msgstr "Местоназначение"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "Маршрут"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Предишни Местоназначения"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Отметки"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Карта"
+
+msgid "_Layout"
 msgstr "Изглед"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Проекция"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Превозно средство"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Отдалечи"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Приближи"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Преизчисляване"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Информация"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Спри Навигацията"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Тест"
 msgid "_Quit"
 msgstr "_Изход"
 
-msgid "Cursor"
-msgstr "Курсор"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Придържай към пътя"
 
-msgid "Northing"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Autozoom"
+msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Roadbook"
+msgstr "Пътна книга"
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Цял екран"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Назад"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Отметки"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Отметка %s"
 
+msgid "Former Destinations"
+msgstr "Предишни Местоназначения"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr "Изглед"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Карти"
 
@@ -1508,18 +1603,30 @@ msgstr "Покажи състояние на Сателити"
 msgid "Show NMEA data"
 msgstr "Покажи NMEA Данни"
 
+msgid "Vehicle"
+msgstr "Превозно средство"
+
 msgid "Rules"
 msgstr "Правила"
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr "Картата следва Автомобила"
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Точка на карта"
+
+msgid "Vehicle Position"
+msgstr "Позиция на автомобил"
+
 msgid "Main menu"
 msgstr "Главно меню"
 
@@ -1559,12 +1683,20 @@ msgstr "Настройки"
 msgid "Tools"
 msgstr "Инструменти"
 
+msgid "Route"
+msgstr "Маршрут"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Действия"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Излез"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "Спри\n"
 "Навигацията"
 
+msgid "Display"
+msgstr "Показване"
+
+msgid "Fullscreen"
+msgstr "Цял екран"
+
 msgid "Window Mode"
 msgstr "Режим Прозорец"
 
 msgid "Description"
 msgstr ""
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "Точка на карта"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Позиция на автомобил"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "След %s влезте в кръговото"
+
+#~ msgid "Cursor"
+#~ msgstr "Курсор"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d километра"
diff --git a/po/ca.po.in b/po/ca.po.in
index f364ab87b..f9ba2d933 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 09:31+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "S'està executant des del directori arrel\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "s'està establint '%s' a '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -47,6 +49,7 @@ msgstr "cinquena"
 msgid "sixth"
 msgstr "sisena"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "d'aquí a %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metres"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "d'aquí a %d metres"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d,%d quilòmetres"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "d'aquí a %d,%d quilòmetres"
 
 #, 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 quilòmetre"
@@ -167,18 +198,18 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Deixeu la rotonda a la %s"
-
-#, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "aleshores deixeu la rotonda a la %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Deixeu la rotonda a la %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
@@ -1300,40 +1331,59 @@ msgstr ""
 msgid "Destination"
 msgstr "Destinació"
 
-msgid "Display"
+#. 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 "Pantalla"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Ruta"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinacions anteriors"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Disposició"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projecció"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vehicle"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Allunya"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Apropa"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalcula"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informació"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Atura la navegació"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Prova"
 msgid "_Quit"
 msgstr "_Surt"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
+msgstr ""
+
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Zoom automàtic"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Pantalla completa"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Enrere"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Afegeix %s a les adreces d'interès"
 
+msgid "Former Destinations"
+msgstr "Destinacions anteriors"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Número de casa/portal"
 
+msgid "Layout"
+msgstr "Disposició"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapes"
 
@@ -1508,18 +1603,30 @@ msgstr "Mostra l'estat del satèl·lit"
 msgid "Show NMEA data"
 msgstr "Mostra les dades NMEA"
 
+msgid "Vehicle"
+msgstr "Vehicle"
+
 msgid "Rules"
 msgstr "Regles"
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr "El mapa segueix el vehicle"
 
 msgid "Message"
 msgstr "Missatge"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descripció de la ruta"
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Punt del mapa"
+
+msgid "Vehicle Position"
+msgstr "Posició del vehicle"
+
 msgid "Main menu"
 msgstr "Menú principal"
 
@@ -1559,12 +1683,20 @@ msgstr "Configuració"
 msgid "Tools"
 msgstr "Eines"
 
+msgid "Route"
+msgstr "Ruta"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Accions"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Surt"
 
@@ -1575,17 +1707,51 @@ msgstr ""
 "Atura la\n"
 "Navegació"
 
+msgid "Display"
+msgstr "Pantalla"
+
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
 msgid "Window Mode"
 msgstr "Mode de la finestra"
 
 msgid "Description"
 msgstr "Descripció"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "cavall"
 
-msgid "Map Point"
-msgstr "Punt del mapa"
-
-msgid "Vehicle Position"
-msgstr "Posició del vehicle"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
diff --git a/po/cs.po.in b/po/cs.po.in
index 0da8f219e..fece8edcc 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-18 19:02+0000\n"
 "Last-Translator: Vladimír Burian <vladimir.burian@email.cz>\n"
 "Language-Team: Čeština\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Běží ze zdrojového adresáře\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavuji '%s' na '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nultý"
 
@@ -47,6 +49,7 @@ msgstr "pátý"
 msgid "sixth"
 msgstr "šestý"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nultý exit"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "za %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metrů"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "za %d metrů"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometrů"
 
@@ -93,6 +112,20 @@ msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrů"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometr"
@@ -169,18 +202,18 @@ msgstr "Brzy najeďte na kruhový objezd"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Za %s, najeďte na kruhový objezd"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Opusťte kruhový objezd na výjezdu %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "pak opusťte kruhový objezd na výjezdu %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Opusťte kruhový objezd na výjezdu %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte po další %s"
 
@@ -1302,40 +1335,59 @@ msgstr "Záložka"
 msgid "Destination"
 msgstr "Cíl"
 
-msgid "Display"
+#. 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 "Zobrazit"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Trasa"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Minulé cíle"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Záložky"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Rozvržení"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projekce"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vozidlo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zmenšit"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zvětšit"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Přepočítat"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informace"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Přestat navigovat"
 
 msgid "Test"
@@ -1344,19 +1396,34 @@ msgstr "Vyzkoušet"
 msgid "_Quit"
 msgstr "_Konec"
 
-msgid "Cursor"
-msgstr "Kurzor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Jet jen po silnici"
 
-msgid "Northing"
-msgstr "Severně"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Itinerář"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Celá obrazovka"
 
 msgid "Data"
@@ -1420,6 +1487,7 @@ msgstr "Zpět"
 msgid "Add Bookmark"
 msgstr "Přidat značku"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Přidat složku záložek"
 
@@ -1459,6 +1527,10 @@ msgstr "Vložit záložku"
 msgid "Delete Bookmark"
 msgstr "Smazat záložku"
 
+msgid "Bookmarks"
+msgstr "Záložky"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Vložit záložku"
 
@@ -1466,9 +1538,34 @@ msgstr "Vložit záložku"
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
+msgid "Former Destinations"
+msgstr "Minulé cíle"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Číslo domu"
 
+msgid "Layout"
+msgstr "Rozvržení"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapy"
 
@@ -1510,18 +1607,30 @@ msgstr "Ukázat stav satelitu"
 msgid "Show NMEA data"
 msgstr "Ukázat NMEA data"
 
+msgid "Vehicle"
+msgstr "Vozidlo"
+
 msgid "Rules"
 msgstr "Pravidla"
 
 msgid "Lock on road"
 msgstr "Uchytit na cestu"
 
+msgid "Northing"
+msgstr "Severně"
+
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
 msgid "Message"
 msgstr "Zpráva"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Popis trasy"
 
@@ -1545,6 +1654,23 @@ msgstr "A další z Navit týmu"
 msgid "members and contributors."
 msgstr "členové a přispívající"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Bod na mapě"
+
+msgid "Vehicle Position"
+msgstr "Poloha vozidla"
+
 msgid "Main menu"
 msgstr "Hlavní menu"
 
@@ -1561,12 +1687,20 @@ msgstr "Nastavení"
 msgid "Tools"
 msgstr "Nástroje"
 
+msgid "Route"
+msgstr "Trasa"
+
 msgid "About"
 msgstr "O programu"
 
 msgid "Actions"
 msgstr "Akce"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Konec"
 
@@ -1577,21 +1711,57 @@ msgstr ""
 "Ukonči\n"
 "Navigaci"
 
+msgid "Display"
+msgstr "Zobrazit"
+
+msgid "Fullscreen"
+msgstr "Celá obrazovka"
+
 msgid "Window Mode"
 msgstr "V okně"
 
 msgid "Description"
 msgstr "Popis"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "kůň"
 
-msgid "Map Point"
-msgstr "Bod na mapě"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Poloha vozidla"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Za %s, najeďte na kruhový objezd"
+
+#~ msgid "Cursor"
+#~ msgstr "Kurzor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometrů"
diff --git a/po/da.po.in b/po/da.po.in
index 66f99547b..e6102e3a4 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 09:31+0000\n"
 "Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n"
 "Language-Team: Glenn Sommer <glemsom@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Kører fra kildekode mappen\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "sætter '%s' til '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nulte"
 
@@ -47,6 +49,7 @@ msgstr "femte"
 msgid "sixth"
 msgstr "sjette"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nulte afkørsel"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "om %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "om %d meter"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometer"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "om %d.%d kilometer"
 
 #, 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] "én kilometer"
@@ -167,18 +198,18 @@ msgstr "Kør snart ind i rundkørslen"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Om %s, kør ind i rundkørslen"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Forlad rundkørslen ved den %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "forlad så rundkørslen ved den %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Forlad rundkørslen ved den %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Følg vejen de næste %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Bogmærke"
 msgid "Destination"
 msgstr "Destination"
 
-msgid "Display"
+#. 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 "Vis"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rute"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Tidligere destinationer"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Bogmærker"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kort"
+
+msgid "_Layout"
 msgstr "Layout"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Visning"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Køretøj"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zoom ud"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zoom ind"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Genberegn"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stop Navigation"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "_Afslut"
 
-msgid "Cursor"
-msgstr "Markør"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Stop Navigation"
 
-msgid "Northing"
-msgstr "mod nord"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Vejbog"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Fuldskærm"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Tilbage"
 msgid "Add Bookmark"
 msgstr "Tilføj Bogmærke"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Bogmærker"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Bogmærke %s"
 
+msgid "Former Destinations"
+msgstr "Tidligere destinationer"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Husnummer"
 
+msgid "Layout"
+msgstr "Layout"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kort"
 
@@ -1508,18 +1603,30 @@ msgstr "Vis satellit status"
 msgid "Show NMEA data"
 msgstr "Vis NMEA data"
 
+msgid "Vehicle"
+msgstr "Køretøj"
+
 msgid "Rules"
 msgstr "Regler"
 
 msgid "Lock on road"
 msgstr "Lås til vej"
 
+msgid "Northing"
+msgstr "mod nord"
+
 msgid "Map follows Vehicle"
 msgstr "Kort følger køretøj"
 
 msgid "Message"
 msgstr "Meddelelse"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Route Beskrivelse"
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Kort punkt"
+
+msgid "Vehicle Position"
+msgstr "Køretøjsposition"
+
 msgid "Main menu"
 msgstr "Hovedmenu"
 
@@ -1559,12 +1683,20 @@ msgstr "Indstillinger"
 msgid "Tools"
 msgstr "Værktøj"
 
+msgid "Route"
+msgstr "Rute"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Funktioner"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Luk"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "Stop\n"
 "Navigation"
 
+msgid "Display"
+msgstr "Vis"
+
+msgid "Fullscreen"
+msgstr "Fuldskærm"
+
 msgid "Window Mode"
 msgstr "Vinduestilstand"
 
 msgid "Description"
 msgstr "Beskrivelse"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "hest"
 
-msgid "Map Point"
-msgstr "Kort punkt"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Køretøjsposition"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Om %s, kør ind i rundkørslen"
+
+#~ msgid "Cursor"
+#~ msgstr "Markør"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometer"
diff --git a/po/de.po.in b/po/de.po.in
index 7b3dc7ef4..d351547d4 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-09 12:20+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-01 22:09+0000\n"
 "Last-Translator: Achim Behrens <Unknown>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
@@ -1336,55 +1336,59 @@ msgstr "Lesezeichen"
 msgid "Destination"
 msgstr "Reiseziel"
 
-msgid "Display"
+#. 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 "Anzeige"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Route"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Vorherige Ziele"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Lesezeichen"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Karte"
+
+msgid "_Layout"
 msgstr "Erscheinungsbild"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projektion"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Fahrzeug"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Verkleinern"
 
 msgid "Decrease zoom level"
 msgstr "Verkleinern"
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr "Vergrößern"
 
 msgid "Increase zoom level"
 msgstr "Vergrößern"
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "Neu berechnen"
 
 msgid "Redraw map"
 msgstr "Karte neuzeichnen"
 
-msgid "Info"
+msgid "_Info"
 msgstr "Info"
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr "Als Ziel setzen"
 
 msgid "Opens address search dialog"
 msgstr "Öffnet Adresssuche-Dialog"
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr "Navigation beenden"
 
 msgid "Test"
@@ -1396,29 +1400,32 @@ msgstr "_Beenden"
 msgid "Quit the application"
 msgstr "Die Anwendung beenden"
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr "Positionsmarke zeigen"
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Auf Straße zeigen"
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr "Nordorientierung"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 "Die Kartenorientierung zwischen Norden und Fahrzeugausrichtung wechseln"
 
+msgid "_Roadbook"
+msgstr "Straßenkarte"
+
 msgid "Show/hide route description"
 msgstr "Routenbeschreibung anzeigen/schließen"
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "automatischer Zoom"
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr "Automatischen Zoom einschalten/ausschalten"
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr "Vollbild"
 
 msgid "Data"
@@ -1522,6 +1529,9 @@ msgstr "Lesezeichen einfügen"
 msgid "Delete Bookmark"
 msgstr "Lesezeichen entfernen"
 
+msgid "Bookmarks"
+msgstr "Lesezeichen"
+
 #. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Lesezeichen einfügen"
@@ -1530,9 +1540,8 @@ msgstr "Lesezeichen einfügen"
 msgid "Bookmark %s"
 msgstr "Lesezeichen %s"
 
-#, c-format
-msgid "Destination %s"
-msgstr "Ziel %s"
+msgid "Former Destinations"
+msgstr "Vorherige Ziele"
 
 msgid "- No former destinations available -"
 msgstr "- Keine vorherigen Ziele -"
@@ -1540,6 +1549,9 @@ msgstr "- Keine vorherigen Ziele -"
 msgid "House number"
 msgstr "Hausnummer"
 
+msgid "Layout"
+msgstr "Erscheinungsbild"
+
 #, c-format
 msgid "Download %s"
 msgstr "%s herunterladen"
@@ -1597,6 +1609,9 @@ msgstr "Satellitenstatus anzeigen"
 msgid "Show NMEA data"
 msgstr "NMEA Daten anzeigen"
 
+msgid "Vehicle"
+msgstr "Fahrzeug"
+
 msgid "Rules"
 msgstr "Regeln"
 
@@ -1674,6 +1689,9 @@ msgstr "Einstellungen"
 msgid "Tools"
 msgstr "Werkzeuge"
 
+msgid "Route"
+msgstr "Route"
+
 msgid "About"
 msgstr "Über"
 
@@ -1697,12 +1715,21 @@ msgstr ""
 "Navigation\n"
 "beenden"
 
+msgid "Display"
+msgstr "Anzeige"
+
+msgid "Fullscreen"
+msgstr "Vollbild"
+
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
 msgid "Description"
 msgstr "Beschreibung"
 
+msgid "car_shortest"
+msgstr ""
+
 msgid "car_avoid_tolls"
 msgstr "Auto ohne Maut"
 
diff --git a/po/de_CH.po.in b/po/de_CH.po.in
index f6046fdca..bf59252e5 100644
--- a/po/de_CH.po.in
+++ b/po/de_CH.po.in
@@ -4,12 +4,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2010-06-25 12:06+0200\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 08:49+0000\n"
 "Last-Translator: \n"
 "Language-Team: German (Switzerland) <de_CH@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,6 +26,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -46,6 +48,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -76,6 +79,14 @@ msgid "in %d m"
 msgstr ""
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr ""
 
@@ -84,6 +95,14 @@ msgid "in %d meters"
 msgstr ""
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -92,6 +111,18 @@ 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] ""
@@ -166,15 +197,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1299,52 +1330,59 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
 msgstr ""
 
-msgid "Projection"
+msgid "_Layout"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr ""
 
 msgid "Decrease zoom level"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr ""
 
 msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr ""
 
 msgid "Redraw map"
 msgstr ""
 
-msgid "Info"
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
 msgstr ""
 
 msgid "Opens address search dialog"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1356,28 +1394,31 @@ msgstr ""
 msgid "Quit the application"
 msgstr ""
 
-msgid "Cursor"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Northing"
+msgid "_Keep orientation to the North"
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
+msgid "_Roadbook"
+msgstr ""
+
 msgid "Show/hide route description"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr ""
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr ""
 
 msgid "Data"
@@ -1441,6 +1482,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1480,6 +1522,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1487,9 +1533,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1531,18 +1602,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1566,6 +1649,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1580,12 +1680,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1594,17 +1702,48 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
+msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
diff --git a/po/el.po.in b/po/el.po.in
index 70073f48d..a17098591 100644
--- a/po/el.po.in
+++ b/po/el.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-24 14:51+0000\n"
 "Last-Translator: aitolos <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Λειτουργία από τον πηγαίο κατάλογο\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ρύθμιση '%s' στο'%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "τρέχουσα"
 
@@ -47,6 +49,7 @@ msgstr "πέμπτος"
 msgid "sixth"
 msgstr "έκτος"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "τρέχουσα έξοδο"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "σε %d μ"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d μέτρα"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "σε %d μέτρα"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d χιλιόμετρα"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "σε %d %d χιλιόμετρα"
 
 #, 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] "Ένα χιλιόμετρο"
@@ -167,18 +198,18 @@ msgstr "Μπές στη κυκλική πορεία άμεσα"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Σε %s, μπες σε κυκλική πορεία"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Εξοδος απο την κυκλική πορεία στην %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "και βγείτε απο την κυκλική πορεία στην %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Εξοδος απο την κυκλική πορεία στην %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Σελιδοδείκτης"
 msgid "Destination"
 msgstr "Προορισμός"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "Διαδρομή"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Προγενέστερες διαδρομές"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Σελιδοδείκτες"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Χάρτης"
+
+msgid "_Layout"
 msgstr "Διάταξη"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Προβολή :"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Όχημα"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Σμίκρυνση"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Μεγέθυνση"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Επαναϋπολογισμός"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Πληροφορίες"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Διακοπή πλοήγησης"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Δοκιμή"
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-msgid "Cursor"
-msgstr "Δρομέας"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Κλείδωμα στο δρόμο"
 
-msgid "Northing"
-msgstr "Χάρτης στο βορρά"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Οδηγίες Διαδρομής"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Αυτόματο Ζουμ"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Πλήρης Οθόνη"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Προηγ."
 msgid "Add Bookmark"
 msgstr "Προσθήκη σελιδοδείκτη"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Πρόσθεση φακέλου Σελιδοδείκτη"
 
@@ -1457,6 +1523,10 @@ msgstr "Επικόληση Σελιδοδείκτη"
 msgid "Delete Bookmark"
 msgstr "Διαγραφή Σελιδοδείκτη"
 
+msgid "Bookmarks"
+msgstr "Σελιδοδείκτες"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Επικόληση σελιδοδείκτη"
 
@@ -1464,9 +1534,34 @@ msgstr "Επικόληση σελιδοδείκτη"
 msgid "Bookmark %s"
 msgstr "Σελιδοδείκτης %s"
 
+msgid "Former Destinations"
+msgstr "Προγενέστερες διαδρομές"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
 
+msgid "Layout"
+msgstr "Διάταξη"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Χάρτες"
 
@@ -1508,18 +1603,30 @@ msgstr "Εμφάνιση Κατάστασης Δορυφόρων"
 msgid "Show NMEA data"
 msgstr "Εμφάνιση δεδομένων ΝΜΕΑ"
 
+msgid "Vehicle"
+msgstr "Όχημα"
+
 msgid "Rules"
 msgstr "Κανόνες"
 
 msgid "Lock on road"
 msgstr "Κλείδωμα στο δρόμο"
 
+msgid "Northing"
+msgstr "Χάρτης στο βορρά"
+
 msgid "Map follows Vehicle"
 msgstr "Ο χάρτης ακολουθεί το Όχημα"
 
 msgid "Message"
 msgstr "Μήνυμα"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Περιγραφή Διαδρομής"
 
@@ -1543,6 +1650,23 @@ msgstr "Και όλη την ομάδα του Navit"
 msgid "members and contributors."
 msgstr "μέλη και συνεισφέροντες"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Σημείο Χάρτη"
+
+msgid "Vehicle Position"
+msgstr "Θέση Οχήματος"
+
 msgid "Main menu"
 msgstr "Κύριο Μενού"
 
@@ -1559,12 +1683,20 @@ msgstr "Ρυθμίσεις"
 msgid "Tools"
 msgstr "Εργαλεία"
 
+msgid "Route"
+msgstr "Διαδρομή"
+
 msgid "About"
 msgstr "Περί"
 
 msgid "Actions"
 msgstr "Ενέργειες"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Έξοδος"
 
@@ -1573,22 +1705,58 @@ msgid ""
 "Navigation"
 msgstr "Διακοπή"
 
+msgid "Display"
+msgstr "Προβολή"
+
+msgid "Fullscreen"
+msgstr "Πλήρης Οθόνη"
+
 msgid "Window Mode"
 msgstr "Λειτουργία παραθύρων"
 
 msgid "Description"
 msgstr "Περιγραφή"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "άλογο"
 
-msgid "Map Point"
-msgstr "Σημείο Χάρτη"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Θέση Οχήματος"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Σε %s, μπες σε κυκλική πορεία"
+
+#~ msgid "Cursor"
+#~ msgstr "Δρομέας"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d %d χιλιόμετρα"
 
diff --git a/po/en_AU.po.in b/po/en_AU.po.in
index 132364c7d..32aa6b3c7 100644
--- a/po/en_AU.po.in
+++ b/po/en_AU.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 11:29+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-09-12 05:53+0000\n"
 "Last-Translator: Athol Mullen <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Running from source directory\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setting '%s' to '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zeroth"
 
@@ -47,6 +49,7 @@ msgstr "fifth"
 msgid "sixth"
 msgstr "sixth"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "zeroth exit"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "in %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metres"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "in %d metres"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometres"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "in %d.%d kilometres"
 
 #, 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] "one kilometre"
@@ -162,14 +193,13 @@ msgstr "unknown "
 msgid "When possible, please turn around"
 msgstr "When possible, please turn around"
 
-#, c-format
-msgid "Enter the roundabout soon and leave it at the %s"
-msgstr "Enter the roundabout soon and leave it at the %s"
+msgid "Enter the roundabout soon"
+msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -1301,55 +1331,59 @@ msgstr "Bookmark"
 msgid "Destination"
 msgstr "Destination"
 
-msgid "Display"
+#. 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 "Display"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Route"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Former Destinations"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Bookmarks"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Map"
+
+msgid "_Layout"
 msgstr "Layout"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projection"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vehicle"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "ZoomOut"
 
 msgid "Decrease zoom level"
 msgstr "Decrease zoom level"
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr "ZoomIn"
 
 msgid "Increase zoom level"
 msgstr "Increase zoom level"
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "Recalculate"
 
 msgid "Redraw map"
 msgstr "Redraw map"
 
-msgid "Info"
+msgid "_Info"
 msgstr "Info"
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr "Set destination"
 
 msgid "Opens address search dialog"
 msgstr "Opens address search dialogue"
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr "Stop Navigation"
 
 msgid "Test"
@@ -1361,28 +1395,31 @@ msgstr "_Quit"
 msgid "Quit the application"
 msgstr "Quit the application"
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr "Show position cursor"
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Lock on Road"
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr "Keep orientation to the North"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "Switches map orientation to the north or the vehicle"
 
+msgid "_Roadbook"
+msgstr "Roadbook"
+
 msgid "Show/hide route description"
 msgstr "Show/hide route description"
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "AutoZoom"
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr "Enable/disable automatic zoom level changing"
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr "FullScreen"
 
 msgid "Data"
@@ -1446,6 +1483,7 @@ msgstr "Back"
 msgid "Add Bookmark"
 msgstr "Add Bookmark"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Add Bookmark folder"
 
@@ -1485,6 +1523,10 @@ msgstr "Paste Bookmark"
 msgid "Delete Bookmark"
 msgstr "Delete Bookmark"
 
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Paste bookmark"
 
@@ -1492,9 +1534,34 @@ msgstr "Paste bookmark"
 msgid "Bookmark %s"
 msgstr "Bookmark %s"
 
+msgid "Former Destinations"
+msgstr "Former Destinations"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "House number"
 
+msgid "Layout"
+msgstr "Layout"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Maps"
 
@@ -1536,6 +1603,9 @@ msgstr "Show Satellite status"
 msgid "Show NMEA data"
 msgstr "Show NMEA data"
 
+msgid "Vehicle"
+msgstr "Vehicle"
+
 msgid "Rules"
 msgstr "Rules"
 
@@ -1551,6 +1621,12 @@ msgstr "Map follows vehicle"
 msgid "Message"
 msgstr "Message"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Route Description"
 
@@ -1574,6 +1650,23 @@ msgstr "And all the Navit Team"
 msgid "members and contributors."
 msgstr "members and contributors."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Map Point"
+
+msgid "Vehicle Position"
+msgstr "Vehicle Position"
+
 msgid "Main menu"
 msgstr "Main menu"
 
@@ -1590,12 +1683,20 @@ msgstr "Settings"
 msgid "Tools"
 msgstr "Tools"
 
+msgid "Route"
+msgstr "Route"
+
 msgid "About"
 msgstr "About"
 
 msgid "Actions"
 msgstr "Actions"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Quit"
 
@@ -1606,17 +1707,54 @@ msgstr ""
 "Stop\n"
 "Navigation"
 
+msgid "Display"
+msgstr "Display"
+
+msgid "Fullscreen"
+msgstr "FullScreen"
+
 msgid "Window Mode"
 msgstr "Window Mode"
 
 msgid "Description"
 msgstr "Description"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "horse"
 
-msgid "Map Point"
-msgstr "Map Point"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Vehicle Position"
+#~ msgid "Enter the roundabout soon and leave it at the %s"
+#~ msgstr "Enter the roundabout soon and leave it at the %s"
+
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "In %s, enter the roundabout"
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index e31931f5f..2717c70a3 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-29 13:38+0000\n"
 "Last-Translator: Matthew Gall <matthewgall2005@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Running from source directory\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setting '%s' to '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zeroth"
 
@@ -47,6 +49,7 @@ msgstr "fifth"
 msgid "sixth"
 msgstr "sixth"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "zeroth exit"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "in %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metres"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "in %d metres"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometres"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "in %d.%d kilometres"
 
 #, 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] "one kilometre"
@@ -167,18 +198,18 @@ msgstr "Enter the roundabout soon"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "In %s, enter the roundabout"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Leave the roundabout at the %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "then leave the roundabout at the %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Leave the roundabout at the %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Follow the road for the next %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Bookmark"
 msgid "Destination"
 msgstr "Destination"
 
-msgid "Display"
+#. 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 "Display"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Route"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Former Destinations"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Bookmarks"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Map"
+
+msgid "_Layout"
 msgstr "Layout"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projection"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vehicle"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "ZoomOut"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "ZoomIn"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalculate"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stop navigation"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "_Quit"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr " Lock on road"
 
-msgid "Northing"
-msgstr " Orient map North"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Roadbook"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Fullscreen"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Back"
 msgid "Add Bookmark"
 msgstr "Add bookmark"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Add bookmark folder"
 
@@ -1457,6 +1523,10 @@ msgstr "Paste bookmark"
 msgid "Delete Bookmark"
 msgstr "Delete bookmark"
 
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Paste bookmark"
 
@@ -1464,9 +1534,34 @@ msgstr "Paste bookmark"
 msgid "Bookmark %s"
 msgstr "Bookmark %s"
 
+msgid "Former Destinations"
+msgstr "Former Destinations"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "House number"
 
+msgid "Layout"
+msgstr "Layout"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Maps"
 
@@ -1508,18 +1603,30 @@ msgstr "Show satellite status"
 msgid "Show NMEA data"
 msgstr "Show NMEA data"
 
+msgid "Vehicle"
+msgstr "Vehicle"
+
 msgid "Rules"
 msgstr "Rules"
 
 msgid "Lock on road"
 msgstr "Lock on road"
 
+msgid "Northing"
+msgstr " Orient map North"
+
 msgid "Map follows Vehicle"
 msgstr " Map follows vehicle"
 
 msgid "Message"
 msgstr "Message"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Route Description"
 
@@ -1543,6 +1650,23 @@ msgstr "And all the Navit Team"
 msgid "members and contributors."
 msgstr "members and contributors."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Map Point"
+
+msgid "Vehicle Position"
+msgstr "Vehicle Position"
+
 msgid "Main menu"
 msgstr "Main Menu"
 
@@ -1557,12 +1681,20 @@ msgstr "Settings"
 msgid "Tools"
 msgstr "Tools"
 
+msgid "Route"
+msgstr "Route"
+
 msgid "About"
 msgstr "About"
 
 msgid "Actions"
 msgstr "Actions"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Quit"
 
@@ -1571,22 +1703,58 @@ msgid ""
 "Navigation"
 msgstr "Stop"
 
+msgid "Display"
+msgstr "Display"
+
+msgid "Fullscreen"
+msgstr "Fullscreen"
+
 msgid "Window Mode"
 msgstr "Window Mode"
 
 msgid "Description"
 msgstr "Description"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "horse"
 
-msgid "Map Point"
-msgstr "Map Point"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Vehicle Position"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "In %s, enter the roundabout"
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometre"
 
diff --git a/po/eo.po.in b/po/eo.po.in
index e0d67c835..402e1d473 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 20:37+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nula"
 
@@ -47,6 +49,7 @@ msgstr "kvina"
 msgid "sixth"
 msgstr "sesa"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr ""
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metroj"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr ""
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ 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] "unu kilometro"
@@ -167,15 +198,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1300,40 +1331,59 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Legosignoj"
 
-msgid "Layout"
+msgid "_Map"
 msgstr ""
 
-msgid "Projection"
+msgid "_Layout"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
+msgstr ""
+
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "Zoom_In"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr ""
 
-msgid "Info"
+msgid "Redraw map"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-msgid "Cursor"
+msgid "Quit the application"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr ""
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Legosignoj"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1508,18 +1603,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1557,12 +1681,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1571,17 +1703,48 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
+msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
diff --git a/po/es.po.in b/po/es.po.in
index 522043124..0071b2774 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -5,12 +5,13 @@
 # Emilio Gómez Fernández <Unknown> 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-27 20:36+0000\n"
 "Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
 "Language-Team: Chris Eubank <cteubank@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr "Ejecutando desde el directorio fuente\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "configurando '%s' a '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zeroth"
 
@@ -48,6 +50,7 @@ msgstr "quinta"
 msgid "sixth"
 msgstr "sexta"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "salida cero"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "en %d metros"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "en %d metros"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilómetros"
 
@@ -94,6 +113,18 @@ msgid "in %d.%d kilometers"
 msgstr "en %d.%d kilómetros"
 
 #, 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 kilómetro"
@@ -168,18 +199,18 @@ msgstr "Métase pronto en la rotonda"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "En %s entre en la rotonda"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Salga de la rotonda en la %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "después, salga de la rotonda en la %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Salga de la rotonda en la %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga el camino hasta la siguiente %s"
 
@@ -1301,50 +1332,59 @@ msgstr "Marcador"
 msgid "Destination"
 msgstr "Destino"
 
-msgid "Display"
+#. 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 "Visualizar"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Ruta"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinos anteriores"
 
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-"Destinos\n"
-"anteriores"
-
-msgid "- No former destinations available -"
-msgstr "- No hay destinos anteriores -"
-
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Favoritos"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Diseño"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Proyección"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vehículo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Alejar"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Aumentar"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalcular"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Información"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Detener navegación"
 
 msgid "Test"
@@ -1353,19 +1393,34 @@ msgstr "Prueba"
 msgid "_Quit"
 msgstr "_Salir"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Bloquear ruta"
 
-msgid "Northing"
-msgstr "Norteando"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Roadbook"
+msgstr "Guía"
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
 msgstr "Autoampliar"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Pantalla completa"
 
 msgid "Data"
@@ -1429,6 +1484,7 @@ msgstr "Atrás"
 msgid "Add Bookmark"
 msgstr "Añadir marcador"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Añadir carpeta de marcadores"
 
@@ -1468,6 +1524,10 @@ msgstr "Pegar marcador"
 msgid "Delete Bookmark"
 msgstr "Eliminar marcador"
 
+msgid "Bookmarks"
+msgstr "Favoritos"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Pegar marcador"
 
@@ -1475,9 +1535,34 @@ msgstr "Pegar marcador"
 msgid "Bookmark %s"
 msgstr "Marcador %s"
 
+msgid "Former Destinations"
+msgstr "Destinos anteriores"
+
+msgid "- No former destinations available -"
+msgstr "- No hay destinos anteriores -"
+
 msgid "House number"
 msgstr "Número de portal"
 
+msgid "Layout"
+msgstr "Diseño"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapas"
 
@@ -1519,18 +1604,30 @@ msgstr "Mostrar estado de satélite"
 msgid "Show NMEA data"
 msgstr "Mostar datos NMEA"
 
+msgid "Vehicle"
+msgstr "Vehículo"
+
 msgid "Rules"
 msgstr "Reglas"
 
 msgid "Lock on road"
 msgstr "Bloqueado en la calle"
 
+msgid "Northing"
+msgstr "Norteando"
+
 msgid "Map follows Vehicle"
 msgstr "El mapa sigue al vehículo"
 
 msgid "Message"
 msgstr "Mensaje"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descripción de ruta"
 
@@ -1554,6 +1651,23 @@ msgstr "Y todo el equipo de Navit"
 msgid "members and contributors."
 msgstr "miembros y colaboradores"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Punto en el mapa"
+
+msgid "Vehicle Position"
+msgstr "Posición del vehículo"
+
 msgid "Main menu"
 msgstr "Menú principal"
 
@@ -1570,12 +1684,22 @@ msgstr "Configuración"
 msgid "Tools"
 msgstr "Herramientas"
 
+msgid "Route"
+msgstr "Ruta"
+
 msgid "About"
 msgstr "Acerca de"
 
 msgid "Actions"
 msgstr "Acciones"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+"Destinos\n"
+"anteriores"
+
 msgid "Quit"
 msgstr "Cerrar"
 
@@ -1586,22 +1710,58 @@ msgstr ""
 "Parar\n"
 "Navegación"
 
+msgid "Display"
+msgstr "Visualizar"
+
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
 msgid "Window Mode"
 msgstr "Modo de ventana"
 
 msgid "Description"
 msgstr "Descripción"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "caballo"
 
-msgid "Map Point"
-msgstr "Punto en el mapa"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Posición del vehículo"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "En %s entre en la rotonda"
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilómetro"
 
diff --git a/po/et.po.in b/po/et.po.in
index 872d027d4..29fcd2fb4 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 12:23+0000\n"
 "Last-Translator: Andres Kaaber <andres.kaaber@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Käivitan lähtekataloogist\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "määran '%s' -i '%s' -ks\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -47,6 +49,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "%d m pärast"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meetrit"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "%d meetri pärast"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "%d.%d kilomeetri pärast"
 
 #, 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] "üks kilomeeter"
@@ -167,15 +198,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1300,40 +1331,59 @@ msgstr "Järjehoidja"
 msgid "Destination"
 msgstr "Sihtkoht"
 
-msgid "Display"
+#. 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 "Kuva"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Teekond"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Eelmine sihtkoht"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Järjehoidjad"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kaart"
+
+msgid "_Layout"
 msgstr "Paigutus"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projektsioon"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Liiklusvahend"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Vähenda"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Suurenda"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Arvuta uuesti"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Teave"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Peata navigatsioon"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "_Välju"
 
-msgid "Cursor"
-msgstr "Kursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Lukusta tee peale"
 
-msgid "Northing"
-msgstr "Põhjasuund"
+msgid "_Keep orientation to the North"
+msgstr ""
 
-msgid "Autozoom"
+msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Roadbook"
+msgstr "Teekonna raamat"
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Täisekraan"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Järjehoidjad"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr "Eelmine sihtkoht"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr "Paigutus"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1508,18 +1603,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr "Liiklusvahend"
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr "Põhjasuund"
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1557,12 +1681,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr "Teekond"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1571,21 +1703,54 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr "Kuva"
+
+msgid "Fullscreen"
+msgstr "Täisekraan"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
 msgstr ""
 
-#, c-format
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Cursor"
+#~ msgstr "Kursor"
+
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilomeeter"
diff --git a/po/eu.po.in b/po/eu.po.in
index e1ba559d6..909221a60 100644
--- a/po/eu.po.in
+++ b/po/eu.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 11:29+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-08-27 18:11+0000\n"
 "Last-Translator: Inaki Saez <Inaki.Saez@gmail.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Iturburu direktoriotik ari\\n\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' '%s'ra ezartzen\\n\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zero"
 
@@ -47,6 +49,7 @@ msgstr "boskarren"
 msgid "sixth"
 msgstr "seigarren"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "zerogarren irteera"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "%d metrotan"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metro"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "%d metrotan"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d,%d kilometro"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "%d,%d kilometrotan"
 
 #, 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] "kilometro bat"
@@ -162,14 +193,13 @@ msgstr "ezezaguna "
 msgid "When possible, please turn around"
 msgstr "Ahal duzunean eman itzulia, mesedez"
 
-#, c-format
-msgid "Enter the roundabout soon and leave it at the %s"
-msgstr "Hurrengoan sartu errotondan eta atera %sean"
+msgid "Enter the roundabout soon"
+msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "%s-tan sartu errotondan"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -1301,55 +1331,59 @@ msgstr "Gogokoa"
 msgid "Destination"
 msgstr "Helburua"
 
-msgid "Display"
+#. 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 "Bistaratzea"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Ibilbidea"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Aurreko Helburuak"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Gogokoak"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Antolaketa"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Proiekzioa"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Ibilgailua"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Hurrundu"
 
 msgid "Decrease zoom level"
 msgstr "Txikitu zooma"
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr "Hurbildu"
 
 msgid "Increase zoom level"
 msgstr "Handitu zooma"
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "Birkalkulatu"
 
 msgid "Redraw map"
 msgstr "Mapa Birmargotu"
 
-msgid "Info"
+msgid "_Info"
 msgstr "Datuak"
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr "Helburua ezarri"
 
 msgid "Opens address search dialog"
 msgstr "Ireki helbidea bilatzeko lehioa"
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr "Nabigazioa Gelditu"
 
 msgid "Test"
@@ -1361,28 +1395,31 @@ msgstr "_Irten"
 msgid "Quit the application"
 msgstr "Irten programatik"
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr "Erakutsi kurtsore kokalekua"
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Bidean oztopoa"
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr "Iparralderantz begira"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "Maparen norabidea iparralde edo berebilaren artean aldatu"
 
+msgid "_Roadbook"
+msgstr "Gida"
+
 msgid "Show/hide route description"
 msgstr "Erakutsi/ezkutatu hibilbidearen berri"
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autohanditu"
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr "Zoom automatikoa onartu/debekatu"
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr "Pantaila osoa"
 
 msgid "Data"
@@ -1446,6 +1483,7 @@ msgstr "Atzera"
 msgid "Add Bookmark"
 msgstr "Gogokoa gehitu"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Gehitu Gogokoen direktorioa"
 
@@ -1485,6 +1523,10 @@ msgstr "Itsatsi Gogokoa"
 msgid "Delete Bookmark"
 msgstr "Ezabatu Gogokoa"
 
+msgid "Bookmarks"
+msgstr "Gogokoak"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Itsatsi gogokoa"
 
@@ -1492,9 +1534,34 @@ msgstr "Itsatsi gogokoa"
 msgid "Bookmark %s"
 msgstr "%s marka"
 
+msgid "Former Destinations"
+msgstr "Aurreko Helburuak"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Etxebizitza zenbakia"
 
+msgid "Layout"
+msgstr "Antolaketa"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapak"
 
@@ -1536,6 +1603,9 @@ msgstr "Sateliteen egoera erakutsi"
 msgid "Show NMEA data"
 msgstr "NMEA datuak erakutsi"
 
+msgid "Vehicle"
+msgstr "Ibilgailua"
+
 msgid "Rules"
 msgstr "Arauak"
 
@@ -1551,6 +1621,12 @@ msgstr "Mapak ibilgailua jarraitzen du"
 msgid "Message"
 msgstr "Mezua"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Ibilbidearen nondik-norakoa"
 
@@ -1574,6 +1650,23 @@ msgstr "Eta Navit talde osoa"
 msgid "members and contributors."
 msgstr "partaide eta laguntzaileak."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Mapako puntua"
+
+msgid "Vehicle Position"
+msgstr "Berebilaren kokalekua"
+
 msgid "Main menu"
 msgstr "Menu nagusia"
 
@@ -1590,12 +1683,20 @@ msgstr "Ezarpenak"
 msgid "Tools"
 msgstr "Tresnak"
 
+msgid "Route"
+msgstr "Ibilbidea"
+
 msgid "About"
 msgstr "Honi buruz"
 
 msgid "Actions"
 msgstr "Ekintzak"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Irten"
 
@@ -1606,17 +1707,54 @@ msgstr ""
 "Nabigazioa\n"
 "Gelditu"
 
+msgid "Display"
+msgstr "Bistaratzea"
+
+msgid "Fullscreen"
+msgstr "Pantaila osoa"
+
 msgid "Window Mode"
 msgstr "Lehio modua"
 
 msgid "Description"
 msgstr "Zehazketa"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "zaldia"
 
-msgid "Map Point"
-msgstr "Mapako puntua"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Berebilaren kokalekua"
+#~ msgid "Enter the roundabout soon and leave it at the %s"
+#~ msgstr "Hurrengoan sartu errotondan eta atera %sean"
+
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "%s-tan sartu errotondan"
diff --git a/po/fi.po.in b/po/fi.po.in
index 80b0426a9..6245fee92 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-08 07:37+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@gmail.com>\n"
 "Language-Team: Ossi Berg <o.berg@mail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Ajetaan lähdehakemistosta\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "asetetaan '%s' arvoon '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nollas"
 
@@ -47,6 +49,7 @@ msgstr "viides"
 msgid "sixth"
 msgstr "kuudes"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nollannesta liittymästä"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "%d m päästä"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metriä"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "%d metrin päästä"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometriä"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "%d,%d kilometrin päästä"
 
 #, 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] "yksi kilometri"
@@ -167,18 +198,18 @@ msgstr "Liity liikenneympyrään pian"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "%s, liity liikenneympyrään"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Poistu liikenneympyrästä %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "poistu sitten liikenneympyrästä %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Poistu liikenneympyrästä %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Seuraa tätä tietä %s"
 
@@ -1304,40 +1335,59 @@ msgstr "Kirjanmerkki"
 msgid "Destination"
 msgstr "Kohde"
 
-msgid "Display"
+#. 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 "Näyttö"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Reitti"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Aiemmat kohteet"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Kirjanmerkit"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kartta"
+
+msgid "_Layout"
 msgstr "Pohja"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projektio"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Kulkuneuvo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Loitonna"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Lähennä"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Laske uudelleen"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Lopeta navigointi"
 
 msgid "Test"
@@ -1346,19 +1396,34 @@ msgstr "Testi"
 msgid "_Quit"
 msgstr "Sulje"
 
-msgid "Cursor"
-msgstr "Osoitin"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Lukitse tiehen"
 
-msgid "Northing"
-msgstr "Pohjoinen ylhäällä"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Ohjeistaja"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autom. suurennus"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Koko ruutu"
 
 msgid "Data"
@@ -1422,6 +1487,7 @@ msgstr "Takaisin"
 msgid "Add Bookmark"
 msgstr "Lisää kirjanmerkki"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Lisää kirjanmerkkikansio"
 
@@ -1461,6 +1527,10 @@ msgstr "Liitä kirjanmerkki"
 msgid "Delete Bookmark"
 msgstr "Poista kirjanmerkki"
 
+msgid "Bookmarks"
+msgstr "Kirjanmerkit"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Liitä kirjanmerkki"
 
@@ -1468,9 +1538,34 @@ msgstr "Liitä kirjanmerkki"
 msgid "Bookmark %s"
 msgstr "Tee kirjanmerkki %s"
 
+msgid "Former Destinations"
+msgstr "Aiemmat kohteet"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Talon numero"
 
+msgid "Layout"
+msgstr "Pohja"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kartat"
 
@@ -1512,18 +1607,30 @@ msgstr "Näytä satelliittien tila"
 msgid "Show NMEA data"
 msgstr "Näytä NMEA-tiedot"
 
+msgid "Vehicle"
+msgstr "Kulkuneuvo"
+
 msgid "Rules"
 msgstr "Säännöt"
 
 msgid "Lock on road"
 msgstr "Lukitse tiehen"
 
+msgid "Northing"
+msgstr "Pohjoinen ylhäällä"
+
 msgid "Map follows Vehicle"
 msgstr "Kartta seuraa ajoneuvoa"
 
 msgid "Message"
 msgstr "Viesti"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Reitin kuvaus"
 
@@ -1547,6 +1654,23 @@ msgstr "sekä koko Navit-tiimi"
 msgid "members and contributors."
 msgstr "jäsenet ja osallistujat."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Karttapiste"
+
+msgid "Vehicle Position"
+msgstr "Ajoneuvon sijainti"
+
 msgid "Main menu"
 msgstr "Päävalikko"
 
@@ -1563,12 +1687,20 @@ msgstr "Asetukset"
 msgid "Tools"
 msgstr "Työkalut"
 
+msgid "Route"
+msgstr "Reitti"
+
 msgid "About"
 msgstr "Tietoja"
 
 msgid "Actions"
 msgstr "Toiminnat"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Lopeta"
 
@@ -1579,22 +1711,58 @@ msgstr ""
 "Lopeta\n"
 "Suunnistus"
 
+msgid "Display"
+msgstr "Näyttö"
+
+msgid "Fullscreen"
+msgstr "Koko ruutu"
+
 msgid "Window Mode"
 msgstr "Ikkunatila"
 
 msgid "Description"
 msgstr "Kuvaus"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "hevonen"
 
-msgid "Map Point"
-msgstr "Karttapiste"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Ajoneuvon sijainti"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "%s, liity liikenneympyrään"
+
+#~ msgid "Cursor"
+#~ msgstr "Osoitin"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d,%d kilometri"
 
diff --git a/po/fo.po.in b/po/fo.po.in
index 07f1ef82b..c98810590 100644
--- a/po/fo.po.in
+++ b/po/fo.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 12:19+0000\n"
 "Last-Translator: Cyberish <kajsten@gmail.com>\n"
 "Language-Team: Faroese <fo@li.org>\n"
+"Language: fo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Koyrur frá keldumappuni\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setur '%s' til '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nullta"
 
@@ -47,6 +49,7 @@ msgstr "fimti"
 msgid "sixth"
 msgstr "sætti"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "sjeyndi"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "um %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metrar"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "um %d metrar"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometrar"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "um %d.%d kilometrar"
 
 #, 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] "ein kilometur"
@@ -167,18 +198,18 @@ msgstr "Um lítið bil verður koyrt inní rundkoyringina"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "um %s verður koyrt inní rundkoyringina"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "far út úr rundkoyring við %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "far so út úr rundkoyring við %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "far út úr rundkoyring við %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "fylg vegnum tær næstu %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Bókamerki"
 msgid "Destination"
 msgstr "Ferðamál"
 
-msgid "Display"
+#. 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 "Skíggji"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Ruta"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Gomul Ferðamál"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Bókamerki"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kort"
+
+msgid "_Layout"
 msgstr "Snið"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Sýning"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Akfar"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "ZoomOut"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "ZoomIn"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Umrokna"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stegga Navigering"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Roynd"
 msgid "_Quit"
 msgstr "_Gevst"
 
-msgid "Cursor"
-msgstr "Markør"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Læs til veg"
 
-msgid "Northing"
-msgstr "Mót norðan"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Vegbók"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Sjálvvirkið zoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Fullur skermur"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Aftur"
 msgid "Add Bookmark"
 msgstr "Legg bókamerki afturat"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Bókamerki"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Bókamerk %s"
 
+msgid "Former Destinations"
+msgstr "Gomul Ferðamál"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Húsanummur"
 
+msgid "Layout"
+msgstr "Snið"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kort"
 
@@ -1508,18 +1603,30 @@ msgstr "Vís Satelit støðu"
 msgid "Show NMEA data"
 msgstr "Vís NMEA dáta"
 
+msgid "Vehicle"
+msgstr "Akfar"
+
 msgid "Rules"
 msgstr "Reglur"
 
 msgid "Lock on road"
 msgstr "Læs til veg"
 
+msgid "Northing"
+msgstr "Mót norðan"
+
 msgid "Map follows Vehicle"
 msgstr "Kort fylgur akfari"
 
 msgid "Message"
 msgstr "Boð"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Rutulýsing"
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Kort Punkt"
+
+msgid "Vehicle Position"
+msgstr "Akfars stað"
+
 msgid "Main menu"
 msgstr "Høvuðsvalmynd"
 
@@ -1557,12 +1681,20 @@ msgstr "Setingar"
 msgid "Tools"
 msgstr "Tól"
 
+msgid "Route"
+msgstr "Ruta"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Gerðir"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Enda"
 
@@ -1571,22 +1703,58 @@ msgid ""
 "Navigation"
 msgstr "Enda navigering"
 
+msgid "Display"
+msgstr "Skíggji"
+
+msgid "Fullscreen"
+msgstr "Fullur skermur"
+
 msgid "Window Mode"
 msgstr "Vindeyga støða"
 
 msgid "Description"
 msgstr "Frágreiðing"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "hestur"
 
-msgid "Map Point"
-msgstr "Kort Punkt"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Akfars stað"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "um %s verður koyrt inní rundkoyringina"
+
+#~ msgid "Cursor"
+#~ msgstr "Markør"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometur"
 
diff --git a/po/fr.po.in b/po/fr.po.in
index 11aa3a804..63dfdaaa9 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-17 18:31+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-18 19:16+0000\n"
 "Last-Translator: yannick56 <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
@@ -203,8 +203,8 @@ msgstr "Préparez vous à vous engager dans le rond-point"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Dans %s, engagez vous dans le rond-point"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -1337,66 +1337,59 @@ msgstr "Favoris"
 msgid "Destination"
 msgstr "Destination"
 
-msgid "Display"
+#. 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 "Affichage"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Itinéraire"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinations précédentes"
 
-msgid ""
-"Former\n"
-"Destinations"
-
-msgstr ""
-"Destinations\n"
-"précédentes"
-
-msgid "- No former destinations available -"
-msgstr "- Pas de destinations précedentes -"
-
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Favoris"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Carte"
+
+msgid "_Layout"
 msgstr "Thème"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projection"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Véhicule"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zoom arrière"
 
 msgid "Decrease zoom level"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr "Zoom avant"
 
 msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "Recalculer"
 
 msgid "Redraw map"
 msgstr ""
 
-msgid "Info"
+msgid "_Info"
 msgstr "Info"
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr ""
 
 msgid "Opens address search dialog"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr "Annuler le trajet"
 
 msgid "Test"
@@ -1408,28 +1401,31 @@ msgstr "_Quitter"
 msgid "Quit the application"
 msgstr ""
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Coller à la route"
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
+msgid "_Roadbook"
+msgstr "Carnet de route"
+
 msgid "Show/hide route description"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Zoom automatique"
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr "Plein écran"
 
 msgid "Data"
@@ -1533,6 +1529,9 @@ msgstr "Insérer le signet"
 msgid "Delete Bookmark"
 msgstr "Supprimer le signet"
 
+msgid "Bookmarks"
+msgstr "Favoris"
+
 #. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Insérer le signet"
@@ -1541,9 +1540,18 @@ msgstr "Insérer le signet"
 msgid "Bookmark %s"
 msgstr "Ajouter %s aux favoris"
 
+msgid "Former Destinations"
+msgstr "Destinations précédentes"
+
+msgid "- No former destinations available -"
+msgstr "- Pas de destinations précedentes -"
+
 msgid "House number"
 msgstr "Numéro de maison"
 
+msgid "Layout"
+msgstr "Thème"
+
 #, c-format
 msgid "Download %s"
 msgstr ""
@@ -1601,6 +1609,9 @@ msgstr "Afficher les infos satellite"
 msgid "Show NMEA data"
 msgstr "Afficher les données NMEA"
 
+msgid "Vehicle"
+msgstr "Véhicule"
+
 msgid "Rules"
 msgstr "Règles"
 
@@ -1645,6 +1656,9 @@ msgstr "Et tous les membres du projet Navit"
 msgid "members and contributors."
 msgstr "membres et contributeurs"
 
+msgid "Return to route!"
+msgstr ""
+
 #. warning told
 msgid "Look out! Camera!"
 msgstr "Attention! Radar!"
@@ -1675,12 +1689,22 @@ msgstr "Configuration"
 msgid "Tools"
 msgstr "Outils"
 
+msgid "Route"
+msgstr "Itinéraire"
+
 msgid "About"
 msgstr "À propos"
 
 msgid "Actions"
 msgstr "Actions"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+"Destinations\n"
+"précédentes"
+
 msgid "Quit"
 msgstr "Quitter"
 
@@ -1691,12 +1715,24 @@ msgstr ""
 "Arrêter\n"
 "La navigation"
 
+msgid "Display"
+msgstr "Affichage"
+
+msgid "Fullscreen"
+msgstr "Plein écran"
+
 msgid "Window Mode"
 msgstr "Mode fenêtré"
 
 msgid "Description"
 msgstr "Description"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "cheval"
 
@@ -1725,6 +1761,9 @@ msgstr "cheval"
 msgid "Truck"
 msgstr ""
 
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Dans %s, engagez vous dans le rond-point"
+
 #~ msgid "Cursor"
 #~ msgstr "Curseur"
 
diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index fa4d0729a..de01821e6 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -6,12 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:32+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-02-06 10:37+0000\n"
 "Last-Translator: KaZeR <kazer@altern.org>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr "Execution depuis le dossier d'origine\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' mis à '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zéroième"
 
@@ -48,6 +50,7 @@ msgstr "cinquième"
 msgid "sixth"
 msgstr "sixième"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "la zéroième sortie"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "dans %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d mètres"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "dans %d mètres"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilomètres"
 
@@ -94,6 +113,18 @@ msgid "in %d.%d kilometers"
 msgstr "dans %d.%d kilomètres"
 
 #, 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 kilomètre"
@@ -172,18 +203,18 @@ msgstr "Préparez vous à vous engager dans le rond-point"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Dans %s, engagez vous dans le rond-point"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Sortez du rond-point à la %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "puis sortez du rond-point à la %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Sortez du rond-point à la %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Suivez la route sur %s"
 
@@ -1306,40 +1337,59 @@ msgstr "Favoris"
 msgid "Destination"
 msgstr "Destination"
 
-msgid "Display"
+#. 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 "Affichage"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Itinéraire"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinations précédentes"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Favoris"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Carte"
+
+msgid "_Layout"
 msgstr "Thème"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projection"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Véhicule"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zoom arrière"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zoom avant"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalculer"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Annuler le trajet"
 
 msgid "Test"
@@ -1348,19 +1398,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "_Quitter"
 
-msgid "Cursor"
-msgstr "Curseur"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Coller à la route"
 
-msgid "Northing"
-msgstr "Orientation toujours au Nord"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Carnet de route"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Zoom automatique"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Plein écran"
 
 msgid "Data"
@@ -1424,6 +1489,7 @@ msgstr "Retour"
 msgid "Add Bookmark"
 msgstr "Ajouter au favoris"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1463,6 +1529,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Favoris"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1470,9 +1540,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Ajouter %s aux favoris"
 
+msgid "Former Destinations"
+msgstr "Destinations précédentes"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Numéro de maison"
 
+msgid "Layout"
+msgstr "Thème"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Cartes"
 
@@ -1514,18 +1609,30 @@ msgstr "Afficher les infos satellite"
 msgid "Show NMEA data"
 msgstr "Afficher les données NMEA"
 
+msgid "Vehicle"
+msgstr "Véhicule"
+
 msgid "Rules"
 msgstr "Règles"
 
 msgid "Lock on road"
 msgstr "Coller à la route"
 
+msgid "Northing"
+msgstr "Orientation toujours au Nord"
+
 msgid "Map follows Vehicle"
 msgstr "La carte suit le véhicule"
 
 msgid "Message"
 msgstr "Message"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Description de la route"
 
@@ -1549,6 +1656,23 @@ msgstr "Et tous les membres du projet Navit"
 msgid "members and contributors."
 msgstr "membres et contributeurs"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Point sur la carte"
+
+msgid "Vehicle Position"
+msgstr "Position du véhicule"
+
 msgid "Main menu"
 msgstr "Menu principal"
 
@@ -1565,12 +1689,20 @@ msgstr "Configuration"
 msgid "Tools"
 msgstr "Outils"
 
+msgid "Route"
+msgstr "Itinéraire"
+
 msgid "About"
 msgstr "À propos"
 
 msgid "Actions"
 msgstr "Actions"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Quitter"
 
@@ -1581,20 +1713,57 @@ msgstr ""
 "Arrêter\n"
 "La navigation"
 
+msgid "Display"
+msgstr "Affichage"
+
+msgid "Fullscreen"
+msgstr "Plein écran"
+
 msgid "Window Mode"
 msgstr "Mode fenêtré"
 
 msgid "Description"
 msgstr "Description"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "cheval"
 
-msgid "Map Point"
-msgstr "Point sur la carte"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Position du véhicule"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Dans %s, engagez vous dans le rond-point"
+
+#~ msgid "Cursor"
+#~ msgstr "Curseur"
 
 #~ msgid " SNR "
 #~ msgstr " Rapport Signal/Bruit "
diff --git a/po/gl.po.in b/po/gl.po.in
index 83a50e512..a1d5bac82 100644
--- a/po/gl.po.in
+++ b/po/gl.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 09:32+0000\n"
 "Last-Translator: andreout <andre@outeiro.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Executando desde o directorio fonte.\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "Establecendo '%s' a '%s'.\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "cero-ésimo"
 
@@ -47,6 +49,7 @@ msgstr "quinto"
 msgid "sixth"
 msgstr "sexto"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "cero-ésimo"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "en %d m."
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "en %d metros"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "en %d.%d quilómetros"
 
 #, 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 quilómetro"
@@ -167,18 +198,18 @@ msgstr "Métase pronto na rotonda"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "En %s, entre na rotonda"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Saia da rotonda pola %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "logo saia da rotonda pola %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Saia da rotonda pola %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga a estrada durante os próximos %s"
 
@@ -1300,40 +1331,59 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
 msgstr ""
 
-msgid "Projection"
+msgid "_Layout"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
+msgstr ""
+
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "Zoom_In"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr ""
 
-msgid "Info"
+msgid "Redraw map"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-msgid "Cursor"
+msgid "Quit the application"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr ""
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1508,18 +1603,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1557,12 +1681,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1571,21 +1703,54 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
 msgstr ""
 
-#, c-format
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "En %s, entre na rotonda"
+
 #~ msgid "%d.%d kilometer"
 #~ msgstr "quilómetro %d.%d"
diff --git a/po/he.po.in b/po/he.po.in
index a470a0d08..35dd09fd1 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 20:37+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "מופעל מתיקיית המקור\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "הגדרת '%s' ל־'%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "במקום ה־0"
 
@@ -47,6 +49,7 @@ msgstr "חמישי"
 msgid "sixth"
 msgstr "שישי"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "היציאה ה-0"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "בעוד %d מ'"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d מטרים"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "בעוד %d מטרים"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "בעוד  %d.%d קילומטרים"
 
 #, 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] "קילומטר אחד"
@@ -167,18 +198,18 @@ msgstr "הכנס לכיכר הקרובה"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "ב%s, הכנס לכיכר"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "צא מהכיכר ב%s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "אחר כך צא מהכיכר ב%s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "צא מהכיכר ב%s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "המשך בדרך זו למשך %s"
 
@@ -1300,40 +1331,59 @@ msgstr "סימניה"
 msgid "Destination"
 msgstr "יעד"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "מסלול"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "יעדים קודמים"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "סימניות"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "מפה"
+
+msgid "_Layout"
 msgstr "מערך"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "תכנון"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "רכב (ׂGPS)"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "התרחק"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "התקרב"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "חשב מחדש"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "מידע"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "עצור ניווט"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "בדיקה"
 msgid "_Quit"
 msgstr "_יציאה"
 
-msgid "Cursor"
-msgstr "סמן"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "הנעל על הדרך"
 
-msgid "Northing"
-msgstr "הצפנה"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "הוראות נסיעה"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "זום אוטומטי"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "מסך מלא"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "חזרה"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "סימניות"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "סימנייה %s"
 
+msgid "Former Destinations"
+msgstr "יעדים קודמים"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "מספר בית"
 
+msgid "Layout"
+msgstr "מערך"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "מפות"
 
@@ -1508,18 +1603,30 @@ msgstr "הצגת מצב הלוויינים"
 msgid "Show NMEA data"
 msgstr "הצגת נתוני NMEA"
 
+msgid "Vehicle"
+msgstr "רכב (ׂGPS)"
+
 msgid "Rules"
 msgstr "כללים"
 
 msgid "Lock on road"
 msgstr "נעול על הדרך"
 
+msgid "Northing"
+msgstr "הצפנה"
+
 msgid "Map follows Vehicle"
 msgstr "מפה עוקבת אחר הרכב"
 
 msgid "Message"
 msgstr "הודעה"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "נקודה במפה"
+
+msgid "Vehicle Position"
+msgstr "מיקום רכב"
+
 msgid "Main menu"
 msgstr "תפריט ראשי"
 
@@ -1559,12 +1683,20 @@ msgstr "הגדרות"
 msgid "Tools"
 msgstr "כלים"
 
+msgid "Route"
+msgstr "מסלול"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "פעולות"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "יציאה"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "עצור\n"
 "ניווט"
 
+msgid "Display"
+msgstr "תצוגה"
+
+msgid "Fullscreen"
+msgstr "מסך מלא"
+
 msgid "Window Mode"
 msgstr "מצב חלון"
 
 msgid "Description"
 msgstr "תיאור"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "נקודה במפה"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "מיקום רכב"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "ב%s, הכנס לכיכר"
+
+#~ msgid "Cursor"
+#~ msgstr "סמן"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d קילומטר"
diff --git a/po/hr.po.in b/po/hr.po.in
index 88dd084ae..f34ad3e98 100644
--- a/po/hr.po.in
+++ b/po/hr.po.in
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-03-21 04:05+0000\n"
 "Last-Translator: klajo <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -27,6 +28,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -48,6 +50,7 @@ msgstr "peti"
 msgid "sixth"
 msgstr "šesti"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "za %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metara"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "za %d metara"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometara"
 
@@ -94,6 +113,20 @@ msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometara"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometar"
@@ -170,15 +203,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1303,40 +1336,59 @@ msgstr "Oznaka"
 msgid "Destination"
 msgstr "Odredište"
 
-msgid "Display"
+#. 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 "Ekran"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Ruta"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Nekadašnji odredište"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Oznake"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Karta"
+
+msgid "_Layout"
 msgstr "Izgled"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projekcija"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vozilo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "Ponovno izračunaj"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stop navigaciju"
 
 msgid "Test"
@@ -1345,19 +1397,34 @@ msgstr "Provjera"
 msgid "_Quit"
 msgstr "_Izlaz"
 
-msgid "Cursor"
-msgstr "Kursor"
+msgid "Quit the application"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Cijeli ekran"
 
 msgid "Data"
@@ -1421,6 +1488,7 @@ msgstr "Natrag"
 msgid "Add Bookmark"
 msgstr "Dodaj oznaku"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1460,6 +1528,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Oznake"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1467,9 +1539,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr "Nekadašnji odredište"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr "Izgled"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Karte"
 
@@ -1511,18 +1608,30 @@ msgstr "Pokaži status satelita"
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr "Vozilo"
+
 msgid "Rules"
 msgstr "Pravila"
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr "Poruka"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1546,6 +1655,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr "Pozicija vozila"
+
 msgid "Main menu"
 msgstr "Glavni izbornik"
 
@@ -1562,12 +1688,20 @@ msgstr "Postavke"
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr "Ruta"
+
 msgid "About"
 msgstr "O programu"
 
 msgid "Actions"
 msgstr "Akcije"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Izlaz"
 
@@ -1578,17 +1712,51 @@ msgstr ""
 "Stop\n"
 "navigaciju"
 
+msgid "Display"
+msgstr "Ekran"
+
+msgid "Fullscreen"
+msgstr "Cijeli ekran"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr "Opis"
 
-msgid "horse"
-msgstr "konj"
+msgid "car_shortest"
+msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Pozicija vozila"
+msgid "horse"
+msgstr "konj"
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Cursor"
+#~ msgstr "Kursor"
diff --git a/po/hu.po.in b/po/hu.po.in
index 0f29f7d38..9af5a291d 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 12:25+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Futtatás a forráskönyvtárból\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' beállítása erre: '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nulladik"
 
@@ -47,6 +49,7 @@ msgstr "ötödik"
 msgid "sixth"
 msgstr "hatodik"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nulladik kijáraton"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "%d m után"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d méter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "%d méter után"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d,%d kilométer"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "%d,%d kilométer után"
 
 #, 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] "egy kilométer"
@@ -167,18 +198,18 @@ msgstr "Hajtson be a körforgalomba hamarosan."
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "%s után hajtson be a körforgalomba."
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Hagyja el a körforgalmat a(z) %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "majd hagyja el a körforgalmat a(z) %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Hagyja el a körforgalmat a(z) %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Haladjon az úton a következő %sig"
 
@@ -1300,40 +1331,59 @@ msgstr "Könyvjelző"
 msgid "Destination"
 msgstr "Úticél"
 
-msgid "Display"
+#. 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 "Megjelenítés"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Útvonal"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Korábbi úticélok"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Könyvjelzők"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Térkép"
+
+msgid "_Layout"
 msgstr "Elrendezés"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Vetület"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Jármű"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Távolítás"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Közelítés"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Újratervezés"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Információk"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Navigálás vége"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Teszt"
 msgid "_Quit"
 msgstr "_Kilépés"
 
-msgid "Cursor"
-msgstr "Mutató"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Rögzítés az úthoz"
 
-msgid "Northing"
-msgstr "Észak felé"
+msgid "_Keep orientation to the North"
+msgstr ""
 
-msgid "Autozoom"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Útikalauz"
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
 msgstr "Ráközelítés"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Teljes képernyő"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Vissza"
 msgid "Add Bookmark"
 msgstr "Könyvjelző hozzáadása"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Könyvjelzők"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "%s hozzáadása a könyvjelzőkhöz"
 
+msgid "Former Destinations"
+msgstr "Korábbi úticélok"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Házszám"
 
+msgid "Layout"
+msgstr "Elrendezés"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Térképek"
 
@@ -1508,18 +1603,30 @@ msgstr "Műhold státusz"
 msgid "Show NMEA data"
 msgstr "NMEA adatok"
 
+msgid "Vehicle"
+msgstr "Jármű"
+
 msgid "Rules"
 msgstr "Szabályok"
 
 msgid "Lock on road"
 msgstr "Rögzítés az úthoz"
 
+msgid "Northing"
+msgstr "Észak felé"
+
 msgid "Map follows Vehicle"
 msgstr "A térkép követi a járművet"
 
 msgid "Message"
 msgstr "Üzenet"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Útvonalleírás"
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr "Vigyázz, kamera!"
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr "Lassíts!"
+
+msgid "Map Point"
+msgstr "Térképpont"
+
+msgid "Vehicle Position"
+msgstr "Jármű helyzete"
+
 msgid "Main menu"
 msgstr "Főmenü"
 
@@ -1559,12 +1683,20 @@ msgstr "Beállítások"
 msgid "Tools"
 msgstr "Eszközök"
 
+msgid "Route"
+msgstr "Útvonal"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Műveletek"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -1575,28 +1707,58 @@ msgstr ""
 "Navigáció\n"
 "leállítása"
 
+msgid "Display"
+msgstr "Megjelenítés"
+
+msgid "Fullscreen"
+msgstr "Teljes képernyő"
+
 msgid "Window Mode"
 msgstr "Ablak mód"
 
 msgid "Description"
 msgstr "Leírás"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "ló"
 
-msgid "Map Point"
-msgstr "Térképpont"
-
-msgid "Vehicle Position"
-msgstr "Jármű helyzete"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Look out! Camera!"
-msgstr "Vigyázz, kamera!"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "%s után hajtson be a körforgalomba."
 
-msgid "Please decrease your speed"
-msgstr "Lassíts!"
+#~ msgid "Cursor"
+#~ msgstr "Mutató"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d,%d kilométer"
 
diff --git a/po/id.po.in b/po/id.po.in
index 7749bde73..40e26b39f 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-27 15:01+0000\n"
 "Last-Translator: M Bambang I <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr "penataan '%s' ke '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "ke nol"
 
@@ -47,6 +49,7 @@ msgstr "kelima"
 msgid "sixth"
 msgstr "keenam"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "dalam %d meter"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "dalam %d meter"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometer"
 
@@ -93,6 +112,16 @@ msgid "in %d.%d kilometers"
 msgstr "dalam %d.%d kilometer"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -166,18 +195,18 @@ msgstr "segera memasuki bundaran"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Dalam %s,memasuki bundaran"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Tinggalkan bundaran pada %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "kemudian tinggalkan bundaran pada %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Tinggalkan bundaran pada %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
 
@@ -1299,40 +1328,59 @@ msgstr ""
 msgid "Destination"
 msgstr "Tujuan"
 
-msgid "Display"
+#. 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 "Tampilan"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rute"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Peta"
+
+msgid "_Layout"
 msgstr ""
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Proyeksi"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Kendaraan"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "Menghitung ulang"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informasi"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Navigasi berhenti"
 
 msgid "Test"
@@ -1341,19 +1389,34 @@ msgstr "Tes"
 msgid "_Quit"
 msgstr ""
 
-msgid "Cursor"
+msgid "Quit the application"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
-msgstr "Keutara"
+msgid "_Lock on Road"
+msgstr ""
+
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Panduan perjalanan"
 
-msgid "Autozoom"
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
 msgstr "AutoZoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Layar penuh"
 
 msgid "Data"
@@ -1417,6 +1480,7 @@ msgstr "Kembali"
 msgid "Add Bookmark"
 msgstr "Tambah Penanda"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1456,6 +1520,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1463,9 +1531,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Penanda %s"
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Nomer rumah"
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Peta - peta"
 
@@ -1507,18 +1600,30 @@ msgstr "Status Satelit"
 msgid "Show NMEA data"
 msgstr "Data NMEA"
 
+msgid "Vehicle"
+msgstr "Kendaraan"
+
 msgid "Rules"
 msgstr "Aturan - aturan"
 
 msgid "Lock on road"
 msgstr "Kunci pada jalan"
 
+msgid "Northing"
+msgstr "Keutara"
+
 msgid "Map follows Vehicle"
 msgstr "Peta mengikuti kendaraan"
 
 msgid "Message"
 msgstr "Pesan"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Deskripsi rute"
 
@@ -1542,6 +1647,23 @@ msgstr "Dan seluruh anggota tim Navit"
 msgid "members and contributors."
 msgstr "para anggota dan kontributor"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Letak pada peta"
+
+msgid "Vehicle Position"
+msgstr "Posisi kendaraan"
+
 msgid "Main menu"
 msgstr "Menu Utama"
 
@@ -1558,12 +1680,20 @@ msgstr "Pengaturan"
 msgid "Tools"
 msgstr "Peralatan"
 
+msgid "Route"
+msgstr "Rute"
+
 msgid "About"
 msgstr "Tentang"
 
 msgid "Actions"
 msgstr "Tindakan-tindakan"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Berhenti"
 
@@ -1574,17 +1704,51 @@ msgstr ""
 "Navigasi\n"
 "Berhenti"
 
+msgid "Display"
+msgstr "Tampilan"
+
+msgid "Fullscreen"
+msgstr "Layar penuh"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr "Deskripsi"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "kuda"
 
-msgid "Map Point"
-msgstr "Letak pada peta"
-
-msgid "Vehicle Position"
-msgstr "Posisi kendaraan"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Dalam %s,memasuki bundaran"
diff --git a/po/it.po.in b/po/it.po.in
index 1d6a27168..ed361bf91 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -6,12 +6,13 @@
 # Niccolo Rigacci <niccolo@rigacci.org>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 09:27+0000\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team: Italiano\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr "Esecuzione dalla cartella di compilazione\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "impostazione di '%s' a '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zero"
 
@@ -48,6 +50,7 @@ msgstr "quinto"
 msgid "sixth"
 msgstr "sesto"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "Uscita zero"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "fra %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metri"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "fra %d metri"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d chilometri"
 
@@ -94,6 +113,18 @@ msgid "in %d.%d kilometers"
 msgstr "fra %d,%d chilometri"
 
 #, 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 chilometro"
@@ -168,18 +199,18 @@ msgstr "Tra poco si entrerà in rotonda"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Tra %s entrare nella rotonda"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Alla rotonda prendere la %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "e alla rotonda prendere la %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Alla rotonda prendere la %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Seguire la strada per i prossimi %s"
 
@@ -1301,40 +1332,59 @@ msgstr "Posto"
 msgid "Destination"
 msgstr "Destinazione"
 
-msgid "Display"
+#. 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 "Visualizza"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Percorso"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinazioni precedenti"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Posti"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mappa"
+
+msgid "_Layout"
 msgstr "Layout"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Proiezione"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Veicolo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zoom -"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zoom +"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Ricalcola"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informazioni"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Interrompi la navigazione"
 
 msgid "Test"
@@ -1343,19 +1393,34 @@ msgstr "Prova"
 msgid "_Quit"
 msgstr "_Esci"
 
-msgid "Cursor"
-msgstr "Posizione attuale"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Prosegui su questa strada"
 
-msgid "Northing"
-msgstr "Visione verso nord"
+msgid "_Keep orientation to the North"
+msgstr ""
 
-msgid "Autozoom"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Quaderno di viaggio"
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
 msgstr "Zoom automatico"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Schermo intero"
 
 msgid "Data"
@@ -1398,11 +1463,11 @@ msgid "OT"
 msgstr "OT"
 
 #, c-format
-msgid "Route %4.0fkm %02d:%02d ETA"
-msgstr "Percorso %4.0f km, %02d:%02d ETA"
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr ""
 
-msgid "Route 0000km 0+00:00 ETA"
-msgstr "Percorso 0000 km, 00:00 ETA"
+msgid "Route 0000km  0+00:00 ETA"
+msgstr ""
 
 msgid "Back to map"
 msgstr "Torna alla mappa"
@@ -1419,6 +1484,7 @@ msgstr "Indietro"
 msgid "Add Bookmark"
 msgstr "Aggiungere un posto"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Aggiungere una cartella di posti"
 
@@ -1458,6 +1524,10 @@ msgstr "Incolla posto"
 msgid "Delete Bookmark"
 msgstr "Cancella posto"
 
+msgid "Bookmarks"
+msgstr "Posti"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Incolla posto"
 
@@ -1465,9 +1535,34 @@ msgstr "Incolla posto"
 msgid "Bookmark %s"
 msgstr "Posto %s"
 
+msgid "Former Destinations"
+msgstr "Destinazioni precedenti"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Numero civico"
 
+msgid "Layout"
+msgstr "Layout"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mappe"
 
@@ -1509,18 +1604,30 @@ msgstr "Mostra stato satellite"
 msgid "Show NMEA data"
 msgstr "Mostra dati NMEA"
 
+msgid "Vehicle"
+msgstr "Veicolo"
+
 msgid "Rules"
 msgstr "Regole"
 
 msgid "Lock on road"
 msgstr "Blocca sulla strada"
 
+msgid "Northing"
+msgstr "Visione verso nord"
+
 msgid "Map follows Vehicle"
 msgstr "La mappa segue il veicolo"
 
 msgid "Message"
 msgstr "Messaggio"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descrizione del percorso"
 
@@ -1544,6 +1651,23 @@ msgstr "e tutta la squadra Navit"
 msgid "members and contributors."
 msgstr "membri e contributori."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Punto sulla mappa"
+
+msgid "Vehicle Position"
+msgstr "Posizione del veicolo"
+
 msgid "Main menu"
 msgstr "Menù principale"
 
@@ -1560,12 +1684,20 @@ msgstr "Impostazioni"
 msgid "Tools"
 msgstr "Strumenti"
 
+msgid "Route"
+msgstr "Percorso"
+
 msgid "About"
 msgstr "Info"
 
 msgid "Actions"
 msgstr "Azioni"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Esci"
 
@@ -1574,21 +1706,63 @@ msgid ""
 "Navigation"
 msgstr "Stop"
 
+msgid "Display"
+msgstr "Visualizza"
+
+msgid "Fullscreen"
+msgstr "Schermo intero"
+
 msgid "Window Mode"
 msgstr "Modalità finestre"
 
 msgid "Description"
 msgstr "Descrizione"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "cavallo"
 
-msgid "Map Point"
-msgstr "Punto sulla mappa"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Posizione del veicolo"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Tra %s entrare nella rotonda"
+
+#~ msgid "Cursor"
+#~ msgstr "Posizione attuale"
+
+#~ msgid "Route %4.0fkm %02d:%02d ETA"
+#~ msgstr "Percorso %4.0f km, %02d:%02d ETA"
+
+#~ msgid "Route 0000km 0+00:00 ETA"
+#~ msgstr "Percorso 0000 km, 00:00 ETA"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d,%d chilometri"
diff --git a/po/ja.po.in b/po/ja.po.in
index a7f14b993..a82f30611 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-07-02 22:46+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -47,6 +49,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr ""
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d メートル"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr ""
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,16 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -167,15 +196,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1300,40 +1329,59 @@ msgstr "ブックマーク"
 msgid "Destination"
 msgstr "目的地"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "ルート"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "前の目的地"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "ブックマーク"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "地図"
+
+msgid "_Layout"
 msgstr ""
 
-msgid "Projection"
+msgid "_Projection"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "ズームアウト"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "ズームイン"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "再計算"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "案内中止"
 
 msgid "Test"
@@ -1342,19 +1390,34 @@ msgstr "テスト"
 msgid "_Quit"
 msgstr ""
 
-msgid "Cursor"
+msgid "Quit the application"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "全画面表示"
 
 msgid "Data"
@@ -1418,6 +1481,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1521,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "ブックマーク"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1532,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr "前の目的地"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1508,18 +1601,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1648,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1557,12 +1679,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr "ルート"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1571,21 +1701,51 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr "全画面表示"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
+msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d キロメートル"
diff --git a/po/jv.po.in b/po/jv.po.in
index c72915a6c..a4e7a9f5f 100644
--- a/po/jv.po.in
+++ b/po/jv.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 11:29+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-08-10 04:53+0000\n"
 "Last-Translator: Leonardus Priyo Handono <Unknown>\n"
 "Language-Team: Javanese <jv@li.org>\n"
+"Language: jv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,12 +19,6 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-msgid "exit"
-msgstr "metu"
-
-msgid "now"
-msgstr "saiki"
-
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
@@ -32,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -53,6 +49,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -83,6 +80,14 @@ msgid "in %d m"
 msgstr ""
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr ""
 
@@ -91,6 +96,14 @@ msgid "in %d meters"
 msgstr ""
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometer"
 
@@ -99,6 +112,18 @@ 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] ""
@@ -110,6 +135,9 @@ msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] "ing %d kilometer"
 
+msgid "exit"
+msgstr "metu"
+
 msgid "into the ramp"
 msgstr ""
 
@@ -165,14 +193,13 @@ msgstr "ora dikenal "
 msgid "When possible, please turn around"
 msgstr "Yen biso, mutero"
 
-#, c-format
-msgid "Enter the roundabout soon and leave it at the %s"
-msgstr "Mlebu puteran sedhelo maneh lan metu ing cawang %s"
+msgid "Enter the roundabout soon"
+msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "ing %s, mlebu puteran"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -198,6 +225,9 @@ msgstr "Jupuk dalan kaping %1$s ing %2$s"
 msgid "after %i roads"
 msgstr "sakwise %i dalan"
 
+msgid "now"
+msgstr "saiki"
+
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "Jupuk dalan kaping %1$s neng %2$s"
@@ -1301,55 +1331,59 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
 msgstr ""
 
-msgid "Projection"
+msgid "_Layout"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr ""
 
 msgid "Decrease zoom level"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr ""
 
 msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr ""
 
 msgid "Redraw map"
 msgstr ""
 
-msgid "Info"
+msgid "_Info"
 msgstr ""
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr ""
 
 msgid "Opens address search dialog"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1361,28 +1395,31 @@ msgstr ""
 msgid "Quit the application"
 msgstr ""
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
+msgid "_Roadbook"
+msgstr ""
+
 msgid "Show/hide route description"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr ""
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr ""
 
 msgid "Data"
@@ -1446,6 +1483,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1485,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1492,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1536,6 +1603,9 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
@@ -1551,6 +1621,12 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1574,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1588,12 +1681,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1602,17 +1703,54 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
 msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Enter the roundabout soon and leave it at the %s"
+#~ msgstr "Mlebu puteran sedhelo maneh lan metu ing cawang %s"
+
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "ing %s, mlebu puteran"
diff --git a/po/kk.po.in b/po/kk.po.in
index c525c151d..23fb1212b 100644
--- a/po/kk.po.in
+++ b/po/kk.po.in
@@ -4,12 +4,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2010-06-25 12:06+0200\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-02-24 19:32+0000\n"
 "Last-Translator: \n"
 "Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,6 +26,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -46,6 +48,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -76,6 +79,14 @@ msgid "in %d m"
 msgstr ""
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr ""
 
@@ -84,6 +95,14 @@ msgid "in %d meters"
 msgstr ""
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -92,6 +111,16 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -166,15 +195,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1299,52 +1328,59 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
 msgstr ""
 
-msgid "Projection"
+msgid "_Layout"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Projection"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "_Vehicle"
+msgstr ""
+
+msgid "Zoom_Out"
 msgstr ""
 
 msgid "Decrease zoom level"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr ""
 
 msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr ""
 
 msgid "Redraw map"
 msgstr ""
 
-msgid "Info"
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
 msgstr ""
 
 msgid "Opens address search dialog"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1356,28 +1392,31 @@ msgstr ""
 msgid "Quit the application"
 msgstr ""
 
-msgid "Cursor"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Northing"
+msgid "_Keep orientation to the North"
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
+msgid "_Roadbook"
+msgstr ""
+
 msgid "Show/hide route description"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr ""
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr ""
 
 msgid "Data"
@@ -1441,6 +1480,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1480,6 +1520,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1487,9 +1531,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1531,18 +1600,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1566,6 +1647,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1580,12 +1678,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1594,17 +1700,48 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
+msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
diff --git a/po/lt.po.in b/po/lt.po.in
index da42bcbdb..fde680d68 100644
--- a/po/lt.po.in
+++ b/po/lt.po.in
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 20:38+0000\n"
 "Last-Translator: laimonas <laimonas.mockus@gmail.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"(n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -27,6 +28,7 @@ msgstr "Paleidžiu pradiniame kataloge\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nustatau iš '%s' į '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nulinis"
 
@@ -48,6 +50,7 @@ msgstr "penktas"
 msgid "sixth"
 msgstr "šeštas"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nulinis išvažiavimas"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "už %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metrai"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "už %d metrų"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -94,6 +113,20 @@ msgid "in %d.%d kilometers"
 msgstr "už %d.%d kilometrų"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometras"
@@ -170,18 +203,18 @@ msgstr "Netrukus įsukite į žiedą"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Už %s, įsukite į žiedą"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "išsukite iš žiedo %s išvažiavime"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "tada išsukite iš žiedo %s išvažiavime"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "išsukite iš žiedo %s išvažiavime"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Laikykitės kelio sekančius %s"
 
@@ -1303,40 +1336,59 @@ msgstr "Pažymėti"
 msgid "Destination"
 msgstr "Kelionės tikslas"
 
-msgid "Display"
+#. 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 "Rodyti"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Parinkti kelią"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Ankstesnės vietos"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Adresynas"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Žemėlapis"
+
+msgid "_Layout"
 msgstr "Išdėstymas"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projekcija"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Transporto priemonė"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Sumažinti"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Padidinti"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Perskaičiuoti"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informacija"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stabdyti navigaciją"
 
 msgid "Test"
@@ -1345,19 +1397,34 @@ msgstr "Bandymas"
 msgid "_Quit"
 msgstr "_Išeiti"
 
-msgid "Cursor"
-msgstr "Kursorius"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Sekti kelią"
 
-msgid "Northing"
-msgstr "Į šiaurę"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Kelionės knyga"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Automatinis didinimas"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Visas ekranas"
 
 msgid "Data"
@@ -1421,6 +1488,7 @@ msgstr "Grįžti"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1460,6 +1528,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Adresynas"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1467,9 +1539,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Pasižymėti %s"
 
+msgid "Former Destinations"
+msgstr "Ankstesnės vietos"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Namo numeris"
 
+msgid "Layout"
+msgstr "Išdėstymas"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Žemėlapiai"
 
@@ -1511,18 +1608,30 @@ msgstr "Parodyti palydovų būseną"
 msgid "Show NMEA data"
 msgstr "Parodyti NMEA duomenis"
 
+msgid "Vehicle"
+msgstr "Transporto priemonė"
+
 msgid "Rules"
 msgstr "Taisyklės"
 
 msgid "Lock on road"
 msgstr "Sekti kelią"
 
+msgid "Northing"
+msgstr "Į šiaurę"
+
 msgid "Map follows Vehicle"
 msgstr "Sekti transporto priemonę"
 
 msgid "Message"
 msgstr "Žinutė"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1546,6 +1655,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Vieta žemėlapyje"
+
+msgid "Vehicle Position"
+msgstr "Transporto priemonės vieta"
+
 msgid "Main menu"
 msgstr "Pagrindinis meniu"
 
@@ -1562,12 +1688,20 @@ msgstr "Parinktys"
 msgid "Tools"
 msgstr "Įrankiai"
 
+msgid "Route"
+msgstr "Parinkti kelią"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Veiksmai"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Išeiti"
 
@@ -1578,21 +1712,57 @@ msgstr ""
 "Stabdyti\n"
 "navigaciją"
 
+msgid "Display"
+msgstr "Rodyti"
+
+msgid "Fullscreen"
+msgstr "Visas ekranas"
+
 msgid "Window Mode"
 msgstr "Langų režimas"
 
 msgid "Description"
 msgstr "Aprašas"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "Vieta žemėlapyje"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Transporto priemonės vieta"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Už %s, įsukite į žiedą"
+
+#~ msgid "Cursor"
+#~ msgstr "Kursorius"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometras"
diff --git a/po/lv.po.in b/po/lv.po.in
index 5612c0393..78ce5f9c8 100644
--- a/po/lv.po.in
+++ b/po/lv.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 21:37+0000\n"
 "Last-Translator: Janis <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nultais"
 
@@ -47,6 +49,7 @@ msgstr "piektais"
 msgid "sixth"
 msgstr "sestais"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nultā izeja"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "pēc %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metri"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "pēc %d metriem"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,20 @@ msgid "in %d.%d kilometers"
 msgstr "pēc %d.%d kilometr(a,iem"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometrs"
@@ -169,15 +202,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1302,40 +1335,59 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
 msgstr ""
 
-msgid "Projection"
+msgid "_Layout"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Projection"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "_Vehicle"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Zoom_Out"
 msgstr ""
 
-msgid "Recalculate"
+msgid "Decrease zoom level"
 msgstr ""
 
-msgid "Info"
+msgid "Zoom_In"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
+msgstr ""
+
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
+msgstr ""
+
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1344,19 +1396,34 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-msgid "Cursor"
+msgid "Quit the application"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr ""
 
 msgid "Data"
@@ -1420,6 +1487,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1459,6 +1527,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1466,9 +1538,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1510,18 +1607,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1545,6 +1654,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1559,12 +1685,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1573,21 +1707,51 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
+msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometrs"
diff --git a/po/mk.po.in b/po/mk.po.in
index c7d673692..95a3943b8 100644
--- a/po/mk.po.in
+++ b/po/mk.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-04-25 02:12+0000\n"
 "Last-Translator: Robert Mileski <r_mileski@hotmail.com>\n"
 "Language-Team: Macedonian <mk@li.org>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Работи од основниот директориум\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "смени '%s' во '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "нулти"
 
@@ -47,6 +49,7 @@ msgstr "петти"
 msgid "sixth"
 msgstr "шести"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "нема излез"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "после %d м"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d метри"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "после %d метра"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d километри"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "после %d.%d километри"
 
 #, 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 километри"
@@ -167,18 +198,18 @@ msgstr "Наскоро влегувате во кружен тек"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "После %s влегувате во кружен ток"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Излегувате од кружен тек на %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "Потоа излегувате од кружен тек на %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Излегувате од кружен тек на %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Следете го патот следните %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Омилено место"
 msgid "Destination"
 msgstr "Одредиште"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "Рута"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Претходни одредишта"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Омилени места"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Карта"
+
+msgid "_Layout"
 msgstr "Изглед"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Проекција"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Возило"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Намали"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Зголеми"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Повторно пресметај"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Инфо"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Запирање на навигација"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Тест"
 msgid "_Quit"
 msgstr "_Заврши"
 
-msgid "Cursor"
-msgstr "Покажувач"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Придржувај се до патот"
 
-msgid "Northing"
-msgstr "Северен правец"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Патна книга"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Авто-зголемување"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "На цел екран"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Назад"
 msgid "Add Bookmark"
 msgstr "Додај обележувач"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Омилени места"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Интересно место %s"
 
+msgid "Former Destinations"
+msgstr "Претходни одредишта"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Куќен број"
 
+msgid "Layout"
+msgstr "Изглед"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Изгледи"
 
@@ -1508,18 +1603,30 @@ msgstr "Покажи статус на сателитите"
 msgid "Show NMEA data"
 msgstr "Покажи NMEA податоци"
 
+msgid "Vehicle"
+msgstr "Возило"
+
 msgid "Rules"
 msgstr "Правила"
 
 msgid "Lock on road"
 msgstr "Придржувај се на патот"
 
+msgid "Northing"
+msgstr "Северен правец"
+
 msgid "Map follows Vehicle"
 msgstr "Картата го следи возилото"
 
 msgid "Message"
 msgstr "Порака"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Објаснување за патот"
 
@@ -1543,6 +1650,23 @@ msgstr "И целиот Navit тим"
 msgid "members and contributors."
 msgstr "членови и придонесувачи"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Точка на карта"
+
+msgid "Vehicle Position"
+msgstr "Позиција на возило"
+
 msgid "Main menu"
 msgstr "Главно мени"
 
@@ -1559,12 +1683,20 @@ msgstr "Поставувања"
 msgid "Tools"
 msgstr "Алатки"
 
+msgid "Route"
+msgstr "Рута"
+
 msgid "About"
 msgstr "За"
 
 msgid "Actions"
 msgstr "Акции"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Напушти"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "Сопри ја\n"
 "Навигацијата"
 
+msgid "Display"
+msgstr "Екран"
+
+msgid "Fullscreen"
+msgstr "На цел екран"
+
 msgid "Window Mode"
 msgstr "Работи во прозорец"
 
 msgid "Description"
 msgstr "Опис"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "коњ"
 
-msgid "Map Point"
-msgstr "Точка на карта"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Позиција на возило"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "После %s влегувате во кружен ток"
+
+#~ msgid "Cursor"
+#~ msgstr "Покажувач"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d километри"
diff --git a/po/nb.po.in b/po/nb.po.in
index 6c5e5de71..c724e64ab 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -6,12 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-19 07:59+0000\n"
 "Last-Translator: Kurt Nielsen <Unknown>\n"
 "Language-Team: Bendik Brenne <bendik@xplore.nu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr "Kjører fra kildemappen\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setter '%s' til '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nullte"
 
@@ -48,6 +50,7 @@ msgstr "femte"
 msgid "sixth"
 msgstr "sjette"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nullte avkjørsel"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "om %d meter"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "om %d meter"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometer"
 
@@ -94,6 +113,18 @@ msgid "in %d.%d kilometers"
 msgstr "om %d,%d kilometer"
 
 #, 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] "en kilometer"
@@ -168,18 +199,18 @@ msgstr "Kjør inn i rundkjøringen snart"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Om %s, kjør inn i rundkjøringen"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Forlat rundkjøringen ut %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "forlat så rundkjøringen ut %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Forlat rundkjøringen ut %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Følg veien de neste %s"
 
@@ -1301,40 +1332,59 @@ msgstr "Bokmerke"
 msgid "Destination"
 msgstr "Reisemål"
 
-msgid "Display"
+#. 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 "Visning"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rute"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Tidligere reisemål"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Bokmerker"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kart"
+
+msgid "_Layout"
 msgstr "Utseende"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projeksjon"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Kjøretøy"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zoom ut"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zoom inn"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Omberegn"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stopp navigasjon"
 
 msgid "Test"
@@ -1343,19 +1393,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "_Avslutt"
 
-msgid "Cursor"
-msgstr "Markør"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Lås til vei"
 
-msgid "Northing"
-msgstr "Hold nord oppover"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Kjørebok"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Auto-zoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Fullskjerm"
 
 msgid "Data"
@@ -1419,6 +1484,7 @@ msgstr "Tilbake"
 msgid "Add Bookmark"
 msgstr "Legg til bokmerke"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Legg til bokmerke mappe"
 
@@ -1458,6 +1524,10 @@ msgstr "Lim inn bokmerke"
 msgid "Delete Bookmark"
 msgstr "Slett bokmerke"
 
+msgid "Bookmarks"
+msgstr "Bokmerker"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Lim inn bokmerke"
 
@@ -1465,9 +1535,34 @@ msgstr "Lim inn bokmerke"
 msgid "Bookmark %s"
 msgstr "Bokmerk %s"
 
+msgid "Former Destinations"
+msgstr "Tidligere reisemål"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Husnummer"
 
+msgid "Layout"
+msgstr "Utseende"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kart"
 
@@ -1509,18 +1604,30 @@ msgstr "Vis satelittstatus"
 msgid "Show NMEA data"
 msgstr "Vis NMEA-data"
 
+msgid "Vehicle"
+msgstr "Kjøretøy"
+
 msgid "Rules"
 msgstr "Regler"
 
 msgid "Lock on road"
 msgstr "Lås til vei"
 
+msgid "Northing"
+msgstr "Hold nord oppover"
+
 msgid "Map follows Vehicle"
 msgstr "Kart følger kjøretøy"
 
 msgid "Message"
 msgstr "Melding"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1544,6 +1651,23 @@ msgstr "Og alle i Navit teamet"
 msgid "members and contributors."
 msgstr "medlemmer og bidragsytere."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Kartpunkt"
+
+msgid "Vehicle Position"
+msgstr "Kjøretøysposisjon"
+
 msgid "Main menu"
 msgstr "Hovedmeny"
 
@@ -1560,12 +1684,20 @@ msgstr "Innstillinger"
 msgid "Tools"
 msgstr "Verktøy"
 
+msgid "Route"
+msgstr "Rute"
+
 msgid "About"
 msgstr "Om"
 
 msgid "Actions"
 msgstr "Handlinger"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -1576,21 +1708,57 @@ msgstr ""
 "Stopp\n"
 "navigasjon"
 
+msgid "Display"
+msgstr "Visning"
+
+msgid "Fullscreen"
+msgstr "Fullskjerm"
+
 msgid "Window Mode"
 msgstr "Vindusmodus"
 
 msgid "Description"
 msgstr "Beskrivelse"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "hest"
 
-msgid "Map Point"
-msgstr "Kartpunkt"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Kjøretøysposisjon"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Om %s, kjør inn i rundkjøringen"
+
+#~ msgid "Cursor"
+#~ msgstr "Markør"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d,%d kilometer"
diff --git a/po/nds.po.in b/po/nds.po.in
index ae86f4c8a..971466e43 100644
--- a/po/nds.po.in
+++ b/po/nds.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 09:29+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: German, Low <nds@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Aus dem Quellverzeichins starten\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "%s zu %s setzen\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "diese"
 
@@ -47,6 +49,7 @@ msgstr "fünfte"
 msgid "sixth"
 msgstr "sechste"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "diese Ausfahrt"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "in %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d Meter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "in %d Metern"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "in %d %d Kilometern"
 
 #, 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] "ein Kilometer"
@@ -167,18 +198,18 @@ msgstr "In Kürze in den Kreisverkehr einfahren"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "In %s, in den Kreisverkehr einfahren"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Den Kreisverkehr an der %s verlassen"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "dann den Kreisverkehr an der %s verlassen"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Den Kreisverkehr an der %s verlassen"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Der Straße %s folgen"
 
@@ -1300,40 +1331,59 @@ msgstr "Lesezeichen"
 msgid "Destination"
 msgstr "Reiseziel"
 
-msgid "Display"
+#. 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 "Anzeige"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Route"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Vorherige Ziele"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Lesezeichen"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Karte"
+
+msgid "_Layout"
 msgstr "Erscheinungsbild"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Darstellung"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Fahrzeug"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Verkleinern"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Vergrößern"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Neu berechnen"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Information"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Navigation beenden"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "_Beenden"
 
-msgid "Cursor"
-msgstr "Zeiger"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Auf Straße zeigen"
 
-msgid "Northing"
-msgstr "Einnorden"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Straßenatlas"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "automatischer Zoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Vollbild"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Zurück"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Lesezeichen"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Lesezeichen %s"
 
+msgid "Former Destinations"
+msgstr "Vorherige Ziele"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Huisnummer"
 
+msgid "Layout"
+msgstr "Erscheinungsbild"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Karten"
 
@@ -1508,18 +1603,30 @@ msgstr "Satellitenstatus anzeigen"
 msgid "Show NMEA data"
 msgstr "NMEA Daten anzeigen"
 
+msgid "Vehicle"
+msgstr "Fahrzeug"
+
 msgid "Rules"
 msgstr "Regeln"
 
 msgid "Lock on road"
 msgstr "Auf Straße zeigen"
 
+msgid "Northing"
+msgstr "Einnorden"
+
 msgid "Map follows Vehicle"
 msgstr "Karte folgt Fahrzeug"
 
 msgid "Message"
 msgstr "Nachricht"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Kartenpunkt"
+
+msgid "Vehicle Position"
+msgstr "Fahrzeugposition"
+
 msgid "Main menu"
 msgstr "Hauptmenü"
 
@@ -1559,12 +1683,20 @@ msgstr "Einstellungen"
 msgid "Tools"
 msgstr "Werkzeuge"
 
+msgid "Route"
+msgstr "Route"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Aktionen"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Beenden"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "Navigation\n"
 "beenden"
 
+msgid "Display"
+msgstr "Anzeige"
+
+msgid "Fullscreen"
+msgstr "Vollbild"
+
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
 msgid "Description"
 msgstr "Beschreibung"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "Kartenpunkt"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Fahrzeugposition"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "In %s, in den Kreisverkehr einfahren"
+
+#~ msgid "Cursor"
+#~ msgstr "Zeiger"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d %d Kilometer"
diff --git a/po/nl.po.in b/po/nl.po.in
index 0aa14366f..599fb9004 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -5,12 +5,13 @@
 # Ed Kapitein <Unknown>
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-17 08:22+0000\n"
 "Last-Translator: Christ van Willegen <cvwillegen+launchpad@gmail.com>\n"
 "Language-Team: afaber\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Gestart vanuit de brondirectory\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "Instelling '%s' naar '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nulde"
 
@@ -47,6 +49,7 @@ msgstr "vijfde"
 msgid "sixth"
 msgstr "zesde"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nulde afrit"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "na %d meter"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "na %d meter"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometer"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "na %d,%d kilometer"
 
 #, 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] "één kilometer"
@@ -167,18 +198,18 @@ msgstr "U rijdt zodadelijk de rotonde op"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Neem de rotonde over %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Verlaat de rotonde bij de %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "daarna de rotonde verlaten bij de %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Verlaat de rotonde bij de %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Volg de weg voor de volgende %s"
 
@@ -1305,50 +1336,59 @@ msgstr "Favoriet"
 msgid "Destination"
 msgstr "Bestemming"
 
-msgid "Display"
+#. 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 "Tonen"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Route"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Vorige bestemmingen"
 
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-"Vorige\n"
-"bestemmingen"
-
-msgid "- No former destinations available -"
-msgstr "- Geen vorige bestemmingen -"
-
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Favorieten"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kaart"
+
+msgid "_Layout"
 msgstr "Opmaak"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projectie"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Voertuig"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Verkleinen"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Vergroten"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Herberekenen"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stop navigatie"
 
 msgid "Test"
@@ -1357,19 +1397,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "Beëindigen"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Huidige locatie altijd op de weg"
 
-msgid "Northing"
-msgstr "Noord boven"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Roadbook"
+msgstr "route beschrijving"
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
 msgstr "Autozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Beeldvullend"
 
 msgid "Data"
@@ -1433,6 +1488,7 @@ msgstr "Terug"
 msgid "Add Bookmark"
 msgstr "Bladwijzer Toevoegen"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1472,6 +1528,10 @@ msgstr "Plak Bladwijzer"
 msgid "Delete Bookmark"
 msgstr "Verwijder Bladwijzer"
 
+msgid "Bookmarks"
+msgstr "Favorieten"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Plak Bladwijzer"
 
@@ -1479,9 +1539,34 @@ msgstr "Plak Bladwijzer"
 msgid "Bookmark %s"
 msgstr "Favoriet %s"
 
+msgid "Former Destinations"
+msgstr "Vorige bestemmingen"
+
+msgid "- No former destinations available -"
+msgstr "- Geen vorige bestemmingen -"
+
 msgid "House number"
 msgstr "Huisnummer"
 
+msgid "Layout"
+msgstr "Opmaak"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kaarten"
 
@@ -1523,18 +1608,30 @@ msgstr "Satellietstatus weergeven"
 msgid "Show NMEA data"
 msgstr "Toon NMEA-gegevens"
 
+msgid "Vehicle"
+msgstr "Voertuig"
+
 msgid "Rules"
 msgstr "Voorschrift"
 
 msgid "Lock on road"
 msgstr "Op weg plaatsen"
 
+msgid "Northing"
+msgstr "Noord boven"
+
 msgid "Map follows Vehicle"
 msgstr "Kaart volgt voertuig"
 
 msgid "Message"
 msgstr "Boodschap"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Routebeschrijving"
 
@@ -1558,6 +1655,23 @@ msgstr "En het hele Navit Team"
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Punt op de kaart"
+
+msgid "Vehicle Position"
+msgstr "Voertuigpositie"
+
 msgid "Main menu"
 msgstr "Hoofdmenu"
 
@@ -1574,12 +1688,22 @@ msgstr "Instellingen"
 msgid "Tools"
 msgstr "Gereedschappen"
 
+msgid "Route"
+msgstr "Route"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Acties"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+"Vorige\n"
+"bestemmingen"
+
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -1590,21 +1714,57 @@ msgstr ""
 "Stop\n"
 "navigatie"
 
+msgid "Display"
+msgstr "Tonen"
+
+msgid "Fullscreen"
+msgstr "Beeldvullend"
+
 msgid "Window Mode"
 msgstr "Venstermodus"
 
 msgid "Description"
 msgstr "Beschrijving"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "paard"
 
-msgid "Map Point"
-msgstr "Punt op de kaart"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Voertuigpositie"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Neem de rotonde over %s"
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d,%d kilometer"
diff --git a/po/nn.po.in b/po/nn.po.in
index 9d8e91c2d..cb974cf3e 100644
--- a/po/nn.po.in
+++ b/po/nn.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 21:37+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nullte"
 
@@ -47,6 +49,7 @@ msgstr "femte"
 msgid "sixth"
 msgstr "sjette"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nullte avkjøyring"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "om %d meter"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "om %d meter"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "om %d,%d kilometer"
 
 #, 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] "ein kilometer"
@@ -167,15 +198,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1300,40 +1331,59 @@ msgstr "Bokmerke"
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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 "Visning"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rute"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Bokmerker"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Kart"
+
+msgid "_Layout"
 msgstr ""
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projeksjon"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zoom ut"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zoom inn"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Berekne på nytt"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Opplysningar"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Stopp navigasjon"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr ""
 
-msgid "Cursor"
-msgstr "Peikar"
+msgid "Quit the application"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
+msgstr ""
+
+msgid "_Lock on Road"
 msgstr "Lås til veg"
 
-msgid "Northing"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
 msgstr ""
 
-msgid "Autozoom"
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
 msgstr "Auto-zoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Heile skjermen"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Tilbake"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Bokmerker"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Bokmerk %s"
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Husnummer"
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kart"
 
@@ -1508,18 +1603,30 @@ msgstr "Vis satelittstatus"
 msgid "Show NMEA data"
 msgstr "Vis NMEA-data"
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr "Reglar"
 
 msgid "Lock on road"
 msgstr "Lås til veg"
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr "Melding"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr "Hovudmeny"
 
@@ -1559,12 +1683,20 @@ msgstr "Innstillingar"
 msgid "Tools"
 msgstr "Verkty"
 
+msgid "Route"
+msgstr "Rute"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Handlingar"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -1575,21 +1707,54 @@ msgstr ""
 "Stopp\n"
 "navigasjon"
 
+msgid "Display"
+msgstr "Visning"
+
+msgid "Fullscreen"
+msgstr "Heile skjermen"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr "Beskriving"
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
 msgstr ""
 
-#, c-format
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Cursor"
+#~ msgstr "Peikar"
+
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d,%d kilometer"
diff --git a/po/pl.po.in b/po/pl.po.in
index 3bae7988d..4936d4074 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-09 18:10+0000\n"
 "Last-Translator: Lukasz Semler <lukasz_semler@o2.pl>\n"
 "Language-Team: Translators\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,6 +30,7 @@ msgstr "Uruchamiam z katalogu źródłowego\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ustawiam '%s' na '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zerowy"
 
@@ -50,6 +52,7 @@ msgstr "piąty"
 msgid "sixth"
 msgstr "szósty"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "zerowym wyjeździe"
 
@@ -80,6 +83,14 @@ msgid "in %d m"
 msgstr "za %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metrów"
 
@@ -88,6 +99,14 @@ msgid "in %d meters"
 msgstr "za %d m"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometrów"
 
@@ -96,6 +115,20 @@ msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrów"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "jeden kilometr"
@@ -172,18 +205,18 @@ msgstr "Wjazd na rondo wkrótce"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Wjedź na rondo za %s"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Zjedź z ronda na %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "następnie zjedź z ronda na %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Zjedź z ronda na %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Jedź tą drogą %s"
 
@@ -1305,40 +1338,59 @@ msgstr "Zakładka"
 msgid "Destination"
 msgstr "Cel"
 
-msgid "Display"
+#. 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 "Pokaż"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Trasa"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Poprzednie cele"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Zakładki"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Układ kolorów"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Odwzorowanie"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Pojazd"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Oddal"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zbliż"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Oblicz ponownie"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Zatrzymaj nawigację"
 
 msgid "Test"
@@ -1347,19 +1399,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "Zakończ"
 
-msgid "Cursor"
-msgstr "Kursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Trzymaj się drogi"
 
-msgid "Northing"
-msgstr "Północ zawsze na górze"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Szczegóły trasy"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Automatyczne przybliżenie"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Pełny ekran"
 
 msgid "Data"
@@ -1423,6 +1490,7 @@ msgstr "Wróć"
 msgid "Add Bookmark"
 msgstr "Dodaj zakładkę"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Dodaj folder zakładek"
 
@@ -1462,6 +1530,10 @@ msgstr "Wklej zakładkę"
 msgid "Delete Bookmark"
 msgstr "Usuń zakładkę"
 
+msgid "Bookmarks"
+msgstr "Zakładki"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Wklej zakładkę"
 
@@ -1469,9 +1541,34 @@ msgstr "Wklej zakładkę"
 msgid "Bookmark %s"
 msgstr "Zakładka %s"
 
+msgid "Former Destinations"
+msgstr "Poprzednie cele"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Numer domu"
 
+msgid "Layout"
+msgstr "Układ kolorów"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapy"
 
@@ -1513,18 +1610,30 @@ msgstr "Pokaż status satelitów"
 msgid "Show NMEA data"
 msgstr "Pokaż dane NMEA"
 
+msgid "Vehicle"
+msgstr "Pojazd"
+
 msgid "Rules"
 msgstr "Reguły"
 
 msgid "Lock on road"
 msgstr "Trzymaj się drogi"
 
+msgid "Northing"
+msgstr "Północ zawsze na górze"
+
 msgid "Map follows Vehicle"
 msgstr "Wyśrodkuj mapę"
 
 msgid "Message"
 msgstr "Wiadomość"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Opis trasy"
 
@@ -1548,6 +1657,23 @@ msgstr "I cały zespół Navit"
 msgid "members and contributors."
 msgstr "członkowie oraz współtwórcy."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Punkt na mapie"
+
+msgid "Vehicle Position"
+msgstr "Pozycja pojazdu"
+
 msgid "Main menu"
 msgstr "Menu główne"
 
@@ -1564,12 +1690,20 @@ msgstr "Ustawienia"
 msgid "Tools"
 msgstr "Narzędzia"
 
+msgid "Route"
+msgstr "Trasa"
+
 msgid "About"
 msgstr "O"
 
 msgid "Actions"
 msgstr "Akcje"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Zakończ"
 
@@ -1580,21 +1714,57 @@ msgstr ""
 "Przerwij\n"
 "nawigację"
 
+msgid "Display"
+msgstr "Pokaż"
+
+msgid "Fullscreen"
+msgstr "Pełny ekran"
+
 msgid "Window Mode"
 msgstr "Tryb Widoku"
 
 msgid "Description"
 msgstr "Opis"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "koń"
 
-msgid "Map Point"
-msgstr "Punkt na mapie"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Pozycja pojazdu"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Wjedź na rondo za %s"
+
+#~ msgid "Cursor"
+#~ msgstr "Kursor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometra"
diff --git a/po/pt.po.in b/po/pt.po.in
index 2d5128ca8..be5bb178a 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 12:25+0000\n"
 "Last-Translator: CaioNavas <webmaster@caiomnavas.com.br>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Executando do diretório de origem\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ajuste '%s' to '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zero"
 
@@ -47,6 +49,7 @@ msgstr "quinta"
 msgid "sixth"
 msgstr "sexto"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "saída zero"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "em %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "em %d metros"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "em %d.%d quilómetros"
 
 #, 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] "um quilḿetro"
@@ -167,18 +198,18 @@ msgstr "em breve entre na rotatória"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Em %s, entre na rotatória"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Deixe a rotunda na %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "depois deixe a rotunda na %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Deixe a rotunda na %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga a estrada para a próxima %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Marcador"
 msgid "Destination"
 msgstr "Destino"
 
-msgid "Display"
+#. 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 "Exibir"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rota"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Anteriores Destinos"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Marcadores"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Esquema"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projecção"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Veículo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "ZoomOut"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "ZoomIn"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalcular"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Parar Navegação"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Teste"
 msgid "_Quit"
 msgstr "_Sair"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Bloqueio na estrada"
 
-msgid "Northing"
-msgstr "Norte"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Roadbook"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Zoom Automático"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Ecrã Inteiro"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Voltar"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Marcador %s"
 
+msgid "Former Destinations"
+msgstr "Anteriores Destinos"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Número da Casa"
 
+msgid "Layout"
+msgstr "Esquema"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapas"
 
@@ -1508,18 +1603,30 @@ msgstr "Mostrar estado do Satélite"
 msgid "Show NMEA data"
 msgstr "Mostrar dados NMEA"
 
+msgid "Vehicle"
+msgstr "Veículo"
+
 msgid "Rules"
 msgstr "Regras"
 
 msgid "Lock on road"
 msgstr "Prender na estrada"
 
+msgid "Northing"
+msgstr "Norte"
+
 msgid "Map follows Vehicle"
 msgstr "Mapa segue veículo"
 
 msgid "Message"
 msgstr "Mensagem"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Ponto do mapa"
+
+msgid "Vehicle Position"
+msgstr "Posição do Veículo"
+
 msgid "Main menu"
 msgstr "Menu Principal"
 
@@ -1559,12 +1683,20 @@ msgstr "Definições"
 msgid "Tools"
 msgstr "Ferramentas"
 
+msgid "Route"
+msgstr "Rota"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Acções"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Sair"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "Parar\n"
 "Navegação"
 
+msgid "Display"
+msgstr "Exibir"
+
+msgid "Fullscreen"
+msgstr "Ecrã Inteiro"
+
 msgid "Window Mode"
 msgstr "Modo de Janela"
 
 msgid "Description"
 msgstr "Descrição"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "Ponto do mapa"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Posição do Veículo"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Em %s, entre na rotatória"
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d quilómetros"
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index 316812747..480853e51 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-13 14:14+0000\n"
 "Last-Translator: leopoldonet <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Executando do diretório de origem\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ajustando '%s' para '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zero"
 
@@ -47,6 +49,7 @@ msgstr "quinta"
 msgid "sixth"
 msgstr "sexta"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "saída zero"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "em %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "em %d metros"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometros"
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "em %d.%d kilometros"
 
 #, 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] "um kilometro"
@@ -167,18 +198,18 @@ msgstr "em breve entre na rotatória"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Em %s, entre na rotatória"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Deixe a rotatória na %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "então deixe a rotatória na %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Deixe a rotatória na %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga a estrada pelo próximo %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Marcador"
 msgid "Destination"
 msgstr "Destino"
 
-msgid "Display"
+#. 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 "Display"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rota"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinos anteriores"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Marcadores"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Layout"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projeção"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Veículo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Afastar"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Aproximar"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalcular"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informação"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Parar Navegação"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Teste"
 msgid "_Quit"
 msgstr "_Sair"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Prender na Estrada"
 
-msgid "Northing"
-msgstr "Ao Norte"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Guia de estrada"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Zoom Automático"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Tela Inteira"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Voltar"
 msgid "Add Bookmark"
 msgstr "Adicionar aos Favoritos"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Adicionar Pasta de Favoritos"
 
@@ -1457,6 +1523,10 @@ msgstr "Colar Favorito"
 msgid "Delete Bookmark"
 msgstr "Apagar Favorito"
 
+msgid "Bookmarks"
+msgstr "Marcadores"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Colar favorito"
 
@@ -1464,9 +1534,34 @@ msgstr "Colar favorito"
 msgid "Bookmark %s"
 msgstr "Anotar %s"
 
+msgid "Former Destinations"
+msgstr "Destinos anteriores"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Número da casa"
 
+msgid "Layout"
+msgstr "Layout"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapas"
 
@@ -1508,18 +1603,30 @@ msgstr "Mostrar Status do Satélite"
 msgid "Show NMEA data"
 msgstr "Mostrar dados NMEA"
 
+msgid "Vehicle"
+msgstr "Veículo"
+
 msgid "Rules"
 msgstr "Regras"
 
 msgid "Lock on road"
 msgstr "Prender na estrada"
 
+msgid "Northing"
+msgstr "Ao Norte"
+
 msgid "Map follows Vehicle"
 msgstr "Mapa segue veículo"
 
 msgid "Message"
 msgstr "Mensagem"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descrição da Rota"
 
@@ -1543,6 +1650,23 @@ msgstr "e tudo o equipe do Navit"
 msgid "members and contributors."
 msgstr "membros e contributores"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Ponto no mapa"
+
+msgid "Vehicle Position"
+msgstr "Posição do Veículo"
+
 msgid "Main menu"
 msgstr "Menu Principal"
 
@@ -1559,12 +1683,20 @@ msgstr "Ajustes"
 msgid "Tools"
 msgstr "Ferramentas"
 
+msgid "Route"
+msgstr "Rota"
+
 msgid "About"
 msgstr "Sobre"
 
 msgid "Actions"
 msgstr "Ações"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Sair"
 
@@ -1575,22 +1707,58 @@ msgstr ""
 "Parar\n"
 "Navegação"
 
+msgid "Display"
+msgstr "Display"
+
+msgid "Fullscreen"
+msgstr "Tela Inteira"
+
 msgid "Window Mode"
 msgstr "Modo de Janela"
 
 msgid "Description"
 msgstr "Descrição"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "cavalo"
 
-msgid "Map Point"
-msgstr "Ponto no mapa"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Posição do Veículo"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Em %s, entre na rotatória"
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometros"
 
diff --git a/po/ro.po.in b/po/ro.po.in
index dfcb34c7e..96552bc92 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-12 09:37+0000\n"
 "Last-Translator: igorashu <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr "Rulează din directorul sursă\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "se setează „%s” ca „%s”\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "zero"
 
@@ -48,6 +50,7 @@ msgstr "a cincea"
 msgid "sixth"
 msgstr "a șasea"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "ieșirea zero"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "în %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metri"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "în %d metri"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometri"
 
@@ -94,6 +113,20 @@ msgid "in %d.%d kilometers"
 msgstr "în %d.%d kilometri"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilometru"
@@ -170,18 +203,18 @@ msgstr "Intrați în curând în giratoriu"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "În %s, intrați în sensul giratoriu"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Ieșiți din giratoriu la %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "apoi ieșiți din giratoriu la %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Ieșiți din giratoriu la %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Urmați drumul pentru încă %s"
 
@@ -1303,40 +1336,59 @@ msgstr "Semn de carte"
 msgid "Destination"
 msgstr "Destinaţie"
 
-msgid "Display"
+#. 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 "Ecran"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Traseu"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Destinații anterioare"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Semne de carte"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Hartă"
+
+msgid "_Layout"
 msgstr "Dispunere"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Proiecție"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vehicul"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Depărtează"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Apropie"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Recalculează"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informații"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Oprește navigarea"
 
 msgid "Test"
@@ -1345,19 +1397,34 @@ msgstr "Testează"
 msgid "_Quit"
 msgstr "_Ieșire"
 
-msgid "Cursor"
-msgstr "Cursor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Fixează strada"
 
-msgid "Northing"
-msgstr "Nimic"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Drum blocat"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Pe tot ecranul"
 
 msgid "Data"
@@ -1421,6 +1488,7 @@ msgstr "Înapoi"
 msgid "Add Bookmark"
 msgstr "Adaugă semn de carte"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Adaugă director pentru semne de carte"
 
@@ -1460,6 +1528,10 @@ msgstr "Lipește semnul de carte"
 msgid "Delete Bookmark"
 msgstr "Șterge semnul de carte"
 
+msgid "Bookmarks"
+msgstr "Semne de carte"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Lipește semn de carte"
 
@@ -1467,9 +1539,34 @@ msgstr "Lipește semn de carte"
 msgid "Bookmark %s"
 msgstr "%s ca semn de carte"
 
+msgid "Former Destinations"
+msgstr "Destinații anterioare"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Număr casă"
 
+msgid "Layout"
+msgstr "Dispunere"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Hărți"
 
@@ -1511,18 +1608,30 @@ msgstr "Arată starea sateliților"
 msgid "Show NMEA data"
 msgstr "Arată datele NMEA"
 
+msgid "Vehicle"
+msgstr "Vehicul"
+
 msgid "Rules"
 msgstr "Reguli"
 
 msgid "Lock on road"
 msgstr "Fixează strada"
 
+msgid "Northing"
+msgstr "Nimic"
+
 msgid "Map follows Vehicle"
 msgstr "Harta urmează vehiculul"
 
 msgid "Message"
 msgstr "Mesaj"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descrerea traseului"
 
@@ -1546,6 +1655,23 @@ msgstr "Și întreaga echipă Navit"
 msgid "members and contributors."
 msgstr "membri și colaboratori."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Locație pe hartă"
+
+msgid "Vehicle Position"
+msgstr "Poziția vehiculului"
+
 msgid "Main menu"
 msgstr "Meniu principal"
 
@@ -1562,12 +1688,20 @@ msgstr "Configurații"
 msgid "Tools"
 msgstr "Unelte"
 
+msgid "Route"
+msgstr "Traseu"
+
 msgid "About"
 msgstr "Despre"
 
 msgid "Actions"
 msgstr "Acțiuni"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Ieși"
 
@@ -1578,21 +1712,57 @@ msgstr ""
 "Oprește\n"
 "navigația"
 
+msgid "Display"
+msgstr "Ecran"
+
+msgid "Fullscreen"
+msgstr "Pe tot ecranul"
+
 msgid "Window Mode"
 msgstr "Mod „fereastră”"
 
 msgid "Description"
 msgstr "Descriere"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "cal"
 
-msgid "Map Point"
-msgstr "Locație pe hartă"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Poziția vehiculului"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "În %s, intrați în sensul giratoriu"
+
+#~ msgid "Cursor"
+#~ msgstr "Cursor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "kilometrul %d.%d"
diff --git a/po/ru.po.in b/po/ru.po.in
index 669cbfaa9..d61b0e3f8 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 11:29+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-30 18:26+0000\n"
 "Last-Translator: Denis Chapligin <akashihi@gmail.com>\n"
 "Language-Team: Rustam T. Usmanov\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2010-06-30 20:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
@@ -28,6 +29,7 @@ msgstr "Запуск в исходном каталоге\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "установка '%s' в '%s'\\n\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "нулевой"
 
@@ -49,6 +51,7 @@ msgstr "пятый"
 msgid "sixth"
 msgstr "шестой"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "нулевой выезд"
 
@@ -79,6 +82,14 @@ msgid "in %d m"
 msgstr "через %d м"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d метров"
 
@@ -87,6 +98,14 @@ msgid "in %d meters"
 msgstr "через %d метров"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d,%d км."
 
@@ -95,6 +114,20 @@ msgid "in %d.%d kilometers"
 msgstr "через %d,%d км."
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d километр"
@@ -166,14 +199,13 @@ msgstr "неизвестно "
 msgid "When possible, please turn around"
 msgstr "Развернитесь, пожалуйста, если это возможно"
 
-#, c-format
-msgid "Enter the roundabout soon and leave it at the %s"
-msgstr "Скоро круговое движение, ожидайте съезд на %s"
+msgid "Enter the roundabout soon"
+msgstr "Скоро круговое движение"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Круговое движение через %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -1305,55 +1337,59 @@ msgstr "Закладка"
 msgid "Destination"
 msgstr "Пункт назначения"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "Маршрут"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Прошлые пункты назначения"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Закладки"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Карта"
+
+msgid "_Layout"
 msgstr "Схема"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Проекция"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Т/с"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Уменьшить"
 
 msgid "Decrease zoom level"
 msgstr "Уменьшить масштаб"
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr "Увеличить"
 
 msgid "Increase zoom level"
 msgstr "Увеличить масштаб"
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "Пересчитать"
 
 msgid "Redraw map"
 msgstr "Обновить карту"
 
-msgid "Info"
+msgid "_Info"
 msgstr "Информация"
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr "Установить пункт назначения"
 
 msgid "Opens address search dialog"
 msgstr "Диалог поиска по адресу"
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr "Остановить навигацию"
 
 msgid "Test"
@@ -1365,28 +1401,31 @@ msgstr "_Выход"
 msgid "Quit the application"
 msgstr "Выйти из программы"
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr "Показать/скрыть отметку текущей позиции"
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Заблокировать дорогу"
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr "Ориентировать карту на север"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "Переключить ориентацию карты на север или по ходу движения"
 
+msgid "_Roadbook"
+msgstr "Дорожный справочник"
+
 msgid "Show/hide route description"
 msgstr "Показать описание маршрута"
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Автомасштабирование"
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr "Включить/выключить автоматическое масштабирование"
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr "Во весь экран"
 
 msgid "Data"
@@ -1450,6 +1489,7 @@ msgstr "Назад"
 msgid "Add Bookmark"
 msgstr "Добавить закладку"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Добавить папку закладок"
 
@@ -1489,6 +1529,10 @@ msgstr "Вставить закладку"
 msgid "Delete Bookmark"
 msgstr "Удалить закладку"
 
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Вставить закладку"
 
@@ -1496,9 +1540,34 @@ msgstr "Вставить закладку"
 msgid "Bookmark %s"
 msgstr "Закладка %s"
 
+msgid "Former Destinations"
+msgstr "Прошлые пункты назначения"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Номер дома"
 
+msgid "Layout"
+msgstr "Схема"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Карты"
 
@@ -1540,6 +1609,9 @@ msgstr "Показать состояние Спутников"
 msgid "Show NMEA data"
 msgstr "Показать данные NMEA"
 
+msgid "Vehicle"
+msgstr "Т/с"
+
 msgid "Rules"
 msgstr "Правила"
 
@@ -1555,6 +1627,12 @@ msgstr "Карта следует за машиной"
 msgid "Message"
 msgstr "Сообщение"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Описание маршрута"
 
@@ -1578,6 +1656,23 @@ msgstr "И все участники команды Navit"
 msgid "members and contributors."
 msgstr "и лица внесшие вклад"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Точка на карте"
+
+msgid "Vehicle Position"
+msgstr "Местоположение автомобиля"
+
 msgid "Main menu"
 msgstr "Главное меню"
 
@@ -1594,12 +1689,20 @@ msgstr "Настройки"
 msgid "Tools"
 msgstr "Инструменты"
 
+msgid "Route"
+msgstr "Маршрут"
+
 msgid "About"
 msgstr "О программе"
 
 msgid "Actions"
 msgstr "Команды"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Выход"
 
@@ -1610,30 +1713,63 @@ msgstr ""
 "Прекращение\n"
 "навигации"
 
+msgid "Display"
+msgstr "Дисплей"
+
+msgid "Fullscreen"
+msgstr "Во весь экран"
+
 msgid "Window Mode"
 msgstr "Режим окна"
 
 msgid "Description"
 msgstr "Описание"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "лошадь"
 
-msgid "Map Point"
-msgstr "Точка на карте"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Местоположение автомобиля"
+#~ msgid "Enter the roundabout soon and leave it at the %s"
+#~ msgstr "Скоро круговое движение, ожидайте съезд на %s"
+
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Круговое движение через %s"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d километр"
 
 #~ msgid "Cursor"
 #~ msgstr "Курсор"
 
-#~ msgid "Enter the roundabout soon"
-#~ msgstr "Скоро круговое движение"
-
 #~ msgid " SNR "
 #~ msgstr " Сигнал/Шум "
diff --git a/po/sk.po.in b/po/sk.po.in
index ca82d4037..9b5ce30b7 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-11 09:50+0000\n"
 "Last-Translator: kayle.sk <webmaster@kayle.sk>\n"
 "Language-Team: Slovenčina\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Beží zo zdrojového adresára\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavuje sa „%s“ na „%s“\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nultý"
 
@@ -47,6 +49,7 @@ msgstr "piaty"
 msgid "sixth"
 msgstr "šiesty"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "nultý výjazd"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "o %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "o %d metrov"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometrov"
 
@@ -93,6 +112,20 @@ msgid "in %d.%d kilometers"
 msgstr "o %d.%d kilometrov"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometrov"
@@ -169,18 +202,18 @@ msgstr "Vstúpte do kruhového objazdu onedlho"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "O %s vstúpte do kruhového objazdu"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Opustite kruhový objazd na %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "potom opustite kruhový objazd na %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Opustite kruhový objazd na %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte naďalej po ceste %s"
 
@@ -1302,40 +1335,59 @@ msgstr "Záložka"
 msgid "Destination"
 msgstr "Cieľ"
 
-msgid "Display"
+#. 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 "Displej"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Trasa"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Predošlé cieľe"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Záložky"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Mapa"
+
+msgid "_Layout"
 msgstr "Značenie"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projekcia"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vozidlo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Oddialiť"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Priblížiť"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Prepočítať"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Informácie"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Zastaviť navigáciu"
 
 msgid "Test"
@@ -1344,19 +1396,34 @@ msgstr "Otestovať"
 msgid "_Quit"
 msgstr "_Koniec"
 
-msgid "Cursor"
-msgstr "Kurzor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Uzamknúť na cesty"
 
-msgid "Northing"
-msgstr "Sever vždy hore"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Plán trasy"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Automatické zväčšenie"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Celá obrazovka"
 
 msgid "Data"
@@ -1420,6 +1487,7 @@ msgstr "Späť"
 msgid "Add Bookmark"
 msgstr "Pridať záložku"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Pridať priečinok pre záložky"
 
@@ -1459,6 +1527,10 @@ msgstr "Vložiť záložku"
 msgid "Delete Bookmark"
 msgstr "Odstrániť záložku"
 
+msgid "Bookmarks"
+msgstr "Záložky"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Vložiť záložku"
 
@@ -1466,9 +1538,34 @@ msgstr "Vložiť záložku"
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
+msgid "Former Destinations"
+msgstr "Predošlé cieľe"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Číslo domu"
 
+msgid "Layout"
+msgstr "Značenie"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Mapy"
 
@@ -1510,18 +1607,30 @@ msgstr "Zobraziť stav satelitov"
 msgid "Show NMEA data"
 msgstr "Zobraziť NMEA data"
 
+msgid "Vehicle"
+msgstr "Vozidlo"
+
 msgid "Rules"
 msgstr "Pravidlá"
 
 msgid "Lock on road"
 msgstr "Prichytiť k ceste"
 
+msgid "Northing"
+msgstr "Sever vždy hore"
+
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
 msgid "Message"
 msgstr "Správa"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Popis trasy"
 
@@ -1545,6 +1654,23 @@ msgstr "A všetci členovia týmu Navitu"
 msgid "members and contributors."
 msgstr "členovia a prispievatelia"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Bod na mape"
+
+msgid "Vehicle Position"
+msgstr "Pozícia vozidla"
+
 msgid "Main menu"
 msgstr "Hlavné menu"
 
@@ -1561,12 +1687,20 @@ msgstr "Nastavenia"
 msgid "Tools"
 msgstr "Nástroje"
 
+msgid "Route"
+msgstr "Trasa"
+
 msgid "About"
 msgstr "O programe"
 
 msgid "Actions"
 msgstr "Akcie"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Koniec"
 
@@ -1577,21 +1711,57 @@ msgstr ""
 "Zastaviť\n"
 "navigáciu"
 
+msgid "Display"
+msgstr "Displej"
+
+msgid "Fullscreen"
+msgstr "Celá obrazovka"
+
 msgid "Window Mode"
 msgstr "V okne"
 
 msgid "Description"
 msgstr "Popis"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "kôň"
 
-msgid "Map Point"
-msgstr "Bod na mape"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Pozícia vozidla"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "O %s vstúpte do kruhového objazdu"
+
+#~ msgid "Cursor"
+#~ msgstr "Kurzor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometra"
diff --git a/po/sl.po.in b/po/sl.po.in
index 306a07aa6..ed2ae76dd 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-07-02 21:39+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
-"n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -27,6 +28,7 @@ msgstr "Zagon iz mape z izvorno kodo\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavljam '%s' na '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "ničt"
 
@@ -48,6 +50,7 @@ msgstr "pet"
 msgid "sixth"
 msgstr "šest"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "Čez %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "Čez %d metrov"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -94,6 +113,22 @@ msgid "in %d.%d kilometers"
 msgstr "Čez %d.%d kilometov"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometrov"
@@ -172,15 +207,15 @@ msgstr "Kmalu zapeljite v krožišče"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Čez %s zapeljite v krožišče"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1305,40 +1340,59 @@ msgstr "Zaznamek"
 msgid "Destination"
 msgstr "Cilj"
 
-msgid "Display"
+#. 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 "Prikaz"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Načrt poti"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Prejšnji cilji"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Zaznamki"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Zemljevid"
+
+msgid "_Layout"
 msgstr "Razporeditev"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projekcija"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Vozilo"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Pomanjšava"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Povečava"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Preračunaj"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Podrobnosti"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Ustavi navigacijo"
 
 msgid "Test"
@@ -1347,19 +1401,34 @@ msgstr "Preizkus"
 msgid "_Quit"
 msgstr "_Izhod"
 
-msgid "Cursor"
-msgstr "Kurzor"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Ostani na cesti"
 
-msgid "Northing"
-msgstr "Sever zgoraj"
+msgid "_Keep orientation to the North"
+msgstr ""
 
-msgid "Autozoom"
+msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Roadbook"
+msgstr "Načrt poti"
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Celozaslonski način"
 
 msgid "Data"
@@ -1423,6 +1492,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1462,6 +1532,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Zaznamki"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1469,9 +1543,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Zaznamuj %s"
 
+msgid "Former Destinations"
+msgstr "Prejšnji cilji"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr "Razporeditev"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Zemljevidi"
 
@@ -1513,18 +1612,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr "Vozilo"
+
 msgid "Rules"
 msgstr "Pravila"
 
 msgid "Lock on road"
 msgstr "Prikleni na cesto"
 
+msgid "Northing"
+msgstr "Sever zgoraj"
+
 msgid "Map follows Vehicle"
 msgstr "Zemljevid sledi vozilu"
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1548,6 +1659,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr "Položaj vozila"
+
 msgid "Main menu"
 msgstr "Glavni meni"
 
@@ -1562,12 +1690,20 @@ msgstr "Nastavitve"
 msgid "Tools"
 msgstr "Orodja"
 
+msgid "Route"
+msgstr "Načrt poti"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Dejanja"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Izhod"
 
@@ -1576,21 +1712,57 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr "Prikaz"
+
+msgid "Fullscreen"
+msgstr "Celozaslonski način"
+
 msgid "Window Mode"
 msgstr "Okenski način"
 
 msgid "Description"
 msgstr ""
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Položaj vozila"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Čez %s zapeljite v krožišče"
+
+#~ msgid "Cursor"
+#~ msgstr "Kurzor"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometrov"
diff --git a/po/sr.po.in b/po/sr.po.in
index 5226c62ef..1b35c4195 100644
--- a/po/sr.po.in
+++ b/po/sr.po.in
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-06-08 21:56+0000\n"
 "Last-Translator: momcilo <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -27,6 +28,7 @@ msgstr "Покренут из изворног директоријума\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "постављам вредност '%s' на '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "нулти"
 
@@ -48,6 +50,7 @@ msgstr "пето"
 msgid "sixth"
 msgstr "шестп"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "нулти излаз"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "за %d м"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d метара"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "за %d метара"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d километара"
 
@@ -94,6 +113,20 @@ msgid "in %d.%d kilometers"
 msgstr "за %d.%d километара"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d километара"
@@ -170,18 +203,18 @@ msgstr "Ускоро прелазак на обилазницу"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "За %s, прелазак на обилазницу"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Напуштање обилазнице за %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "потом напутстите обилазницу на %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Напуштање обилазнице за %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Прати пут до следећег %s"
 
@@ -1303,40 +1336,59 @@ msgstr "Обележивач"
 msgid "Destination"
 msgstr "Одредиште"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "рута"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Претходна одредишта"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Обележивачи"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Карта"
+
+msgid "_Layout"
 msgstr "Распоред"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Пројекција"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Возило"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Умањи"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Увећај"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Прерачунај"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Подаци"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Заустави навигацију"
 
 msgid "Test"
@@ -1345,19 +1397,34 @@ msgstr "Проба"
 msgid "_Quit"
 msgstr "_Изађи"
 
-msgid "Cursor"
-msgstr "Курсор"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Прати пут"
 
-msgid "Northing"
-msgstr "Ништа"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "План пута"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Аутоматски увећавање"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Цео екран"
 
 msgid "Data"
@@ -1421,6 +1488,7 @@ msgstr "Назад"
 msgid "Add Bookmark"
 msgstr "Додавање обележивача"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Додај фолдер са обележивачима"
 
@@ -1460,6 +1528,10 @@ msgstr "Прилепи обележивач"
 msgid "Delete Bookmark"
 msgstr "Обриши обележивач"
 
+msgid "Bookmarks"
+msgstr "Обележивачи"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Прилепи обележивач"
 
@@ -1467,9 +1539,34 @@ msgstr "Прилепи обележивач"
 msgid "Bookmark %s"
 msgstr "Обележи %s"
 
+msgid "Former Destinations"
+msgstr "Претходна одредишта"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Кућни број"
 
+msgid "Layout"
+msgstr "Распоред"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Мапе"
 
@@ -1511,18 +1608,30 @@ msgstr "Прикажи стање сателита"
 msgid "Show NMEA data"
 msgstr "Прикажи NMEA податке"
 
+msgid "Vehicle"
+msgstr "Возило"
+
 msgid "Rules"
 msgstr "Правила"
 
 msgid "Lock on road"
 msgstr "Прати пут"
 
+msgid "Northing"
+msgstr "Ништа"
+
 msgid "Map follows Vehicle"
 msgstr "Мапа прати возило"
 
 msgid "Message"
 msgstr "Порука"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Опис руте"
 
@@ -1546,6 +1655,23 @@ msgstr "И цео Navit тим"
 msgid "members and contributors."
 msgstr "чланови и доприносиоци"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Тачка на мапи"
+
+msgid "Vehicle Position"
+msgstr "Позиција возила"
+
 msgid "Main menu"
 msgstr "Главни мени"
 
@@ -1560,12 +1686,20 @@ msgstr "Подешавања"
 msgid "Tools"
 msgstr "Алати"
 
+msgid "Route"
+msgstr "рута"
+
 msgid "About"
 msgstr "O"
 
 msgid "Actions"
 msgstr "Поступци"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Заврши"
 
@@ -1576,17 +1710,54 @@ msgstr ""
 "Заустави\n"
 "навигацију"
 
+msgid "Display"
+msgstr "Приказ"
+
+msgid "Fullscreen"
+msgstr "Цео екран"
+
 msgid "Window Mode"
 msgstr "Режим прозора"
 
 msgid "Description"
 msgstr "Опис"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "коњ"
 
-msgid "Map Point"
-msgstr "Тачка на мапи"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Позиција возила"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "За %s, прелазак на обилазницу"
+
+#~ msgid "Cursor"
+#~ msgstr "Курсор"
diff --git a/po/sv.po.in b/po/sv.po.in
index f3200829c..bcd81f883 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-18 12:27+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Körs från källkodsbiblioteket\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "sätter '%s' till '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "nollte"
 
@@ -47,6 +49,7 @@ msgstr "femte"
 msgid "sixth"
 msgstr "sjätte"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "ingen avfart"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "om %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "om %d meter"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "om %d,%d kilometer"
 
 #, 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] "en kilometer"
@@ -167,18 +198,18 @@ msgstr "Kör snart in i rondellen"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Om %s, kör in i rondellen"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Kör ut ur rondellen mot %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "kör sedan ut ur rondellen mot %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Kör ut ur rondellen mot %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Följ vägen i %s"
 
@@ -1300,40 +1331,59 @@ msgstr "Bokmärke"
 msgid "Destination"
 msgstr "Destination"
 
-msgid "Display"
+#. 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 "Visa"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rutt"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Tidigare destinationer"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Bokmärken"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Karta"
+
+msgid "_Layout"
 msgstr "Layout"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Projektion"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Fordon"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Zooma ut"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Zooma in"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Gör ny beräkning"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Info"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Avsluta navigering"
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "Testa"
 msgid "_Quit"
 msgstr "_Avsluta"
 
-msgid "Cursor"
-msgstr "Markör"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Lås till vägen"
 
-msgid "Northing"
-msgstr "Håll norr uppåt"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Vägbok"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Autozoom"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Helskärm"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr "Tillbaka"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Bokmärken"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Bokmärk %s"
 
+msgid "Former Destinations"
+msgstr "Tidigare destinationer"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Husnummer"
 
+msgid "Layout"
+msgstr "Layout"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Kartor"
 
@@ -1508,18 +1603,30 @@ msgstr "Visa satellitstatus"
 msgid "Show NMEA data"
 msgstr "Visa NMEA-data"
 
+msgid "Vehicle"
+msgstr "Fordon"
+
 msgid "Rules"
 msgstr "Regler"
 
 msgid "Lock on road"
 msgstr "Lås till väg"
 
+msgid "Northing"
+msgstr "Håll norr uppåt"
+
 msgid "Map follows Vehicle"
 msgstr "Kartan följer fordonet"
 
 msgid "Message"
 msgstr "Meddelande"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Kartpunkt"
+
+msgid "Vehicle Position"
+msgstr "Fordonsposition"
+
 msgid "Main menu"
 msgstr "Huvudmeny"
 
@@ -1559,12 +1683,20 @@ msgstr "Inställningar"
 msgid "Tools"
 msgstr "Verktyg"
 
+msgid "Route"
+msgstr "Rutt"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Åtgärder"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -1575,21 +1707,57 @@ msgstr ""
 "Stoppa\n"
 "Navigering"
 
+msgid "Display"
+msgstr "Visa"
+
+msgid "Fullscreen"
+msgstr "Helskärm"
+
 msgid "Window Mode"
 msgstr "Fönsterläge"
 
 msgid "Description"
 msgstr "Beskrivning"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "Kartpunkt"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Fordonsposition"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Om %s, kör in i rondellen"
+
+#~ msgid "Cursor"
+#~ msgstr "Markör"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d,%d kilometer"
diff --git a/po/ta.po.in b/po/ta.po.in
index 0a5d7651c..455da997b 100644
--- a/po/ta.po.in
+++ b/po/ta.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 11:29+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-07-07 20:13+0000\n"
 "Last-Translator: Dinesh Ramalingam <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s', '%s' ஆக மாற்றபடுகின்றது\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -47,6 +49,7 @@ msgstr "ஐந்தாவது"
 msgid "sixth"
 msgstr "ஆறாவது"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "%d நி.யில்"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d மீட்டர்கள்"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "%d மீட்டருக்குள்"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d கிலோமீட்டர்கள்."
 
@@ -93,6 +112,18 @@ msgid "in %d.%d kilometers"
 msgstr "%d.%d கிலோமீட்டருக்குள்"
 
 #, 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] "ஒரு கிலோமீட்டர்"
@@ -162,13 +193,12 @@ msgstr ""
 msgid "When possible, please turn around"
 msgstr ""
 
-#, c-format
-msgid "Enter the roundabout soon and leave it at the %s"
+msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
@@ -1301,55 +1331,59 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
 msgstr ""
 
-msgid "Projection"
+msgid "_Layout"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Projection"
+msgstr ""
+
+msgid "_Vehicle"
 msgstr ""
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr ""
 
 msgid "Decrease zoom level"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr ""
 
 msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr ""
 
 msgid "Redraw map"
 msgstr ""
 
-msgid "Info"
+msgid "_Info"
 msgstr ""
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr ""
 
 msgid "Opens address search dialog"
 msgstr ""
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1361,28 +1395,31 @@ msgstr ""
 msgid "Quit the application"
 msgstr ""
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr ""
 
+msgid "_Roadbook"
+msgstr ""
+
 msgid "Show/hide route description"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr ""
 
 msgid "Enable/disable automatic zoom level changing"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "_Fullscreen"
 msgstr ""
 
 msgid "Data"
@@ -1446,6 +1483,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1485,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1492,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1536,6 +1603,9 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr ""
+
 msgid "Rules"
 msgstr ""
 
@@ -1551,6 +1621,12 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1574,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1588,12 +1681,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1602,17 +1703,48 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr ""
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
+msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
diff --git a/po/te.po.in b/po/te.po.in
index dd4857916..afecf8b5d 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-07-02 20:53+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -47,6 +49,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr ""
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d మీటర్లు"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr ""
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,18 @@ 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] "ఒక కిలోమీటరు"
@@ -167,15 +198,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1300,40 +1331,59 @@ msgstr ""
 msgid "Destination"
 msgstr "గమ్యం"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr ""
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr ""
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "పేజీకలు"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "పటం"
+
+msgid "_Layout"
 msgstr "కూర్పు"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr ""
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "వాహనం"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
+msgstr ""
+
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr ""
 
-msgid "ZoomIn"
+msgid "Increase zoom level"
 msgstr ""
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr ""
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "సమాచారం"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr ""
 
 msgid "Test"
@@ -1342,19 +1392,34 @@ msgstr "పరీక్ష"
 msgid "_Quit"
 msgstr ""
 
-msgid "Cursor"
+msgid "Quit the application"
 msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "నిండు తెర"
 
 msgid "Data"
@@ -1418,6 +1483,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1523,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "పేజీకలు"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1534,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr ""
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr "కూర్పు"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1508,18 +1603,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr "వాహనం"
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1650,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1557,12 +1681,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr ""
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1571,17 +1703,48 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
+msgid "Fullscreen"
+msgstr "నిండు తెర"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
+msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
 msgstr ""
diff --git a/po/th.po.in b/po/th.po.in
index 89918c5c7..22b0e22d2 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-07-02 21:52+0000\n"
 "Last-Translator: mansv68 <mansv68@yahoo.co.th>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr "กำหนด '%s' ถึง '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -47,6 +49,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "อีก %d เมตร"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d เมตร"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "อีก %d เมตร"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,16 @@ msgid "in %d.%d kilometers"
 msgstr "อีก %d.%d กิโลเมตร"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d กิโลเมตร"
@@ -165,15 +194,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1298,40 +1327,59 @@ msgstr ""
 msgid "Destination"
 msgstr "จุดหมาย"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "เส้นทาง"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "ก่อนถึง ที่หมาย"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "บุ๊กมาร์ก"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "แผนที่"
+
+msgid "_Layout"
 msgstr "การจัดเรียง"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "การฉายแผนที่"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "ยานพาหนะ"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "ขยายออก"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "ขยายเข้า"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "คำนวนใหม่"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "ข้อมูล"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "หยุดการนำทาง"
 
 msgid "Test"
@@ -1340,19 +1388,34 @@ msgstr "ทดสอบ"
 msgid "_Quit"
 msgstr "_ออกจากโปรแกรม"
 
-msgid "Cursor"
-msgstr "เคอร์เซอร์"
+msgid "Quit the application"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
-msgstr "ทางทิศเหนือ"
+msgid "_Lock on Road"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "แสดงผลเต็มจอภาพ"
 
 msgid "Data"
@@ -1416,6 +1479,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1455,6 +1519,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "บุ๊กมาร์ก"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1462,9 +1530,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr "ก่อนถึง ที่หมาย"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr "การจัดเรียง"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1506,18 +1599,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr "ยานพาหนะ"
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr "ทางทิศเหนือ"
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1541,6 +1646,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1555,12 +1677,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr "เส้นทาง"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1569,21 +1699,54 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr "แสดง"
+
+msgid "Fullscreen"
+msgstr "แสดงผลเต็มจอภาพ"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
 msgstr ""
 
-#, c-format
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Cursor"
+#~ msgstr "เคอร์เซอร์"
+
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d  กิโลเมตร"
diff --git a/po/tr.po.in b/po/tr.po.in
index 2350d007a..7eb7293a4 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-10 15:05+0000\n"
 "Last-Translator: seqizz (gurkanGur) <seqizz@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Kaynak klasörden çalıştırılıyor\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' , '%s' değerine ayarlanıyor\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "sıfırıncı"
 
@@ -47,6 +49,7 @@ msgstr "beşinci"
 msgid "sixth"
 msgstr "altıncı"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "sıfırıncı çıkış"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "%d m'de"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d metre"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "%d metrede"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d kilometre"
 
@@ -93,6 +112,16 @@ msgid "in %d.%d kilometers"
 msgstr "%d.%d kilometrede"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometre"
@@ -165,18 +194,18 @@ msgstr "Yakındaki kavşağa girin"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "%s içerisinde kavşağa girin"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "%s'de kavşaktan çıkın"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "ardından %s'de kavşaktan çıkın"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "%s'de kavşaktan çıkın"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Gelecek %s için yolu takip et"
 
@@ -1298,40 +1327,59 @@ msgstr "Yer imi"
 msgid "Destination"
 msgstr "Hedef"
 
-msgid "Display"
+#. 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 "Görüntüle"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Rota"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "önceki istikamet"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Yer İmleri"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Harita"
+
+msgid "_Layout"
 msgstr "Yerleşim"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "İzdüşüm"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Araç"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Uzaklaştır"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Yakınlaştır"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Yeniden hesapla"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Bilgi"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Dolaşmayı Durdur"
 
 msgid "Test"
@@ -1340,19 +1388,34 @@ msgstr "Test"
 msgid "_Quit"
 msgstr "Çı_kış"
 
-msgid "Cursor"
-msgstr "İmleç"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Kapalı yol"
 
-msgid "Northing"
-msgstr "Kuzey mesafesi"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Yol Haritası"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Oto-yaklaş"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Tam Ekran"
 
 msgid "Data"
@@ -1416,6 +1479,7 @@ msgstr "Geri"
 msgid "Add Bookmark"
 msgstr "Yer İmi Ekle"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1455,6 +1519,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Yer İmleri"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1462,9 +1530,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Yerimi ata %s"
 
+msgid "Former Destinations"
+msgstr "önceki istikamet"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Ev no:"
 
+msgid "Layout"
+msgstr "Yerleşim"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Haritalar"
 
@@ -1506,18 +1599,30 @@ msgstr "Uydu durumunuı göster"
 msgid "Show NMEA data"
 msgstr "NMEA verisi göster"
 
+msgid "Vehicle"
+msgstr "Araç"
+
 msgid "Rules"
 msgstr "Kurallar"
 
 msgid "Lock on road"
 msgstr "Yola Kilitlen"
 
+msgid "Northing"
+msgstr "Kuzey mesafesi"
+
 msgid "Map follows Vehicle"
 msgstr "Harita aracı takip etsin"
 
 msgid "Message"
 msgstr "Mesaj"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Rota Açıklaması"
 
@@ -1541,6 +1646,23 @@ msgstr "Ve tüm Navit takımı"
 msgid "members and contributors."
 msgstr "üyeler ve katkıda bulunanlar."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Harita Noktası"
+
+msgid "Vehicle Position"
+msgstr "Araç Konumu"
+
 msgid "Main menu"
 msgstr "Ana menü"
 
@@ -1555,12 +1677,20 @@ msgstr "Ayarlar"
 msgid "Tools"
 msgstr "Araçlar"
 
+msgid "Route"
+msgstr "Rota"
+
 msgid "About"
 msgstr "Hakkında"
 
 msgid "Actions"
 msgstr "Eylemler"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Çık"
 
@@ -1571,21 +1701,57 @@ msgstr ""
 "Navigasyonu\n"
 "Durdur"
 
+msgid "Display"
+msgstr "Görüntüle"
+
+msgid "Fullscreen"
+msgstr "Tam Ekran"
+
 msgid "Window Mode"
 msgstr "Pencere Modu"
 
 msgid "Description"
 msgstr "Açıklama"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "at"
 
-msgid "Map Point"
-msgstr "Harita Noktası"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Araç Konumu"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "%s içerisinde kavşağa girin"
+
+#~ msgid "Cursor"
+#~ msgstr "İmleç"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometre"
diff --git a/po/uk.po.in b/po/uk.po.in
index 51e394947..1702ce669 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-05-28 14:54+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -27,6 +28,7 @@ msgstr "Запуск з початкового каталогу\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "настройка '%s' до '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "нульовий"
 
@@ -48,6 +50,7 @@ msgstr "п’ятий"
 msgid "sixth"
 msgstr "шостий"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "нульовий виїзд"
 
@@ -78,6 +81,14 @@ msgid "in %d m"
 msgstr "за %d м"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d метрів"
 
@@ -86,6 +97,14 @@ msgid "in %d meters"
 msgstr "за %d метрів"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d кілометрів"
 
@@ -94,6 +113,20 @@ msgid "in %d.%d kilometers"
 msgstr "за %d.%d кілометрів"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d кілометр"
@@ -170,18 +203,18 @@ msgstr "Скоро виїзд на дорогу з кільцевим рухом
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Через %s виїзд на дорогу з кільцевим рухом"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Виїдьте з кільця через %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "тоді виїдьте з кільця через %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Виїдьте з кільця через %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Їдьте дорогою наступні %s"
 
@@ -1303,40 +1336,59 @@ msgstr "Закладка"
 msgid "Destination"
 msgstr "Пункт призначення"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "Дорога"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Минулий пункт призначення"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Закладки"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Карта"
+
+msgid "_Layout"
 msgstr "Розкладка"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Проекція"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Транспортний засіб"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Зменшити"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Збільшити"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Перерахувати"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Інформація"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Зупинити навігацію"
 
 msgid "Test"
@@ -1345,19 +1397,34 @@ msgstr "Тест"
 msgid "_Quit"
 msgstr "_Вийти"
 
-msgid "Cursor"
-msgstr "Курсор"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Триматися дороги"
 
-msgid "Northing"
-msgstr "Північніше"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Атлас доріг"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Авторозмір"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "На весь екран"
 
 msgid "Data"
@@ -1421,6 +1488,7 @@ msgstr "Назад"
 msgid "Add Bookmark"
 msgstr "Додати закладку"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "Додати папку закладок"
 
@@ -1460,6 +1528,10 @@ msgstr "Вставити закладку"
 msgid "Delete Bookmark"
 msgstr "Вилучити закладку"
 
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "Вставити закладку"
 
@@ -1467,9 +1539,34 @@ msgstr "Вставити закладку"
 msgid "Bookmark %s"
 msgstr "Закладка %s"
 
+msgid "Former Destinations"
+msgstr "Минулий пункт призначення"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Номер будинку"
 
+msgid "Layout"
+msgstr "Розкладка"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Карти"
 
@@ -1511,18 +1608,30 @@ msgstr "Показати статус супутника"
 msgid "Show NMEA data"
 msgstr "Показати дані NMEA"
 
+msgid "Vehicle"
+msgstr "Транспортний засіб"
+
 msgid "Rules"
 msgstr "Правила"
 
 msgid "Lock on road"
 msgstr "Триматися дороги"
 
+msgid "Northing"
+msgstr "Північніше"
+
 msgid "Map follows Vehicle"
 msgstr "Карта слідує за транспортним засобом"
 
 msgid "Message"
 msgstr "Повідомлення"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Опис маршруту"
 
@@ -1546,6 +1655,23 @@ msgstr "Все про Navit Team"
 msgid "members and contributors."
 msgstr "члени та учасникі."
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Точка на карті"
+
+msgid "Vehicle Position"
+msgstr "Положення транспорту"
+
 msgid "Main menu"
 msgstr "Головне меню"
 
@@ -1562,12 +1688,20 @@ msgstr "Настройки"
 msgid "Tools"
 msgstr "Інструменти"
 
+msgid "Route"
+msgstr "Дорога"
+
 msgid "About"
 msgstr "Про програму..."
 
 msgid "Actions"
 msgstr "Дія"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Вийти"
 
@@ -1578,21 +1712,57 @@ msgstr ""
 "Зупинити\n"
 "Навігацію"
 
+msgid "Display"
+msgstr "Показати"
+
+msgid "Fullscreen"
+msgstr "На весь екран"
+
 msgid "Window Mode"
 msgstr "Режим вікна"
 
 msgid "Description"
 msgstr "Опис"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "кінь"
 
-msgid "Map Point"
-msgstr "Точка на карті"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Положення транспорту"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Через %s виїзд на дорогу з кільцевим рухом"
+
+#~ msgid "Cursor"
+#~ msgstr "Курсор"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d кілометрів"
diff --git a/po/ur.po.in b/po/ur.po.in
index 9895f52d6..8dac50a49 100644
--- a/po/ur.po.in
+++ b/po/ur.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-02 15:43+0100\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2010-11-14 14:11+0000\n"
 "Last-Translator: asghar <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,6 +24,14 @@ msgstr ""
 msgid "Running from source directory\n"
 msgstr "سورس ڈایرکٹری سے چلا ر ہے ہیں\n"
 
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr "ترتیب '%s' سے '%s'\n"
+
+#. TRANSLATORS: the following counts refer to streets
+msgid "zeroth"
+msgstr "صفر سے"
+
 msgid "first"
 msgstr "پہلا"
 
@@ -41,6 +50,7 @@ msgstr "پانچواں"
 msgid "sixth"
 msgstr "چھٹا"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "صفر سے خارج"
 
@@ -67,6 +77,18 @@ msgid "%d m"
 msgstr "%d میٹر"
 
 #, c-format
+msgid "in %d m"
+msgstr "%d میٹر میں"
+
+#, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d میٹر"
 
@@ -75,6 +97,14 @@ msgid "in %d meters"
 msgstr "%d میٹر میں"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d کلومیٹر"
 
@@ -82,6 +112,30 @@ msgstr "%d.%d کلومیٹر"
 msgid "in %d.%d kilometers"
 msgstr "%d.%d کلومیٹر میں"
 
+#, 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] "ایک کلومیٹر"
+msgstr[1] "%d کلومیٹر"
+
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "ایک کلومیٹر میں"
+msgstr[1] "%d کلومیٹر میں"
+
 msgid "exit"
 msgstr "اخراج"
 
@@ -140,61 +194,13 @@ msgstr "نا معلوم "
 msgid "When possible, please turn around"
 msgstr "جب ممکن ہو گھومیں"
 
-#, c-format
-msgid "Enter the roundabout soon and leave it at the %s"
-msgstr "گول چوراہے میں  داخل ہوں اور %s سے باہر نکل جایئں"
+msgid "Enter the roundabout soon"
+msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "%s کے بعد گول چوراہے میں داخل ہو جایئں"
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "%1$s%2$s %3$s%4$s پھر گومیں"
-
-msgid "Set as destination"
-msgstr "بطور منزل انتخاب"
-
-msgid "Enter Destination"
-msgstr "منزل داخل کریں"
-
-msgid "Enable/disable automatic zoom level changing"
-msgstr "فعال/غیر فعال کریں زوم کی خود کار تبدیلی"
-
-msgid "Add Bookmark"
-msgstr "بک مارک میں شامل"
-
-msgid " Elevation "
-msgstr " ارتفاع "
-
-#, c-format
-msgid "Current profile: %s"
-msgstr "موجودہ پروفائل: %s"
-
-#, c-format
-msgid "setting '%s' to '%s'\n"
-msgstr "ترتیب '%s' سے '%s'\n"
-
-msgid "zeroth"
-msgstr "صفر سے"
-
-#, c-format
-msgid "in %d m"
-msgstr "%d میٹر میں"
-
-#, c-format
-msgid "one kilometer"
-msgid_plural "%d kilometers"
-msgstr[0] "ایک کلومیٹر"
-msgstr[1] "%d کلومیٹر"
-
-#, c-format
-msgid "in one kilometer"
-msgid_plural "in %d kilometers"
-msgstr[0] "ایک کلومیٹر میں"
-msgstr[1] "%d کلومیٹر میں"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
@@ -235,6 +241,11 @@ msgstr "غلطی"
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "%1$s%2$s %3$s%4$s گومیں"
 
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr "%1$s%2$s %3$s%4$s پھر گومیں"
+
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "آپ اپنی منزل %s پے پہنچ کئے ہیں"
@@ -272,6 +283,9 @@ msgstr "روڈ بک"
 msgid "Set as position"
 msgstr "بطور موجودہ مقام انتخاب"
 
+msgid "Set as destination"
+msgstr "بطور منزل انتخاب"
+
 msgid "Add as bookmark"
 msgstr "بک مارک میں محفوظ کریں"
 
@@ -1297,6 +1311,9 @@ msgstr "سڑک"
 msgid "Number"
 msgstr "نمبر"
 
+msgid "Enter Destination"
+msgstr "منزل داخل کریں"
+
 msgid "Zip Code"
 msgstr "زپ کوڈ"
 
@@ -1315,55 +1332,59 @@ msgstr "بک مارک"
 msgid "Destination"
 msgstr "منزل"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "راستہ"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "سابقہ منازل"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "بک مارکس"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "نقشہ"
+
+msgid "_Layout"
 msgstr "بناوٹ"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "پروجیکشن"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "گاڑی"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "چھوٹا کریں"
 
 msgid "Decrease zoom level"
 msgstr "زوم لیول کم کریں"
 
-msgid "ZoomIn"
+msgid "Zoom_In"
 msgstr "بڑا کریں"
 
 msgid "Increase zoom level"
 msgstr "زوم لیول بڑہائیں"
 
-msgid "Recalculate"
+msgid "_Recalculate"
 msgstr "دوبارہ حساب"
 
 msgid "Redraw map"
 msgstr "نقشہ دوبارہ بنائیں"
 
-msgid "Info"
+msgid "_Info"
 msgstr "معلومات"
 
-msgid "Set destination"
+msgid "Set _destination"
 msgstr "منزل منتخب کریں"
 
 msgid "Opens address search dialog"
 msgstr "پتہ تلاش والا خانہ کھولیں"
 
-msgid "Stop Navigation"
+msgid "_Stop Navigation"
 msgstr "نیویگیشن بند کریں"
 
 msgid "Test"
@@ -1375,25 +1396,31 @@ msgstr "_بند"
 msgid "Quit the application"
 msgstr "پروگرام بند کریں"
 
-msgid "Show position cursor"
+msgid "Show position _cursor"
 msgstr "کرسر کا مقام دکھائیں"
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "سڑک پر گرفت"
 
-msgid "Keep orientation to the North"
+msgid "_Keep orientation to the North"
 msgstr "قطب نما کو شمال کی طرف رکھیں"
 
 msgid "Switches map orientation to the north or the vehicle"
 msgstr "قطب نما کو شمال یا گاڑی کی طرف کریں"
 
+msgid "_Roadbook"
+msgstr "روڈ بک"
+
 msgid "Show/hide route description"
 msgstr "دکھیں/نہ دیکھیں سفر کی تفصیل"
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "خودکار زوم"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr "فعال/غیر فعال کریں زوم کی خود کار تبدیلی"
+
+msgid "_Fullscreen"
 msgstr "پوری سکرین"
 
 msgid "Data"
@@ -1454,6 +1481,10 @@ msgstr "مدد"
 msgid "Back"
 msgstr "واپس"
 
+msgid "Add Bookmark"
+msgstr "بک مارک میں شامل"
+
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "بک مارک فولڈر میں شامل"
 
@@ -1493,6 +1524,10 @@ msgstr "بک مارک پیسٹ کریں"
 msgid "Delete Bookmark"
 msgstr "ڈیلیٹ بک مارک"
 
+msgid "Bookmarks"
+msgstr "بک مارکس"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "بک مارک پیسٹ کریں"
 
@@ -1500,15 +1535,43 @@ msgstr "بک مارک پیسٹ کریں"
 msgid "Bookmark %s"
 msgstr "بک مارک %s"
 
+msgid "Former Destinations"
+msgstr "سابقہ منازل"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "مکان نمبر"
 
+msgid "Layout"
+msgstr "بناوٹ"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "نقشے"
 
 msgid "Show Satellite Status"
 msgstr "سٹلائٹ کی حالت دیکھیں"
 
+msgid " Elevation "
+msgstr " ارتفاع "
+
 msgid " Azimuth "
 msgstr " سمت "
 
@@ -1525,6 +1588,10 @@ msgid "pedestrian"
 msgstr "پیدل"
 
 #, c-format
+msgid "Current profile: %s"
+msgstr "موجودہ پروفائل: %s"
+
+#, c-format
 msgid "Change profile to: %s"
 msgstr "پروفائل کو :%s میں بدلیں"
 
@@ -1537,6 +1604,9 @@ msgstr "سٹلائٹ کی حالت دیکھیں"
 msgid "Show NMEA data"
 msgstr "NMEA ڈیٹا دیکھیں"
 
+msgid "Vehicle"
+msgstr "گاڑی"
+
 msgid "Rules"
 msgstr "قوانین"
 
@@ -1552,6 +1622,12 @@ msgstr "نقشہ گاڑی کا تعاقب کرے"
 msgid "Message"
 msgstr "پیغام"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "سفر کی تفصیل"
 
@@ -1575,6 +1651,17 @@ msgstr "اور ناوٹ کی ساری ٹیم"
 msgid "members and contributors."
 msgstr "ممبر اور حصہ دار"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
 msgid "Map Point"
 msgstr "نقشہ کا نقطہ"
 
@@ -1597,12 +1684,20 @@ msgstr "تراتیب"
 msgid "Tools"
 msgstr "ہتھیار"
 
+msgid "Route"
+msgstr "راستہ"
+
 msgid "About"
 msgstr "مطعلق"
 
 msgid "Actions"
 msgstr "ایکشن"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "بند"
 
@@ -1613,11 +1708,54 @@ msgstr ""
 "روکیں\n"
 "نیویگیشن"
 
+msgid "Display"
+msgstr "ڈسپلئے"
+
+msgid "Fullscreen"
+msgstr "پوری سکرین"
+
 msgid "Window Mode"
 msgstr "ونڈو موڈ"
 
 msgid "Description"
 msgstr "تفصیل"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "گھوڑا"
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Enter the roundabout soon and leave it at the %s"
+#~ msgstr "گول چوراہے میں  داخل ہوں اور %s سے باہر نکل جایئں"
+
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "%s کے بعد گول چوراہے میں داخل ہو جایئں"
diff --git a/po/vi.po.in b/po/vi.po.in
index e1435b19a..e09aee9a8 100644
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 21:38+0000\n"
 "Last-Translator: Nguyễn Hào Khôi <nguyenhaokhoi@yahoo.com.vn>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "Đang chạy từ thư mục nguồn\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "thiết lập '%s' đến '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "Thứ 0"
 
@@ -47,6 +49,7 @@ msgstr "thứ năm"
 msgid "sixth"
 msgstr "thứ sáu"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "Thoát thứ 0"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "trong %d m"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d mét"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "trong %d mét"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,16 @@ msgid "in %d.%d kilometers"
 msgstr "trong %d.%d km"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d km"
@@ -165,18 +194,18 @@ msgstr "Sắp tới chỗ vòng"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Còn %s, đi vào đường vòng"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Ra khỏi đường vòng tại %s"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "sau đó ra khỏi đường vòng tại %s"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Ra khỏi đường vòng tại %s"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "Đường tiếp theo %s"
 
@@ -1298,40 +1327,59 @@ msgstr "Đánh dấu"
 msgid "Destination"
 msgstr "Điểm đến"
 
-msgid "Display"
+#. 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 "Hiển thị"
 
-msgid "Route"
+msgid "_Route"
 msgstr "Tuyến"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "Điểm đến trước"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "Đánh dấu"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "Bản đồ"
+
+msgid "_Layout"
 msgstr "Layout"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "Phép chiếu"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "Phương tiện"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "Thu nhỏ"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "Phóng to"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "Tính lại"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "Thông tin"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "Dừng dẫn đường"
 
 msgid "Test"
@@ -1340,19 +1388,34 @@ msgstr "Kiểm tra"
 msgid "_Quit"
 msgstr "_Thoát"
 
-msgid "Cursor"
-msgstr "Con trỏ"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "Bám vào đường"
 
-msgid "Northing"
-msgstr "Hướng Bắc"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "Roadbook"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "Tự động thu phóng"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "Toàn màn hình"
 
 msgid "Data"
@@ -1416,6 +1479,7 @@ msgstr "Quay lại"
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1455,6 +1519,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr "Đánh dấu"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1462,9 +1530,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr "Đánh dấu %s"
 
+msgid "Former Destinations"
+msgstr "Điểm đến trước"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "Số nhà"
 
+msgid "Layout"
+msgstr "Layout"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "Bản đồ"
 
@@ -1506,18 +1599,30 @@ msgstr "Xem thông tin vệ tinh"
 msgid "Show NMEA data"
 msgstr "Xem dữ liệu dạng NMEA"
 
+msgid "Vehicle"
+msgstr "Phương tiện"
+
 msgid "Rules"
 msgstr "Quy tắc"
 
 msgid "Lock on road"
 msgstr "Bám vào đường"
 
+msgid "Northing"
+msgstr "Hướng Bắc"
+
 msgid "Map follows Vehicle"
 msgstr "Dịch bản đồ theo phương tiện khi di chuyển"
 
 msgid "Message"
 msgstr "Thông điệp"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1541,6 +1646,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "Map Point"
+
+msgid "Vehicle Position"
+msgstr "Vị trí phương tiện"
+
 msgid "Main menu"
 msgstr "Trình đơn chính"
 
@@ -1555,12 +1677,20 @@ msgstr "Thiết lập"
 msgid "Tools"
 msgstr "Công cụ"
 
+msgid "Route"
+msgstr "Tuyến"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr "Thao tác"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "Thoát"
 
@@ -1569,21 +1699,57 @@ msgid ""
 "Navigation"
 msgstr "Dừng dẫn đường"
 
+msgid "Display"
+msgstr "Hiển thị"
+
+msgid "Fullscreen"
+msgstr "Toàn màn hình"
+
 msgid "Window Mode"
 msgstr "Chế độ cửa sổ"
 
 msgid "Description"
 msgstr "Mô tả"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr ""
 
-msgid "Map Point"
-msgstr "Map Point"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Vị trí phương tiện"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "Còn %s, đi vào đường vòng"
+
+#~ msgid "Cursor"
+#~ msgstr "Con trỏ"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d km"
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index 359a9a1fb..cc0c595af 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-12-20 20:38+0000\n"
 "Last-Translator: Kyle WANG <waxaca@163.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr "从根目录执行\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' 设置为 '%s'\n"
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr "第零个"
 
@@ -47,6 +49,7 @@ msgstr "第五个"
 msgid "sixth"
 msgstr "第六个"
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr "第零个退出"
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr "距离%d米"
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr "%d米"
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr "距离%d米"
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr "%d.%d千米"
 
@@ -93,6 +112,16 @@ msgid "in %d.%d kilometers"
 msgstr "距离%d.%d千米"
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d千米"
@@ -165,18 +194,18 @@ msgstr "不久将进入环形交叉路口"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
-msgstr "还有%s进入环形环形交叉路口"
-
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "还有%s就将驶离环形区"
+msgid "Enter the roundabout %s"
+msgstr ""
 
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "然后在%s处驶出环形区"
 
 #, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "还有%s就将驶离环形区"
+
+#, c-format
 msgid "Follow the road for the next %s"
 msgstr "沿路继续行驶%s"
 
@@ -1298,40 +1327,59 @@ msgstr "书签"
 msgid "Destination"
 msgstr "目的地"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "路线"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "前一目的地"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr "书签"
 
-msgid "Layout"
+msgid "_Map"
+msgstr "地图"
+
+msgid "_Layout"
 msgstr "布局"
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "规划"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "车辆"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "缩小"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "放大"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
 msgstr "重新计算"
 
-msgid "Info"
+msgid "Redraw map"
+msgstr ""
+
+msgid "_Info"
 msgstr "信息"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "停止导航"
 
 msgid "Test"
@@ -1340,19 +1388,34 @@ msgstr "测试"
 msgid "_Quit"
 msgstr "退出（_Q）"
 
-msgid "Cursor"
-msgstr "光标"
+msgid "Quit the application"
+msgstr ""
+
+msgid "Show position _cursor"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "_Lock on Road"
 msgstr "锁定路线"
 
-msgid "Northing"
-msgstr "总指向北"
+msgid "_Keep orientation to the North"
+msgstr ""
+
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr "路线指南"
+
+msgid "Show/hide route description"
+msgstr ""
 
-msgid "Autozoom"
+msgid "_Autozoom"
 msgstr "自动缩放"
 
-msgid "Fullscreen"
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "全屏"
 
 msgid "Data"
@@ -1416,6 +1479,7 @@ msgstr "返回"
 msgid "Add Bookmark"
 msgstr "增加书签"
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr "添加书签文件夹"
 
@@ -1455,6 +1519,10 @@ msgstr "粘帖标签"
 msgid "Delete Bookmark"
 msgstr "删除标签"
 
+msgid "Bookmarks"
+msgstr "书签"
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr "粘帖标签"
 
@@ -1462,9 +1530,34 @@ msgstr "粘帖标签"
 msgid "Bookmark %s"
 msgstr "书签 %s"
 
+msgid "Former Destinations"
+msgstr "前一目的地"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr "房屋编号（门牌号）"
 
+msgid "Layout"
+msgstr "布局"
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr "地图"
 
@@ -1506,18 +1599,30 @@ msgstr "显示卫星状态"
 msgid "Show NMEA data"
 msgstr "显示NMEA数据"
 
+msgid "Vehicle"
+msgstr "车辆"
+
 msgid "Rules"
 msgstr "规则"
 
 msgid "Lock on road"
 msgstr "锁定路线"
 
+msgid "Northing"
+msgstr "总指向北"
+
 msgid "Map follows Vehicle"
 msgstr "随车显示地图"
 
 msgid "Message"
 msgstr "信息"
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr "到目的地的路线"
 
@@ -1541,14 +1646,30 @@ msgstr "和整个的Navit组"
 msgid "members and contributors."
 msgstr "成员和贡献者"
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr "地图位置点"
+
+msgid "Vehicle Position"
+msgstr "车辆位置"
+
 msgid "Main menu"
 msgstr "主菜单"
 
 msgid ""
 "Show\n"
 "Map"
-msgstr ""
-"显示地图"
+msgstr "显示地图"
 
 msgid "Settings"
 msgstr "设置"
@@ -1556,20 +1677,33 @@ msgstr "设置"
 msgid "Tools"
 msgstr "工具"
 
+msgid "Route"
+msgstr "路线"
+
 msgid "About"
 msgstr "关于"
 
 msgid "Actions"
 msgstr "动作"
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr "退出"
 
 msgid ""
 "Stop\n"
 "Navigation"
-msgstr ""
-"停止导航"
+msgstr "停止导航"
+
+msgid "Display"
+msgstr "显示"
+
+msgid "Fullscreen"
+msgstr "全屏"
 
 msgid "Window Mode"
 msgstr "窗口模式"
@@ -1577,15 +1711,45 @@ msgstr "窗口模式"
 msgid "Description"
 msgstr "描述"
 
+msgid "car_shortest"
+msgstr ""
+
+msgid "car_avoid_tolls"
+msgstr ""
+
 msgid "horse"
 msgstr "骑马"
 
-msgid "Map Point"
-msgstr "地图位置点"
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
 
-msgid "Vehicle Position"
-msgstr "车辆位置"
+#~ msgid "In %s, enter the roundabout"
+#~ msgstr "还有%s进入环形环形交叉路口"
+
+#~ msgid "Cursor"
+#~ msgstr "光标"
 
-#, c-format
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d千米"
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index 780b69327..b5e4dc3a7 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -5,12 +5,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:40+0200\n"
+"POT-Creation-Date: 2011-12-05 18:13+0100\n"
 "PO-Revision-Date: 2009-07-02 19:47+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,7 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
@@ -47,6 +49,7 @@ msgstr ""
 msgid "sixth"
 msgstr ""
 
+#. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
 msgstr ""
 
@@ -77,6 +80,14 @@ msgid "in %d m"
 msgstr ""
 
 #, c-format
+msgid "%d feet"
+msgstr ""
+
+#, c-format
+msgid "in %d feet"
+msgstr ""
+
+#, c-format
 msgid "%d meters"
 msgstr ""
 
@@ -85,6 +96,14 @@ msgid "in %d meters"
 msgstr ""
 
 #, c-format
+msgid "%d.%d miles"
+msgstr ""
+
+#, c-format
+msgid "in %d.%d miles"
+msgstr ""
+
+#, c-format
 msgid "%d.%d kilometers"
 msgstr ""
 
@@ -93,6 +112,16 @@ msgid "in %d.%d kilometers"
 msgstr ""
 
 #, c-format
+msgid "one mile"
+msgid_plural "%d miles"
+msgstr[0] ""
+
+#, c-format
+msgid "in one mile"
+msgid_plural "in %d miles"
+msgstr[0] ""
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
@@ -167,15 +196,15 @@ msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "In %s, enter the roundabout"
+msgid "Enter the roundabout %s"
 msgstr ""
 
 #, c-format
-msgid "Leave the roundabout at the %s"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
-msgid "then leave the roundabout at the %s"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
 #, c-format
@@ -1300,40 +1329,59 @@ msgstr "书签"
 msgid "Destination"
 msgstr "目的地"
 
-msgid "Display"
+#. 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"
+msgid "_Route"
 msgstr "路"
 
-msgid "Former Destinations"
+msgid "_Former Destinations"
 msgstr "前一个目的地"
 
-msgid "Bookmarks"
+msgid "_Bookmarks"
 msgstr ""
 
-msgid "Layout"
+msgid "_Map"
+msgstr ""
+
+msgid "_Layout"
 msgstr ""
 
-msgid "Projection"
+msgid "_Projection"
 msgstr "投影"
 
-msgid "Vehicle"
+msgid "_Vehicle"
 msgstr "机动车"
 
-msgid "ZoomOut"
+msgid "Zoom_Out"
 msgstr "放大"
 
-msgid "ZoomIn"
+msgid "Decrease zoom level"
+msgstr ""
+
+msgid "Zoom_In"
 msgstr "缩小"
 
-msgid "Recalculate"
+msgid "Increase zoom level"
+msgstr ""
+
+msgid "_Recalculate"
+msgstr ""
+
+msgid "Redraw map"
 msgstr ""
 
-msgid "Info"
+msgid "_Info"
 msgstr "信息"
 
-msgid "Stop Navigation"
+msgid "Set _destination"
+msgstr ""
+
+msgid "Opens address search dialog"
+msgstr ""
+
+msgid "_Stop Navigation"
 msgstr "停止浏览"
 
 msgid "Test"
@@ -1342,19 +1390,34 @@ msgstr "测试"
 msgid "_Quit"
 msgstr "退出"
 
-msgid "Cursor"
-msgstr "游标"
+msgid "Quit the application"
+msgstr ""
 
-msgid "Lock on Road"
+msgid "Show position _cursor"
 msgstr ""
 
-msgid "Northing"
+msgid "_Lock on Road"
 msgstr ""
 
-msgid "Autozoom"
+msgid "_Keep orientation to the North"
 msgstr ""
 
-msgid "Fullscreen"
+msgid "Switches map orientation to the north or the vehicle"
+msgstr ""
+
+msgid "_Roadbook"
+msgstr ""
+
+msgid "Show/hide route description"
+msgstr ""
+
+msgid "_Autozoom"
+msgstr ""
+
+msgid "Enable/disable automatic zoom level changing"
+msgstr ""
+
+msgid "_Fullscreen"
 msgstr "全屏"
 
 msgid "Data"
@@ -1418,6 +1481,7 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr ""
 
+#. Adds the Bookmark folders
 msgid "Add Bookmark folder"
 msgstr ""
 
@@ -1457,6 +1521,10 @@ msgstr ""
 msgid "Delete Bookmark"
 msgstr ""
 
+msgid "Bookmarks"
+msgstr ""
+
+#. Pastes the Bookmark
 msgid "Paste bookmark"
 msgstr ""
 
@@ -1464,9 +1532,34 @@ msgstr ""
 msgid "Bookmark %s"
 msgstr ""
 
+msgid "Former Destinations"
+msgstr "前一个目的地"
+
+msgid "- No former destinations available -"
+msgstr ""
+
 msgid "House number"
 msgstr ""
 
+msgid "Layout"
+msgstr ""
+
+#, c-format
+msgid "Download %s"
+msgstr ""
+
+msgid "Map Download"
+msgstr ""
+
+msgid "Active"
+msgstr ""
+
+msgid "Download Enabled"
+msgstr ""
+
+msgid "Download completely"
+msgstr ""
+
 msgid "Maps"
 msgstr ""
 
@@ -1508,18 +1601,30 @@ msgstr ""
 msgid "Show NMEA data"
 msgstr ""
 
+msgid "Vehicle"
+msgstr "机动车"
+
 msgid "Rules"
 msgstr ""
 
 msgid "Lock on road"
 msgstr ""
 
+msgid "Northing"
+msgstr ""
+
 msgid "Map follows Vehicle"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
+msgid "Next"
+msgstr ""
+
+msgid "Prev"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -1543,6 +1648,23 @@ msgstr ""
 msgid "members and contributors."
 msgstr ""
 
+msgid "Return to route!"
+msgstr ""
+
+#. warning told
+msgid "Look out! Camera!"
+msgstr ""
+
+#. warning told
+msgid "Please decrease your speed"
+msgstr ""
+
+msgid "Map Point"
+msgstr ""
+
+msgid "Vehicle Position"
+msgstr ""
+
 msgid "Main menu"
 msgstr ""
 
@@ -1557,12 +1679,20 @@ msgstr ""
 msgid "Tools"
 msgstr ""
 
+msgid "Route"
+msgstr "路"
+
 msgid "About"
 msgstr ""
 
 msgid "Actions"
 msgstr ""
 
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+
 msgid "Quit"
 msgstr ""
 
@@ -1571,17 +1701,51 @@ msgid ""
 "Navigation"
 msgstr ""
 
+msgid "Display"
+msgstr "显示"
+
+msgid "Fullscreen"
+msgstr "全屏"
+
 msgid "Window Mode"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
-msgid "horse"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Map Point"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Vehicle Position"
+msgid "horse"
 msgstr ""
+
+#. chr:
+#. flags used for a truck: (first flag number is 0)
+#. 8: SIZE_OR_WEIGHT_LIMIT
+#. 21: TRANSPORT_TRUCK
+#. speed setup:
+#. 'speed' data of the atkaction for a car is
+#. reduced about 10 km/h. When the speed was at
+#. 10 km/h, I reduced it to 5 km/h.
+#. 'route_weight' data has been treated in the same way.
+#. If you want to discourage the use of small roads,
+#. just reduce this value.
+#. size and weight setup:
+#. This is an example, you have to use the data of your truck.
+#. bobshaffer's standard truck:
+#. (1 lb = 453.59237 g, 1 foot = .3048 m)
+#. (data has to be in [cm] and [kg] according to 'atkaction.h')
+#. vehicle_width=  9    feet,   274 cm
+#. vehicle_height= 13.5  feet,   411 cm
+#. vehicle_length= 70    feet,  2134 cm
+#. vehicle_weight= 80000 lbs,  36287 kg
+#. vehicle_axle_weight= 34000 lbs,  15422 kg
+#.
+msgid "Truck"
+msgstr ""
+
+#~ msgid "Cursor"
+#~ msgstr "游标"