Update:Translations:Various translations updates

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2199 ffa7fe5e-494d-0410-b361-a75ebd5db220
author: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> 2009-04-11 06:39:10 +0000
committer: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> 2009-04-11 06:39:10 +0000
commit: da33c3547b42677b393230df3082379b4448950d (patch)
tree: fc0939692767319723b31caf69779963828e5664 /po
parent: 50785b0ebb1782965921904646b4967f3deade19 (diff)
download: navit-da33c3547b42677b393230df3082379b4448950d.tar.gz
36 files changed, 8857 insertions, 4806 deletions
diff --git a/po/af.po.in b/po/af.po.in
index 3d9c4df76..92d7ccc32 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 11:04+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2009-01-12 23:22+0000\n"
 "Last-Translator: Kobus <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-15 08:20+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,275 +29,304 @@ msgstr "Loop vanaf bron gids\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "verander '%s' na '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "nulste"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "eerste"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "tweede"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "derde"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "vierde"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "vyfde"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "sesde"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometer"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "na %d.%d kilometer"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "een kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "na een kilometer"
 msgstr[1] "na %d kilometer"
 
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "afrit"
 
-#: ../navit/navigation.c:1204
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "na die afrit"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1234
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sin die straat %s%s%s in"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1238
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sin die %s%s%s|"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1242
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sin die %s%s%s|"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1246
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sin die %s%s%s|"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1253
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sin die %s in"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1274
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "regs"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1313
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1320
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "maklik "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1325
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "skerp "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1329
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "onbekend "
 
-#: ../navit/navigation.c:1336
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Draai asseblief om wanneer moontlik"
 
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Gaan kortliks in die sirkel in"
 
-#: ../navit/navigation.c:1349
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "In %s, gaan in die sirkel in"
 
-#: ../navit/navigation.c:1364
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Verlaat die sirkel by die %s uitgang"
+msgid "Leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1367
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "verlaat dan die sirkel by die %s uitgang"
+msgid "then leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1377
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Volg die pad vir die volgende %s"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "kortliks"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem die %1$s pad na %2$s"
 
-#: ../navit/navigation.c:1394 ../navit/navigation.c:1408
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "na %i paaie"
 
-#: ../navit/navigation.c:1397
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nou"
 
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "neem dan die %1$s pad na %2$s"
 
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "fout"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1446
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Draai %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1449
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "draai dan %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1454
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Jy het jou bestemming bereik %s"
 
-#: ../navit/navigation.c:1456
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "dan het jy jou bestemming bereik."
 
-#: ../navit/navit.c:1049
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Posisie"
 
-#: ../navit/navit.c:1050
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Bevel"
 
-#: ../navit/navit.c:1054
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Lengte"
 
-#: ../navit/navit.c:1058 ../navit/navit.c:1083
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "kilometer"
 
-#: ../navit/navit.c:1062 ../navit/navit.c:1087
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "meter"
 
-#: ../navit/navit.c:1068
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tyd"
 
-#: ../navit/navit.c:1080
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Bestemming lengte"
 
-#: ../navit/navit.c:1093
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Bestemming tyd"
 
-#: ../navit/navit.c:1126 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Padkaart"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Stel as posisie"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Stel as bestemming"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Voeg as boekmerk by"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skerm koordinaat : %d %d"
@@ -1545,8 +1574,8 @@ msgstr "Iso2"
 msgid "Iso3"
 msgstr "Iso3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Land"
 
@@ -1557,9 +1586,9 @@ msgstr "Pos"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Dorp"
 
@@ -1569,127 +1598,131 @@ msgid "District"
 msgstr "Distrik"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Straat"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Nommer"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Kies Bestemming"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Poskode"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Stad"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Distrik/Kontrei"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Kaart"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Boekmerk"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Bestemming"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Skerm"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Roete"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Voorige bestemmings"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Boekmerke"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Uitleg"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Skatting"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Voertuig"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "ZoomUit"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "ZoomIn"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Herbereken"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Inligting"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Stop Navigasie"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Toets"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Sluit af"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Plekaanduier"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Koppel aan Pad"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Draai kaart noord"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Volskerm"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Data"
 
@@ -1738,12 +1771,12 @@ msgid "No"
 msgstr "Nee"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1760,62 +1793,70 @@ msgstr "Roete %4.0fkm %02d:%02d aankomstyd"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Roete 0000km  0+00:00 aankomstyd"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Terug kaart toe"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Hoofkieslys"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "Belangpunte"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Strate"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Besigtig in blaaier"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Besigtig eienskappe"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Beloer op kaart"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Boekmerk %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Venster Modus"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Aksies"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Kaart punt"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Voertuig posisie"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Verlaat"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1823,33 +1864,67 @@ msgstr ""
 "Stop\n"
 "Navigasie"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Kaarte"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Reëls"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Koppel aan pad"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Kaart volg voertuig"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Instellings"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Hoofkieslys"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Gereedskap"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Verlaat die sirkel by die %s uitgang"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "verlaat dan die sirkel by die %s uitgang"
diff --git a/po/ar.po.in b/po/ar.po.in
index e22d2438c..56b758a2a 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-02-28 22:09+0000\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-13 15:35+0000\n"
 "Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,65 +30,93 @@ msgstr "جاري التنفيذ من المجلد المصدر\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "وضع حالة  '%s' إلى '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "(الرقم) صفر"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "الأوّل"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "الثّاني"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "الثّالث"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "الرّابع"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "الخامس"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "السادس"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "المخرج ذو الرقم صفر"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "المخرج الأول"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "المخرج الثاني"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "المخرج الثالث"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "المخرج الرابع"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "المخرج الخامس"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "المخرج السادس"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d م"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "بعد %d متر"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d متر"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "بعد %d متر"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d كلم"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "بعد %d%d كلم"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -99,7 +127,7 @@ msgstr[3] "%d كلم"
 msgstr[4] "%d كلم"
 msgstr[5] "%d كلم"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -110,204 +138,204 @@ msgstr[3] "بعد %d كلم"
 msgstr[4] "بعد %d كلم"
 msgstr[5] "بعد %d كلم"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "خروج"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "إلى داخل الطريق المنحدر"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s إلى داخل الشارع %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sإلى داخل %s%s%s|صفة الذكر"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sإلى داخل %s%s%s|صفة الأنثى"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sإلى داخل %s%s%s|غير محدد الجنس"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s إلى داخل %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "إلى اليمين"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "إلى اليسار"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "بسهولة "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "بكل شدة "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "غير معروف "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "حيث ممكن الرجاء اللف"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "قريباً الدخول إلى المستديرة"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "بعد %s ، أدخل المسستديرة"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "أخرج من المستديرة عند المخرج %s"
+msgid "Leave the roundabout at the %s"
+msgstr "أخرج من المستديرة عند الــ  %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "ثم أخرد من المستديرة عند المخرج %s"
+msgid "then leave the roundabout at the %s"
+msgstr "ثم أخرج من المستديرة عند الــ%s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "تابع الطريق لل- %s التالية"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "قريبا"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "خذ الطريق %1$s إلى ال%2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "بعد %i طرقات"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "الآن"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "ثم خذ الطريق %1$s إلى ال- %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "خطء"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 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
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "ثم حوّل %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "لقد وصلت إلى هدفك %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "و بعدها تكون قد وصلت إلى هدفك"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "الموقع"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "الأمر"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "الطول"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "كلم"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "م."
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "الوقت"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "بُعد الهدف"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "الوقت في مكان الوصول"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "سجل خريطة الطريق"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "عين كموقع حالي"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "عيّن كهدف"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "أضف كعلامة مراجعة"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "الموقع 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "إحداثيات الشاشة :%d %d"
@@ -1556,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "الدولة"
 
@@ -1567,9 +1595,9 @@ msgstr "بريدي"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "البلدة"
 
@@ -1580,8 +1608,8 @@ msgstr "حي"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "الشارع"
 
@@ -1618,8 +1646,8 @@ msgid "Destination"
 msgstr "الهدف"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "المظهار"
 
@@ -1632,14 +1660,14 @@ msgid "Former Destinations"
 msgstr "الأهداف السابقة"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "إشارات مرجعية"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "التصميم"
 
@@ -1648,8 +1676,8 @@ msgid "Projection"
 msgstr "الإسقاط"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "وسيلة التنقل"
 
@@ -1690,7 +1718,7 @@ msgid "Lock on Road"
 msgstr "إقفال على الطريق"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "شمالي دائم"
 
@@ -1699,7 +1727,7 @@ msgid "Autozoom"
 msgstr "تكبير/تصغير تلقائي"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "ملء الشاشة"
 
@@ -1752,12 +1780,12 @@ msgid "No"
 msgstr "لا"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "ثنائي الأبعاد"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "ثلاثي الأبعاد"
 
@@ -1774,123 +1802,123 @@ msgstr "Route %4.0fكلم    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "الطريك 0000كلم  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "إرجع إلى الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "اللائحة الرئيسية"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "المساعدة"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "السابق"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "مواقع ذات أهمية"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "الشوارع"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "أعرض في المتصفح"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "أعرض الصفات"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "أعرض على الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "علّم %s كإشارة مرجعية"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "نمط النافذة"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "أفعال"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "النقطة على الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "موقع وسيلة التنقل"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "أخرج"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr "قفّ"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "الخرائط"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "أعرض حالة القمر الإسطناعي"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "أعرض المعطيات NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "عيّن كــفعلي"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "أعرض حالة القمر الإسطناعي"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "أعرض المعطيات NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "القواعد"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "إقفال على الطريق"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "الخريطة تتبع وسيلة التنقل"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "الإعدادات"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "اللائحة الرئيسية"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1898,6 +1926,14 @@ msgstr ""
 "أعرض\n"
 "الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "العدة"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "أخرج من المستديرة عند المخرج %s"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "ثم أخرد من المستديرة عند المخرج %s"
diff --git a/po/bg.po.in b/po/bg.po.in
index 101da6e0e..b6d67d38a 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -7,280 +7,329 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
-"PO-Revision-Date: 2008-10-15 08:59+0000\n"
-"Last-Translator: MalamiR <mamut_killer@yahoo.com>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-04-03 17:37+0000\n"
+"Last-Translator: Anton Todorov <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
-msgstr ""
+msgstr "нулев"
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
-msgstr ""
+msgstr "първи"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
-msgstr ""
+msgstr "втори"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
-msgstr ""
+msgstr "трети"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
-msgstr ""
+msgstr "четвърти"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
-msgstr ""
+msgstr "пети"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
-msgstr ""
+msgstr "шести"
+
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "няма изход"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "първия изход"
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "втория изход"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "третия изход"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "четвъртия изход"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "петия изход"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "шестия изход"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
-msgstr ""
+msgstr "%d м"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
-msgstr ""
+msgstr "след %d м"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
-msgstr ""
+msgstr "%d метра"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
-msgstr ""
+msgstr "след %d метра"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
-msgstr ""
+msgstr "%d.%d километра"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
-msgstr ""
+msgstr "след %d.%d километра"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "един километър"
 msgstr[1] "%d километра"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "след един километър"
+msgstr[1] "след %d километра"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
-msgstr ""
+msgstr "изход"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
-msgstr ""
+msgstr "на рампата"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "надясно"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "наляво"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
-msgstr ""
+msgstr "леко "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
-msgstr ""
+msgstr "силно "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr ""
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Когато е възможно обърнете"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
-msgstr ""
+msgstr "Скоро навлизате в кръгово"
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
-msgstr ""
+msgstr "След %s влезте в кръговото"
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr ""
+msgid "Leave the roundabout at the %s"
+msgstr "Излезте от кръговото на %s"
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1434
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "след това излезте от кръговото на %s"
+
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Следвайте пътя през следващите %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "скоро"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
-msgstr ""
+msgstr "след %i пресечки"
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
-msgstr ""
+msgstr "сега"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "тогава хванете пътя %1$s към %2$s"
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "грешка"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Завийте %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr "тогава завийте %1$s%2$s %3$s%4$s"
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Достигнахте до целта %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr "след това пристигате на местоназначението"
+
+#: ../navit/navit.c:1142
 msgid "Position"
-msgstr ""
+msgstr "Позиция"
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Команда"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Дължина"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "км"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "м"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
-msgstr ""
+msgstr "Време"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Разстояние до целта"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Време до целта"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
-msgstr ""
+msgstr "Пътна книга"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
-msgstr ""
+msgstr "Установете като позиция"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Задай като цел"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Добави като Отметка"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Точка 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
-msgstr ""
+msgstr "Координати на екрана: %d %d"
 
 #. 020
 #: ../navit/country.c:39
@@ -415,7 +464,7 @@ msgstr "Бенин"
 #. 652
 #: ../navit/country.c:65
 msgid "Saint Barthelemy"
-msgstr ""
+msgstr "Свети Бартелеми"
 
 #. 060
 #: ../navit/country.c:66
@@ -615,907 +664,907 @@ msgstr "Еритрея"
 #. 724
 #: ../navit/country.c:105
 msgid "Spain"
-msgstr ""
+msgstr "Испания"
 
 #. 231
 #: ../navit/country.c:106
 msgid "Ethiopia"
-msgstr ""
+msgstr "Етиопия"
 
 #. 246
 #: ../navit/country.c:107
 msgid "Finland"
-msgstr ""
+msgstr "Финландия"
 
 #. 242
 #: ../navit/country.c:108
 msgid "Fiji"
-msgstr ""
+msgstr "Фиджи"
 
 #. 238
 #: ../navit/country.c:109
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Фолклендски Острови (Малвини)"
 
 #. 583
 #: ../navit/country.c:110
 msgid "Micronesia, Federated States of"
-msgstr ""
+msgstr "Микронезия, Обединени щати"
 
 #. 234
 #: ../navit/country.c:111
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Острови Фаро"
 
 #. 250
 #: ../navit/country.c:112
 msgid "France"
-msgstr ""
+msgstr "Франция"
 
 #. 266
 #: ../navit/country.c:113
 msgid "Gabon"
-msgstr ""
+msgstr "Габон"
 
 #. 826
 #: ../navit/country.c:114
 msgid "United Kingdom"
-msgstr ""
+msgstr "Обединеното Кралство"
 
 #. 308
 #: ../navit/country.c:115
 msgid "Grenada"
-msgstr ""
+msgstr "Гренада"
 
 #. 268
 #: ../navit/country.c:116
 msgid "Georgia"
-msgstr ""
+msgstr "Грузия"
 
 #. 254
 #: ../navit/country.c:117
 msgid "French Guiana"
-msgstr ""
+msgstr "Френска Гвиана"
 
 #. 831
 #: ../navit/country.c:118
 msgid "Guernsey"
-msgstr ""
+msgstr "Джърнси"
 
 #. 288
 #: ../navit/country.c:119
 msgid "Ghana"
-msgstr ""
+msgstr "Гана"
 
 #. 292
 #: ../navit/country.c:120
 msgid "Gibraltar"
-msgstr ""
+msgstr "Гибралтар"
 
 #. 304
 #: ../navit/country.c:121
 msgid "Greenland"
-msgstr ""
+msgstr "Гренландия"
 
 #. 270
 #: ../navit/country.c:122
 msgid "Gambia"
-msgstr ""
+msgstr "Гамбия"
 
 #. 324
 #: ../navit/country.c:123
 msgid "Guinea"
-msgstr ""
+msgstr "Гвинея"
 
 #. 312
 #: ../navit/country.c:124
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Гваделупа"
 
 #. 226
 #: ../navit/country.c:125
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Екваториална Гвинея"
 
 #. 300
 #: ../navit/country.c:126
 msgid "Greece"
-msgstr ""
+msgstr "Гърция"
 
 #. 239
 #: ../navit/country.c:127
 msgid "South Georgia and the South Sandwich Islands"
-msgstr ""
+msgstr "Южна Джорджия и Южни Сандвичеви о-ви"
 
 #. 320
 #: ../navit/country.c:128
 msgid "Guatemala"
-msgstr ""
+msgstr "Гватемала"
 
 #. 316
 #: ../navit/country.c:129
 msgid "Guam"
-msgstr ""
+msgstr "Гуам"
 
 #. 624
 #: ../navit/country.c:130
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Гвинея-Бисау"
 
 #. 328
 #: ../navit/country.c:131
 msgid "Guyana"
-msgstr ""
+msgstr "Гайана"
 
 #. 344
 #: ../navit/country.c:132
 msgid "Hong Kong"
-msgstr ""
+msgstr "Хонг Конг"
 
 #. 334
 #: ../navit/country.c:133
 msgid "Heard Island and McDonald Islands"
-msgstr ""
+msgstr "О-в Хърд и о-ви Макдоналд"
 
 #. 340
 #: ../navit/country.c:134
 msgid "Honduras"
-msgstr ""
+msgstr "Хондурас"
 
 #. 191
 #: ../navit/country.c:135
 msgid "Croatia"
-msgstr ""
+msgstr "Хърватска"
 
 #. 332
 #: ../navit/country.c:136
 msgid "Haiti"
-msgstr ""
+msgstr "Хаити"
 
 #. 348
 #: ../navit/country.c:137
 msgid "Hungary"
-msgstr ""
+msgstr "Унгария"
 
 #. 360
 #: ../navit/country.c:138
 msgid "Indonesia"
-msgstr ""
+msgstr "Индонезия"
 
 #. 372
 #: ../navit/country.c:139
 msgid "Ireland"
-msgstr ""
+msgstr "Ирландия"
 
 #. 376
 #: ../navit/country.c:140
 msgid "Israel"
-msgstr ""
+msgstr "Израел"
 
 #. 833
 #: ../navit/country.c:141
 msgid "Isle of Man"
-msgstr ""
+msgstr "Остров Ман"
 
 #. 356
 #: ../navit/country.c:142
 msgid "India"
-msgstr ""
+msgstr "Индия"
 
 #. 086
 #: ../navit/country.c:143
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Британска територия в Индийския океан"
 
 #. 368
 #: ../navit/country.c:144
 msgid "Iraq"
-msgstr ""
+msgstr "Ирак"
 
 #. 364
 #: ../navit/country.c:145
 msgid "Iran, Islamic Republic of"
-msgstr ""
+msgstr "Иран, Ислямска република"
 
 #. 352
 #: ../navit/country.c:146
 msgid "Iceland"
-msgstr ""
+msgstr "Исландия"
 
 #. 380
 #: ../navit/country.c:147
 msgid "Italy"
-msgstr ""
+msgstr "Италия"
 
 #. 832
 #: ../navit/country.c:148
 msgid "Jersey"
-msgstr ""
+msgstr "Джърси"
 
 #. 388
 #: ../navit/country.c:149
 msgid "Jamaica"
-msgstr ""
+msgstr "Ямайка"
 
 #. 400
 #: ../navit/country.c:150
 msgid "Jordan"
-msgstr ""
+msgstr "Йордания"
 
 #. 392
 #: ../navit/country.c:151
 msgid "Japan"
-msgstr ""
+msgstr "Япония"
 
 #. 404
 #: ../navit/country.c:152
 msgid "Kenya"
-msgstr ""
+msgstr "Кения"
 
 #. 417
 #: ../navit/country.c:153
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Киргизстан"
 
 #. 116
 #: ../navit/country.c:154
 msgid "Cambodia"
-msgstr ""
+msgstr "Камбоджа"
 
 #. 296
 #: ../navit/country.c:155
 msgid "Kiribati"
-msgstr ""
+msgstr "Кирибати"
 
 #. 174
 #: ../navit/country.c:156
 msgid "Comoros"
-msgstr ""
+msgstr "Комори"
 
 #. 659
 #: ../navit/country.c:157
 msgid "Saint Kitts and Nevis"
-msgstr ""
+msgstr "Свети Китс и Невис"
 
 #. 408
 #: ../navit/country.c:158
 msgid "Korea, Democratic People's Republic of"
-msgstr ""
+msgstr "Корея, Демократична народна република"
 
 #. 410
 #: ../navit/country.c:159
 msgid "Korea, Republic of"
-msgstr ""
+msgstr "Корея, Република"
 
 #. 414
 #: ../navit/country.c:160
 msgid "Kuwait"
-msgstr ""
+msgstr "Кувейт"
 
 #. 136
 #: ../navit/country.c:161
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Кайманови острови"
 
 #. 398
 #: ../navit/country.c:162
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Казахстан"
 
 #. 418
 #: ../navit/country.c:163
 msgid "Lao People's Democratic Republic"
-msgstr ""
+msgstr "Народна Демократична Република Лао"
 
 #. 422
 #: ../navit/country.c:164
 msgid "Lebanon"
-msgstr ""
+msgstr "Ливан"
 
 #. 662
 #: ../navit/country.c:165
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Света Лусия"
 
 #. 438
 #: ../navit/country.c:166
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Лихтенщайн"
 
 #. 144
 #: ../navit/country.c:167
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Шри Ланка"
 
 #. 430
 #: ../navit/country.c:168
 msgid "Liberia"
-msgstr ""
+msgstr "Либерия"
 
 #. 426
 #: ../navit/country.c:169
 msgid "Lesotho"
-msgstr ""
+msgstr "Лесото"
 
 #. 440
 #: ../navit/country.c:170
 msgid "Lithuania"
-msgstr ""
+msgstr "Литва"
 
 #. 442
 #: ../navit/country.c:171
 msgid "Luxembourg"
-msgstr ""
+msgstr "Люксембург"
 
 #. 428
 #: ../navit/country.c:172
 msgid "Latvia"
-msgstr ""
+msgstr "Латвия"
 
 #. 434
 #: ../navit/country.c:173
 msgid "Libyan Arab Jamahiriya"
-msgstr ""
+msgstr "Либийска Арабска Джамахирия"
 
 #. 504
 #: ../navit/country.c:174
 msgid "Morocco"
-msgstr ""
+msgstr "Мароко"
 
 #. 492
 #: ../navit/country.c:175
 msgid "Monaco"
-msgstr ""
+msgstr "Монако"
 
 #. 498
 #: ../navit/country.c:176
 msgid "Moldova, Republic of"
-msgstr ""
+msgstr "Молдова, Република"
 
 #. 499
 #: ../navit/country.c:177
 msgid "Montenegro"
-msgstr ""
+msgstr "Черна гора"
 
 #. 663
 #: ../navit/country.c:178
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Свети Мартин (френска част)"
 
 #. 450
 #: ../navit/country.c:179
 msgid "Madagascar"
-msgstr ""
+msgstr "Мадагаскар"
 
 #. 584
 #: ../navit/country.c:180
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Маршалови острови"
 
 #. 807
 #: ../navit/country.c:181
 msgid "Macedonia, the former Yugoslav Republic of"
-msgstr ""
+msgstr "Македония, Бивша Югославска Република"
 
 #. 466
 #: ../navit/country.c:182
 msgid "Mali"
-msgstr ""
+msgstr "Мали"
 
 #. 104
 #: ../navit/country.c:183
 msgid "Myanmar"
-msgstr ""
+msgstr "Мианмарският съюз"
 
 #. 496
 #: ../navit/country.c:184
 msgid "Mongolia"
-msgstr ""
+msgstr "Монголия"
 
 #. 446
 #: ../navit/country.c:185
 msgid "Macao"
-msgstr ""
+msgstr "Макао"
 
 #. 580
 #: ../navit/country.c:186
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Северни Мариански острови"
 
 #. 474
 #: ../navit/country.c:187
 msgid "Martinique"
-msgstr ""
+msgstr "Мартиника"
 
 #. 478
 #: ../navit/country.c:188
 msgid "Mauritania"
-msgstr ""
+msgstr "Мавритания"
 
 #. 500
 #: ../navit/country.c:189
 msgid "Montserrat"
-msgstr ""
+msgstr "Монсерат"
 
 #. 470
 #: ../navit/country.c:190
 msgid "Malta"
-msgstr ""
+msgstr "Малта"
 
 #. 480
 #: ../navit/country.c:191
 msgid "Mauritius"
-msgstr ""
+msgstr "Мавриций"
 
 #. 462
 #: ../navit/country.c:192
 msgid "Maldives"
-msgstr ""
+msgstr "Малдиви"
 
 #. 454
 #: ../navit/country.c:193
 msgid "Malawi"
-msgstr ""
+msgstr "Малави"
 
 #. 484
 #: ../navit/country.c:194
 msgid "Mexico"
-msgstr ""
+msgstr "Мексико"
 
 #. 458
 #: ../navit/country.c:195
 msgid "Malaysia"
-msgstr ""
+msgstr "Малайзия"
 
 #. 508
 #: ../navit/country.c:196
 msgid "Mozambique"
-msgstr ""
+msgstr "Мозамбик"
 
 #. 516
 #: ../navit/country.c:197
 msgid "Namibia"
-msgstr ""
+msgstr "Намибия"
 
 #. 540
 #: ../navit/country.c:198
 msgid "New Caledonia"
-msgstr ""
+msgstr "Нова Каледония"
 
 #. 562
 #: ../navit/country.c:199
 msgid "Niger"
-msgstr ""
+msgstr "Нигер"
 
 #. 574
 #: ../navit/country.c:200
 msgid "Norfolk Island"
-msgstr ""
+msgstr "о-в Норфолк"
 
 #. 566
 #: ../navit/country.c:201
 msgid "Nigeria"
-msgstr ""
+msgstr "Нигерия"
 
 #. 558
 #: ../navit/country.c:202
 msgid "Nicaragua"
-msgstr ""
+msgstr "Никарагуа"
 
 #. 528
 #: ../navit/country.c:203
 msgid "Netherlands"
-msgstr ""
+msgstr "Кралство Холандия"
 
 #. 578
 #: ../navit/country.c:204
 msgid "Norway"
-msgstr ""
+msgstr "Кралство Норвегия"
 
 #. 524
 #: ../navit/country.c:205
 msgid "Nepal"
-msgstr ""
+msgstr "Непал"
 
 #. 520
 #: ../navit/country.c:206
 msgid "Nauru"
-msgstr ""
+msgstr "Науру"
 
 #. 570
 #: ../navit/country.c:207
 msgid "Niue"
-msgstr ""
+msgstr "Ниуе"
 
 #. 554
 #: ../navit/country.c:208
 msgid "New Zealand"
-msgstr ""
+msgstr "Нова Зеландия"
 
 #. 512
 #: ../navit/country.c:209
 msgid "Oman"
-msgstr ""
+msgstr "Оман"
 
 #. 591
 #: ../navit/country.c:210
 msgid "Panama"
-msgstr ""
+msgstr "Панама"
 
 #. 604
 #: ../navit/country.c:211
 msgid "Peru"
-msgstr ""
+msgstr "Перу"
 
 #. 258
 #: ../navit/country.c:212
 msgid "French Polynesia"
-msgstr ""
+msgstr "Френска Полинезия"
 
 #. 598
 #: ../navit/country.c:213
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Папуа Нова Гвинея"
 
 #. 608
 #: ../navit/country.c:214
 msgid "Philippines"
-msgstr ""
+msgstr "Филипини"
 
 #. 586
 #: ../navit/country.c:215
 msgid "Pakistan"
-msgstr ""
+msgstr "Пакистан"
 
 #. 616
 #: ../navit/country.c:216
 msgid "Poland"
-msgstr ""
+msgstr "Полша"
 
 #. 666
 #: ../navit/country.c:217
 msgid "Saint Pierre and Miquelon"
-msgstr ""
+msgstr "Свети Пиер и Микелон"
 
 #. 612
 #: ../navit/country.c:218
 msgid "Pitcairn"
-msgstr ""
+msgstr "Питкерн"
 
 #. 630
 #: ../navit/country.c:219
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Пуерто Рико"
 
 #. 275
 #: ../navit/country.c:220
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Палестинска територия, Окупирана"
 
 #. 620
 #: ../navit/country.c:221
 msgid "Portugal"
-msgstr ""
+msgstr "Португалия"
 
 #. 585
 #: ../navit/country.c:222
 msgid "Palau"
-msgstr ""
+msgstr "Палау"
 
 #. 600
 #: ../navit/country.c:223
 msgid "Paraguay"
-msgstr ""
+msgstr "Парагвай"
 
 #. 634
 #: ../navit/country.c:224
 msgid "Qatar"
-msgstr ""
+msgstr "Катар"
 
 #. 638
 #: ../navit/country.c:225
 msgid "Reunion"
-msgstr ""
+msgstr "Риюниън"
 
 #. 642
 #: ../navit/country.c:226
 msgid "Romania"
-msgstr ""
+msgstr "Румъния"
 
 #. 688
 #: ../navit/country.c:227
 msgid "Serbia"
-msgstr ""
+msgstr "Сърбия"
 
 #. 643
 #: ../navit/country.c:228
 msgid "Russian Federation"
-msgstr ""
+msgstr "Руска Федерация"
 
 #. 646
 #: ../navit/country.c:229
 msgid "Rwanda"
-msgstr ""
+msgstr "Руанда"
 
 #. 682
 #: ../navit/country.c:230
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Саудитска Арабия"
 
 #. 090
 #: ../navit/country.c:231
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Соломонови о-ви"
 
 #. 690
 #: ../navit/country.c:232
 msgid "Seychelles"
-msgstr ""
+msgstr "Сейшелски о-ви"
 
 #. 736
 #: ../navit/country.c:233
 msgid "Sudan"
-msgstr ""
+msgstr "Судан"
 
 #. 752
 #: ../navit/country.c:234
 msgid "Sweden"
-msgstr ""
+msgstr "Швеция"
 
 #. 702
 #: ../navit/country.c:235
 msgid "Singapore"
-msgstr ""
+msgstr "Сингапур"
 
 #. 654
 #: ../navit/country.c:236
 msgid "Saint Helena"
-msgstr ""
+msgstr "Света Елена"
 
 #. 705
 #: ../navit/country.c:237
 msgid "Slovenia"
-msgstr ""
+msgstr "Словения"
 
 #. 744
 #: ../navit/country.c:238
 msgid "Svalbard and Jan Mayen"
-msgstr ""
+msgstr "Свалбард и Ян Майен"
 
 #. 703
 #: ../navit/country.c:239
 msgid "Slovakia"
-msgstr ""
+msgstr "Словакия"
 
 #. 694
 #: ../navit/country.c:240
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Сиера Леоне"
 
 #. 674
 #: ../navit/country.c:241
 msgid "San Marino"
-msgstr ""
+msgstr "Сан Марино"
 
 #. 686
 #: ../navit/country.c:242
 msgid "Senegal"
-msgstr ""
+msgstr "Сенегал"
 
 #. 706
 #: ../navit/country.c:243
 msgid "Somalia"
-msgstr ""
+msgstr "Сомалия"
 
 #. 740
 #: ../navit/country.c:244
 msgid "Suriname"
-msgstr ""
+msgstr "Суринам"
 
 #. 678
 #: ../navit/country.c:245
 msgid "Sao Tome and Principe"
-msgstr ""
+msgstr "Сао Томе и Принсипи"
 
 #. 222
 #: ../navit/country.c:246
 msgid "El Salvador"
-msgstr ""
+msgstr "Ел Салвадор"
 
 #. 760
 #: ../navit/country.c:247
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Сирийска Арабска Република"
 
 #. 748
 #: ../navit/country.c:248
 msgid "Swaziland"
-msgstr ""
+msgstr "Свазиленд"
 
 #. 796
 #: ../navit/country.c:249
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "Острови Тюрк и Кайкос"
 
 #. 148
 #: ../navit/country.c:250
 msgid "Chad"
-msgstr ""
+msgstr "Чад"
 
 #. 260
 #: ../navit/country.c:251
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Френски Южни Територии"
 
 #. 768
 #: ../navit/country.c:252
 msgid "Togo"
-msgstr ""
+msgstr "Того"
 
 #. 764
 #: ../navit/country.c:253
 msgid "Thailand"
-msgstr ""
+msgstr "Тайланд"
 
 #. 762
 #: ../navit/country.c:254
 msgid "Tajikistan"
-msgstr ""
+msgstr "Таджикистан"
 
 #. 772
 #: ../navit/country.c:255
 msgid "Tokelau"
-msgstr ""
+msgstr "Токелау"
 
 #. 626
 #: ../navit/country.c:256
 msgid "Timor-Leste"
-msgstr ""
+msgstr "Източен Тимор"
 
 #. 795
 #: ../navit/country.c:257
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Тюркменистан"
 
 #. 788
 #: ../navit/country.c:258
 msgid "Tunisia"
-msgstr ""
+msgstr "Тунис"
 
 #. 776
 #: ../navit/country.c:259
 msgid "Tonga"
-msgstr ""
+msgstr "Тонга"
 
 #. 792
 #: ../navit/country.c:260
 msgid "Turkey"
-msgstr ""
+msgstr "Турция"
 
 #. 780
 #: ../navit/country.c:261
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "Тринидад и Тобаго"
 
 #. 798
 #: ../navit/country.c:262
 msgid "Tuvalu"
-msgstr ""
+msgstr "Тувалу"
 
 #. 158
 #: ../navit/country.c:263
 msgid "Taiwan, Province of China"
-msgstr ""
+msgstr "Тайван, Китайска провинция"
 
 #. 834
 #: ../navit/country.c:264
 msgid "Tanzania, United Republic of"
-msgstr ""
+msgstr "Танзания, Обединена република"
 
 #. 804
 #: ../navit/country.c:265
 msgid "Ukraine"
-msgstr ""
+msgstr "Украйна"
 
 #. 800
 #: ../navit/country.c:266
 msgid "Uganda"
-msgstr ""
+msgstr "Уганда"
 
 #. 581
 #: ../navit/country.c:267
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Малки острови, прилежащи към САЩ"
 
 #. 840
 #: ../navit/country.c:268
 msgid "United States"
-msgstr ""
+msgstr "Съединени Амеркански Щати"
 
 #. 858
 #: ../navit/country.c:269
 msgid "Uruguay"
-msgstr ""
+msgstr "Уругвай"
 
 #. 860
 #: ../navit/country.c:270
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Узбекистан"
 
 #. 336
 #: ../navit/country.c:271
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Ватикан"
 
 #. 670
 #: ../navit/country.c:272
 msgid "Saint Vincent and the Grenadines"
-msgstr ""
+msgstr "Свети Винсент и Гренадин"
 
 #. 862
 #: ../navit/country.c:273
 msgid "Venezuela"
-msgstr ""
+msgstr "Венецуела"
 
 #. 092
 #: ../navit/country.c:274
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Вирджински острови, Британски"
 
 #. 850
 #: ../navit/country.c:275
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Вирджински острови, САЩ"
 
 #. 704
 #: ../navit/country.c:276
 msgid "Viet Nam"
-msgstr ""
+msgstr "Виетнам"
 
 #. 548
 #: ../navit/country.c:277
 msgid "Vanuatu"
-msgstr ""
+msgstr "Вануату"
 
 #. 876
 #: ../navit/country.c:278
 msgid "Wallis and Futuna"
-msgstr ""
+msgstr "Уолис и Футуна"
 
 #. 882
 #: ../navit/country.c:279
 msgid "Samoa"
-msgstr ""
+msgstr "Самоа"
 
 #. 887
 #: ../navit/country.c:280
 msgid "Yemen"
-msgstr ""
+msgstr "Йемен"
 
 #. 175
 #: ../navit/country.c:281
 msgid "Mayotte"
-msgstr ""
+msgstr "Майот"
 
 #. 710
 #: ../navit/country.c:282
 msgid "South Africa"
-msgstr ""
+msgstr "Южноафриканска Република"
 
 #. 894
 #: ../navit/country.c:283
 msgid "Zambia"
-msgstr ""
+msgstr "Замбия"
 
 #. 716
 #: ../navit/country.c:284
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Зимбабве"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:119
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 msgid "Car"
-msgstr ""
+msgstr "Автомобил"
 
 #: ../navit/gui/gtk/destination.c:118
 msgid "Iso2"
@@ -1525,205 +1574,209 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
-msgstr ""
+msgstr "Държава"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
 msgid "Postal"
-msgstr ""
+msgstr "Пощенски"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
-msgstr ""
+msgstr "Град"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
 msgid "District"
-msgstr ""
+msgstr "Окръг"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
-msgstr ""
+msgstr "Улица"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
-msgstr ""
+msgstr "Номер"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
-msgstr ""
+msgstr "Въведете мостоназначение"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
-msgstr ""
+msgstr "Пощенски код"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
-msgstr ""
+msgstr "Град"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
-msgstr ""
+msgstr "Община"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
-msgstr ""
+msgstr "Карта"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
-msgstr ""
+msgstr "Отметка"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
-msgstr ""
+msgstr "Местоназначение"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
-msgstr ""
+msgstr "Показване"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
-msgstr ""
+msgstr "Маршрут"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
-msgstr ""
+msgstr "Предишни Местоназначения"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Отметки"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
-msgstr ""
+msgstr "Изглед"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
-msgstr ""
+msgstr "Проекция"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
-msgstr ""
+msgstr "Превозно средство"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
-msgstr ""
+msgstr "Отдалечи"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
-msgstr ""
+msgstr "Приближи"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
-msgstr ""
+msgstr "Преизчисляване"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
-msgstr ""
+msgstr "Информация"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
-msgstr ""
+msgstr "Спри Навигацията"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
-msgstr ""
+msgstr "Тест"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
-msgstr ""
+msgstr "_Изход"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
-msgstr ""
+msgstr "Курсор"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
-msgstr ""
+msgstr "Придържай към пътя"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
-msgid "Fullscreen"
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
+msgid "Fullscreen"
+msgstr "Цял екран"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
-msgstr ""
+msgstr "Данни"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "N"
-msgstr ""
+msgstr "С"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "NE"
-msgstr ""
+msgstr "СИ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "E"
-msgstr ""
+msgstr "И"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "SE"
-msgstr ""
+msgstr "ЮИ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "S"
-msgstr ""
+msgstr "Ю"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "SW"
-msgstr ""
+msgstr "ЮЗ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "W"
-msgstr ""
+msgstr "З"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "NW"
-msgstr ""
+msgstr "СЗ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,94 +1793,132 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
-msgstr ""
+msgstr "Обратно към картата"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
-msgstr ""
+msgstr "Основно меню"
+
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr "Помощ"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr "Назад"
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
-msgstr ""
+msgstr "Улици"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
-msgstr ""
+msgstr "Виж в Браузър"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
-msgstr ""
+msgstr "Виж Атрибутите"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
-msgstr ""
+msgstr "Виж на картата"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
-msgstr ""
+msgstr "Отметка %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
-msgstr ""
+msgstr "Режим Прозорец"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
-msgstr ""
+msgstr "Действия"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
-msgstr ""
+msgstr "Точка на карта"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
-msgstr ""
+msgstr "Позиция на автомобил"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
-msgstr ""
+msgstr "Излез"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
+"Спри\n"
+"Навигацията"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
-msgstr ""
+msgstr "Карти"
+
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr "Покажи Състояние на Сателити"
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr "Покажи NMEA Данни"
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr "Укажи като активен"
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr "Покажи състояние на Сателити"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr "Покажи NMEA Данни"
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
-msgstr ""
+msgstr "Правила"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
-msgstr ""
+msgstr "Картата следва Автомобила"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
-msgstr ""
+msgstr "Настройки"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
+msgstr "Главно меню"
+
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Покажи\n"
+"Картата"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
-msgstr ""
+msgstr "Инструменти"
diff --git a/po/ca.po.in b/po/ca.po.in
index 9100806c2..45f114955 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 09:53+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2009-01-26 11:22+0000\n"
 "Last-Translator: Sid <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,276 +29,304 @@ msgstr "Executant-se des de directori arrel\n"
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "primera"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "segona"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "tercera"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr ""
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1205
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "sortir"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1237
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1241
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1245
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1249
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1256
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "dreta"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "esquerra"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "fàcilment "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "desconegut "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr ""
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "ara"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1420
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "error"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1450
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1453
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Posició"
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Ordre"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Durada"
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr ""
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Temps"
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1546,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr ""
 
@@ -1558,9 +1586,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr ""
 
@@ -1570,127 +1598,131 @@ msgid "District"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1739,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1761,94 +1793,128 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
diff --git a/po/cs.po.in b/po/cs.po.in
index 4725d67ad..071ca0846 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-03-02 13:41+0000\n"
-"Last-Translator: Tomas Kukol <Unknown>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-13 07:03+0000\n"
+"Last-Translator: talmik <Unknown>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,65 +29,93 @@ msgstr "Běží ze zdrojového adresáře\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavuji '%s' na '%s\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "nultá"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "první"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "druhá"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "třetí"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "čtvrtá"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "pátá"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "šestá"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "nultý exit"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "první exit"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "druhý exit"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "třetí exit"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "čtvrtý exit"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "pátý exit"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "šestý exit"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "za %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metrů"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "za %d metrů"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometrů"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrů"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -95,7 +123,7 @@ msgstr[0] "%d kilometr"
 msgstr[1] "%d kilometry"
 msgstr[2] "%d  kilometrů"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -103,204 +131,204 @@ msgstr[0] "za %d  kilometr"
 msgstr[1] "za %d  kilometry"
 msgstr[2] "za %d kilometrů"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "konec"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s do ulice %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s o%s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s do %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s do %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "vpravo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "vlevo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "mírně "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "silně "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "neurčitě "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Až to bude možné, otočte se"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte po další %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "brzy"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nyní"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "chyba"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Zabočte %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dorazili jste do cíle %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Poloha"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Příkaz"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Délka"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Cílová vzdálenost"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Cílový čas"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Itinerář"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Použít jako pozici"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Nastavit jako cíl"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Použít jako záložku"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Bod 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Souřadnice obrazovky: %d %d"
@@ -1549,7 +1577,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Země"
 
@@ -1560,9 +1588,9 @@ msgstr "Poštovní"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Město"
 
@@ -1573,8 +1601,8 @@ msgstr "Kraj/Okres"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Ulice"
 
@@ -1611,8 +1639,8 @@ msgid "Destination"
 msgstr "Cíl"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Zobrazit"
 
@@ -1625,14 +1653,14 @@ msgid "Former Destinations"
 msgstr "Minulé cíle"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Záložky"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Rozvržení"
 
@@ -1641,8 +1669,8 @@ msgid "Projection"
 msgstr "Projekce"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Vozidlo"
 
@@ -1683,7 +1711,7 @@ msgid "Lock on Road"
 msgstr "Jet jen po silnici"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Severně"
 
@@ -1692,7 +1720,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
@@ -1745,12 +1773,12 @@ msgid "No"
 msgstr "Ne"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1767,70 +1795,70 @@ msgstr "Trasa %4.0fkm    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Trasa 0000km  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Zpět na mapu"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Hlavní menu"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
-msgstr ""
+msgstr "Zpět"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "Body zájmu"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Zobrazit v prohlížeči"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Zobrazit atributy"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "V okně"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Akce"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Bod na mapě"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Poloha vozidla"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Konec"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1838,60 +1866,60 @@ msgstr ""
 "Ukonči\n"
 "Navigaci"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
-msgstr ""
+msgstr "Nastavit jako aktivní"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Pravidla"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Uchytit na cestu"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Hlavní menu"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Nástroje"
 
diff --git a/po/da.po.in b/po/da.po.in
index cf5a1463f..22fcf29f4 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-03-07 13:32+0000\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-15 22:22+0000\n"
 "Last-Translator: Mads Konradsen <Unknown>\n"
 "Language-Team: Glenn Sommer <glemsom@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,276 +29,304 @@ msgstr "Kører fra kildekode mappen\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "sætter '%s' til '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "første"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "anden"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "tredje"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "fourth"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "fifth"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "sixth"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "første afkørsel"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "anden afkørsel"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "tredje afkørsel"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "fjerde afkørsel"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "femte afkørsel"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sjette afkørsel"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "i %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "om %d meters"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometer"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "om %d.%d kilometer"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "én kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om én kilometer"
 msgstr[1] "om %d kilometer"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "afslut"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "op på rampen"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s ind i gaden %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s ind i %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s ind i %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s ind i %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sind i %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "højre"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "venstre"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "blødt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "skarpt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "ukendt "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Når muligt, vend venligst om"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Kør snart ind i rundkørslen"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Om %s, kør ind i rundkørslen"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Forlad rundkørslen ved %s afkørsel"
+msgid "Leave the roundabout at the %s"
+msgstr "Forlad rundkørslen ved den %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "forlad så rundkørslen ved den %s afkørsel"
+msgid "then leave the roundabout at the %s"
+msgstr "forlad så rundkørslen ved den %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Følg vejen de næste %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "snart"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Tag den %1$s vej til %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "efter %i veje"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "tag så den %1$s vej til %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "fejl"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Drej %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "drej så %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du er fremme ved destinationen %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "og så ankommer du til din destination"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Kommando"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Længde"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tid"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Længde til destinationen"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Tid til destinationen"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Vejbog"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Sæt som position"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Sæt som destination"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Tilføj som bogmærke"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skærm koordinater %d %d"
@@ -1547,7 +1575,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Land"
 
@@ -1558,9 +1586,9 @@ msgstr "Post"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "By"
 
@@ -1571,8 +1599,8 @@ msgstr "Område"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Gade"
 
@@ -1609,8 +1637,8 @@ msgid "Destination"
 msgstr "Destination"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Vis"
 
@@ -1623,14 +1651,14 @@ msgid "Former Destinations"
 msgstr "Tidligere destinationer"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Layout"
 
@@ -1639,8 +1667,8 @@ msgid "Projection"
 msgstr "Visning"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Køretøj"
 
@@ -1681,7 +1709,7 @@ msgid "Lock on Road"
 msgstr "Stop Navigation"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
@@ -1690,7 +1718,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
@@ -1743,12 +1771,12 @@ msgid "No"
 msgstr "Nej"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1765,70 +1793,70 @@ msgstr "Rute %4.0fkm    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rute 0000km  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Tilbage til kort"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Hovedmenu"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Tilbage"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Gader"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Vis i Browser"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Bogmærke %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Vinduestilstand"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Kort Punkt"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Køretøj Positaion"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Luk"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1836,54 +1864,54 @@ msgstr ""
 "Stop\n"
 "Navigation"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Kort"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "Vis Satellit Status"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "Vis NMEA Data"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "Sæt til aktiv"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "Vis Satellit status"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "Vis NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Regler"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Lås til vej"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Kort følger Køretøj"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Hovedmenu"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1891,7 +1919,7 @@ msgstr ""
 "Vis\n"
 "Kort"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Værktøjer"
 
@@ -1978,3 +2006,11 @@ msgstr "Værktøjer"
 
 #~ msgid "VisiblePoints"
 #~ msgstr "Synlige punkter"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Forlad rundkørslen ved %s afkørsel"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "forlad så rundkørslen ved den %s afkørsel"
diff --git a/po/de.po.in b/po/de.po.in
index 1dc567d97..03bddb031 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-02-23 13:20+0000\n"
-"Last-Translator: Keruskerfuerst <armin_mohring@web.de>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-04-06 09:02+0000\n"
+"Last-Translator: Roschkor <Unknown>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,278 +29,306 @@ msgstr "Aufruf aus Quellverzeichnis\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setze '%s' auf '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "nullte"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "erste"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "zweite"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "dritte"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "vierte"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "fünfte"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "sechste"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "nullte Ausfahrt"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "erste Ausfahrt"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "zweite Ausfahrt"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "dritte Ausfahrt"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "vierte Ausfahrt"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "fünfte Ausfahrt"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sechste Ausfahrt"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "in %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "In %d Metern"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d Kilometer"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "In %d,%d Kilometern"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] "einen Kilometer"
+msgstr[0] "ein Kilometer"
 msgstr[1] "%d Kilometer"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "In einem Kilometer"
 msgstr[1] "In %d Kilometern"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "Ausfahrt"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "auf die Autobahnauffahrt"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sauf die Straße %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sauf den %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sauf die %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sauf das %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sauf die %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "rechts"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "leicht "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "stark "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "unbekannt "
 
 #
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Wenn möglich bitte wenden"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Demnächst in den Kreisverkehr einfahren"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "In %s in den Kreisverkehr einfahren"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Den Kreisverkehr an der %s Ausfahrt verlassen"
+msgid "Leave the roundabout at the %s"
+msgstr "Verlassen Sie den Kreisverkehrt an der %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "dann den Kreisverkehr an der %s Ausfahrt verlassen"
+msgid "then leave the roundabout at the %s"
+msgstr "anschliessend verlassen Sie den Kreisverkehr an der %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Dem Straßenverlauf %s folgen"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "Demnächst"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Die %1$s Straße %2$s abbiegen"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "Jetzt"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "dann die %1$s Straße %2$s abbiegen"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "Fehler"
 
 # c-format
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "%3$s %1$s%2$s abbiegen%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "dann %3$s %1$s%2$s abbiegen%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sie haben Ihr Ziel %s erreicht"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "dann haben Sie Ihr Ziel erreicht."
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Befehl"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Länge"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Zeit"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Verbleibende Strecke zum Ziel"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Fahrzeit zum Ziel"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Straßenkarte"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Als Position setzen"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Als Ziel setzen"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Als Lesezeichen aufnehmen"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Bildschirm %d %d"
@@ -1551,7 +1579,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Land"
 
@@ -1563,9 +1591,9 @@ msgstr "PLZ"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Ort"
 
@@ -1576,8 +1604,8 @@ msgstr "Gegend"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Straße"
 
@@ -1614,8 +1642,8 @@ msgid "Destination"
 msgstr "Reiseziel"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Anzeige"
 
@@ -1628,14 +1656,14 @@ msgid "Former Destinations"
 msgstr "Vorherige Ziele"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Erscheinungsbild"
 
@@ -1644,8 +1672,8 @@ msgid "Projection"
 msgstr "Projektion"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Fahrzeug"
 
@@ -1686,7 +1714,7 @@ msgid "Lock on Road"
 msgstr "Auf Straße zeigen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Einnorden"
 
@@ -1695,7 +1723,7 @@ msgid "Autozoom"
 msgstr "automatischer Zoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Vollbild"
 
@@ -1748,12 +1776,12 @@ msgid "No"
 msgstr "Nein"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1770,70 +1798,70 @@ msgstr "Route %4.0fkm    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Route 0000km 0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Zurück zur Karte"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Zurück"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "Interressante Kartenpunkte"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Straßen"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Im Browser anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Attribute anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Auf der Karte zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Lesezeichen %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Kartenpunkt"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Fahrzeugposition"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Ende"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1841,54 +1869,54 @@ msgstr ""
 "Navigation\n"
 "beenden"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Karten"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "zeige NMEA Daten"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "Als Aktiv setzen"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "NMEA Daten anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Regeln"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Auf Straße zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Karte folgt Fahrzeug"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1896,6 +1924,14 @@ msgstr ""
 "Karte\n"
 "anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Werkzeuge"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Den Kreisverkehr an der %s Ausfahrt verlassen"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "dann den Kreisverkehr an der %s Ausfahrt verlassen"
diff --git a/po/el.po.in b/po/el.po.in
index ec98e0d3c..4216111d2 100644
--- a/po/el.po.in
+++ b/po/el.po.in
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"Project-Id-Version: navit 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-12-23 08:24+0000\n"
 "Last-Translator: vassilis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d μ"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "σε %d μ"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d μέτρα"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "σε %d μέτρα"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d %d χιλιόμετρα"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "σε %d %d χιλιόμετρα"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "Ένα χιλιόμετρο"
 msgstr[1] "%d χιλιόμετρα"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "σε ένα χιλιόμετρο"
 msgstr[1] "σε %d χιλιόμετρα"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "έξοδος"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "δεξιά"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "αριστερά"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "εύκολα "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "άγνωστο "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Όπου είναι εφικτό, παρακαλώ πραγματοποιήστε αναστροφή"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Ακολουθήστε το δρόμο για το επόμενο %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "σύντομα"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "τώρα"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "σφάλμα"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Στρίψτε %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Φτάσατε στον προορισμό σας %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Θέση"
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Εντολή"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Μήκος"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "χλμ"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "μ"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Ώρα"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Μήκος προορισμού"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Ώρα προορισμού"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Ορισμός ως θέση"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Ορισμός ως προορισμός"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Προσθήκη ως σελιδοδείκτης"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Σημείο 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Συντεταγμένες οθόνης : %d %d"
@@ -1525,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Χώρα"
 
@@ -1537,9 +1586,9 @@ msgstr "Ταχυδρομική"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Πόλη"
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr "Επαρχία"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Οδός"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Αριθμός"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Εισάγετε προορισμό"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Ταχ. Κώδικας"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Πόλη"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Χάρτης"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Σελιδοδείκτης"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Προορισμός"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Προβολή"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Διαδρομή"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Προγενέστερες διαδρομές"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Σελιδοδείκτες"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Διάταξη"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Προβολή :"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Όχημα"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Σμίκρυνση"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Μεγέθυνση"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Επανάληψη υπολογισμού"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Πληροφορίες"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Διακοπή πλοήγησης"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Δοκιμή"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Δρομέας"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Πλήρης Οθόνη"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Δεδομένα"
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr "Όχι"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2Δ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3Δ"
 
@@ -1740,94 +1793,128 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Πίσω στο χάρτη"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Κύριο Μενού"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "Σημεία Ενδιαφέροντος"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Οδοί"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Προβολή Ιδιοτήτων"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Προβολή στο χάρτη"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Σελιδοδείκτης %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Λειτουργία παραθύρων"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Σημείο Χάρτη"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Θέση Οχήματος"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr "Διακοπή"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Χάρτες"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Κανόνες"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Ο χάρτης ακολουθεί το Όχημα"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Κύριο Μενού"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Εργαλεία"
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index e9b8fc7a2..708b30800 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-09-25 05:24+0000\n"
 "Last-Translator: Jeff Bailes <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr "Running from source directory\n"
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "setting '%s' to '%s'\n"
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "in %d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metres"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "in %d metres"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometre"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "in %d.%d kilometres"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "one kilometre"
 msgstr[1] "%d kilometres"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "in one kilometre"
 msgstr[1] "in %d kilometres"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "exit"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sinto the street %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sinto the %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sinto the %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sinto the %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "right"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "left"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "easily "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "strongly "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "unknown "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "When possible, please turn around"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Follow the road for the next %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "soon"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "now"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "error"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Turn %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "You have reached your destination %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Command"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Length"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Time"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Destination Length"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Destination Time"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Roadbook"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Set as position"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Set as destination"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Add as bookmark"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Point 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Screen coord : %d %d"
@@ -1525,8 +1574,8 @@ msgstr "Iso2"
 msgid "Iso3"
 msgstr "Iso3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Country"
 
@@ -1537,9 +1586,9 @@ msgstr "Postal"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Town"
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr "District"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Street"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Number"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Enter Destination"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Post Code"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "City"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "District/Township"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Map"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Bookmark"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Destination"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Display"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Route"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Former Destinations"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Layout"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projection"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Vehicle"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "ZoomOut"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "ZoomIn"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Recalculate"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Info"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Stop Navigation"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Test"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Lock on Road"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Northing"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Data"
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,95 +1793,129 @@ msgstr "Route %4.0fkm    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Route 0000km  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/eo.po.in b/po/eo.po.in
index c88e36c01..37d84ea1b 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"Project-Id-Version: navit 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-09-24 13:33+0000\n"
 "Last-Translator: OlivierWeb <olivierweb@ifrance.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metroj"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "unu kilometro"
 msgstr[1] "%d kilometroj"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr ""
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "dekstren"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "maldekstren"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "facile "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr ""
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "baldaŭ"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nun"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "eraro"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Komando"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Longo"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Horo"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1525,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr ""
 
@@ -1537,9 +1586,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr ""
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Legosignoj"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,94 +1793,128 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
diff --git a/po/es.po.in b/po/es.po.in
index 07c409c9c..7f0d5a2dc 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-02-26 14:46+0000\n"
-"Last-Translator: Emilio Gómez Fernández <Unknown>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-04-04 11:38+0000\n"
+"Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
 "Language-Team: Chris Eubank <cteubank@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,23,-1,-1,-1,-1,-1,-1\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
@@ -30,276 +30,304 @@ msgstr "Ejecutando desde el directorio fuente\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "configurando '%s' a '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "zeroth"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "primera"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "segunda"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "tercera"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "cuarta"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "quinta"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "sexta"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "salida cero"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "primera salida"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "segunda salida"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "tercera salida"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "cuarta salida"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "quinta salida"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sexta salida"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "en %d metros"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "en %d metros"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilómetro"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "en %d.%d kilómetros"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilómetro"
 msgstr[1] "%d kilómetro"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "en un kilómetro"
 msgstr[1] "en %d kilómetros"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "salir"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "en la rampa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s en la calle %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s en el %s%s%s|male form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s en la %s%s%s|female form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s en %s%s%s|neutral form"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s en la %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "derecha"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "izquierda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "suavemente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "brúscamente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "desconocido "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Cuando sea posible, por favor de la vuelta"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Métete pronto en la rotonda"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "En %s entra en la rotonda"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Sal de la rotona en al %s salida"
+msgid "Leave the roundabout at the %s"
+msgstr "Salga de la rotonda en la %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "sal de la rotonda en la %s salida"
+msgid "then leave the roundabout at the %s"
+msgstr "después, salga de la rotonda en la %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga el camino hasta la siguiente %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "pronto"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Toma la %1$s carretera en la %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "después de %i carreteras"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "ahora"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "entonces toma la %1$s salida a la %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "error"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Gire %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "tuerce %1$s a la %2$s pasando %3$s salidas hasta %4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ha llegado a su destino %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "ya has llegado al destino"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Posición"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Comando"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Longitud"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tiempo"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Distancia a Destino"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Tiempo a Destino"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Guía"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Fijar una posición"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Definir como destino"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Agregar como favorito"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punto 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordenadas de pantalla : %d %d"
@@ -1548,7 +1576,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "País"
 
@@ -1559,9 +1587,9 @@ msgstr "Postal"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Ciudad"
 
@@ -1572,8 +1600,8 @@ msgstr "Distrito"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Calle"
 
@@ -1610,8 +1638,8 @@ msgid "Destination"
 msgstr "Destino"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Visualizar"
 
@@ -1624,14 +1652,14 @@ msgid "Former Destinations"
 msgstr "Anteriores destinos"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Favoritos"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Diseño"
 
@@ -1640,8 +1668,8 @@ msgid "Projection"
 msgstr "Proyección"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Vehículo"
 
@@ -1682,7 +1710,7 @@ msgid "Lock on Road"
 msgstr "Bloquear Ruta"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Norteando"
 
@@ -1691,7 +1719,7 @@ msgid "Autozoom"
 msgstr "Zoom automático"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Pantalla Completa"
 
@@ -1744,12 +1772,12 @@ msgid "No"
 msgstr "No"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1766,70 +1794,70 @@ msgstr "Ruta %4.0fkm    %02d:%02d TEL"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Ruta 0000km  0+00:00 TEL"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Volver al mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Menú Principal"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Atrás"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "PDIs"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Calles"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Ver en el Navegador"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Ver Atributos"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Marcador %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Modo de Ventana"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Punto en el Mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Posición del Vehiculo"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Cerrar"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1837,54 +1865,54 @@ msgstr ""
 "Parar\n"
 "Navegación"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "Mostrar estado de Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "Mostar datos NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "Establecer como Activo"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "Mostrar estado de Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "Mostar datos NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Reglas"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Bloqueado en la calle"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "El mapa sigue al Vehiculo"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Menú principal"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1892,9 +1920,17 @@ msgstr ""
 "Mostrar\n"
 "Mapa"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Herramientas"
 
 #~ msgid "ramp"
 #~ msgstr "desnivel"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Sal de la rotona en al %s salida"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "sal de la rotonda en la %s salida"
diff --git a/po/et.po.in b/po/et.po.in
index a9350a343..69883149c 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-10-29 16:32+0000\n"
 "Last-Translator: Andres Kaaber <andres.kaaber@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr "Käivitan lähtekataloogist\n"
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "määran '%s' -i '%s' -ks\n"
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "%d m pärast"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d meetrit"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "%d meetri pärast"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilomeeter"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d.%d kilomeetri pärast"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "üks kilomeeter"
 msgstr[1] "%d kilomeetrit"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "ühe kilomeetri pärast"
 msgstr[1] "%d kilomeetri pärast"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "välju"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s %s%s%s tänavale"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s %s%s%s tänavale| mees vorm"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s %s%s%s tänavale| nais vorm"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s %s%s%s tänavale| neutraalne vorm"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "paremale"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "vasakule"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "kergesti "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "tugevalt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "teadmata "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Kui võimalik, palun pööra ümber"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Mööda teed järgmise %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "varsti"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nüüd"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "viga"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Pööra %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sa oled jõudnud sihtpunkti %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Käsk"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Pikkus"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Aeg"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Sihtkoha kaugus"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Kohalejõudmise aeg"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Teekonna raamat"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Määra asukohaks"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Määra sihtpunktiks"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Lisa järjehoidjasse"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Ekraani koordinaadid: %d %d"
@@ -1525,8 +1574,8 @@ msgstr "Iso2"
 msgid "Iso3"
 msgstr "Iso3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Riik"
 
@@ -1537,9 +1586,9 @@ msgstr "Postiindeks"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Linn"
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr "Linnaosa"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Tänav"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Number"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Sisesta sihtpunkt"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Postiindeks"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Linn"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Linnaosa"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Kaart"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Järjehoidja"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Sihtkoht"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Kuva"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Teekond"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Eelmine sihtkoht"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Järjehoidjad"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Paigutus"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projektsioon"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Liiklusvahend"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Vähenda"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Suurenda"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Arvuta uuesti"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Teave"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Peata navigatsioon"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Test"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Välju"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Kursor"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Lukusta tee peale"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Põhjasuund"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Täisekraan"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Andmed"
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,95 +1793,129 @@ msgstr "Teekond %4.0fkm %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Teekond 0000km 0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/fi.po.in b/po/fi.po.in
index 725c02b68..34610a0aa 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 11:28+0100\n"
-"PO-Revision-Date: 2009-02-12 14:08+0000\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-19 09:53+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Ossi Berg <o.berg@mail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-02-13 06:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,276 +29,304 @@ msgstr "Ajetaan lähdehakemistosta\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "asetetaan '%s' arvoon '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "nollas"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "ensimmäinen"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "toinen"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "kolmas"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "neljäs"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "viides"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "kuudes"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "nollannesta liittymästä"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "ensimmäisestä liittymästä"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "toisesta liittymästä"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "kolmannesta liittymästä"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "neljännestä liittymästä"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "viidennestä liittymästä"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "kuudennesta liittymästä"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "%d m päästä"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metriä"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "%d metrin päästä"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilometri"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d,%d kilometrin päästä"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "yksi kilometri"
 msgstr[1] "%d kilometriä"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "Yhden kilometrin päästä"
 msgstr[1] "%d kilometrin päästä"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "poistumistie"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "rampille"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%stielle %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "oikealle"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "vasemmalle"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "loivasti "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "jyrkästi "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "tuntematon "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Kun mahdollista, tee u-käännös"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Liity liikenneympyrään pian"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "%s, liity liikenneympyrään"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Poistu liikenneympyrästä, %s poistumistie"
+msgid "Leave the roundabout at the %s"
+msgstr "Poistu liikenneympyrästä %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "poistu sitten liikenneympyrästä, %s poistumistie"
+msgid "then leave the roundabout at the %s"
+msgstr "poistu sitten liikenneympyrästä %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Seuraa tätä tietä %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "pian"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Valitse %1$s tie suuntaan %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "%i tien jälkeen"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nyt"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "valitse sitten %1$s tie suuntaan %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "virhe"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Käänny %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "käänny sitten %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Olet saavuttanut kohteesi %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "sitten olet perillä."
 
-#: ../navit/navit.c:1125
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Sijainti"
 
-#: ../navit/navit.c:1126
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Komento"
 
-#: ../navit/navit.c:1130
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Pituus"
 
-#: ../navit/navit.c:1134 ../navit/navit.c:1159
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1138 ../navit/navit.c:1163
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1144
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Aika"
 
-#: ../navit/navit.c:1156
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Kohde"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Kohde"
 
-#: ../navit/navit.c:1202 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Ohjeistaja"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Aseta sijainniksi"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Aseta kohteeksi"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Lisää kirjanmerkiksi"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Piste 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Ruutu %d %d"
@@ -1548,7 +1576,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2729
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Maa"
 
@@ -1560,9 +1588,9 @@ msgstr "Postinumero"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2737
-#: ../navit/gui/internal/gui_internal.c:2870
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Paikkakunta"
 
@@ -1574,8 +1602,8 @@ msgstr "Alue"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2689
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Katu"
 
@@ -1600,7 +1628,7 @@ msgstr "Kaupunki"
 msgid "District/Township"
 msgstr "Maakunta"
 
-#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Kartta"
 
@@ -1608,93 +1636,97 @@ msgstr "Kartta"
 msgid "Bookmark"
 msgstr "Kirjanmerkki"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Kohde"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2791
-#: ../navit/gui/internal/gui_internal.c:3084
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Näyttö"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Reitti"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Aiemmat kohteet"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2846
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2748
-#: ../navit/gui/internal/gui_internal.c:2793
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Pohja"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projektio"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:3027
-#: ../navit/gui/internal/gui_internal.c:3092
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Kulkuneuvo"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Loitonna"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Lähennä"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Laske uudelleen"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Info"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Lopeta navigointi"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Testi"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "Sulje"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Osoitin"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Lukitse tiehen"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:3066
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Pohjoinen ylhäällä"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2803
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Autom. suurennus"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Koko ruutu"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Tieto"
 
@@ -1743,12 +1775,12 @@ msgid "No"
 msgstr "Ei"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2816
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1765,70 +1797,70 @@ msgstr "Reitti %4.0fkm, arvioitu aika %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Reitti 0000km, arvioitu aika 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Takaisin karttaan"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Päävalikko"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Ohje"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Takaisin"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "POIt"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Kadut"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Näytä selaimessa"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Näytä ominaisuudet"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Näytä kartalla"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Tee kirjanmerkki %s"
 
-#: ../navit/gui/internal/gui_internal.c:2798
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Ikkunatila"
 
-#: ../navit/gui/internal/gui_internal.c:2844
-#: ../navit/gui/internal/gui_internal.c:3132
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Toiminnat"
 
-#: ../navit/gui/internal/gui_internal.c:2855
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Karttapiste"
 
-#: ../navit/gui/internal/gui_internal.c:2865
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Ajoneuvon sijainti"
 
-#: ../navit/gui/internal/gui_internal.c:2874
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../navit/gui/internal/gui_internal.c:2880
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1836,54 +1868,54 @@ msgstr ""
 "Lopeta\n"
 "Suunnistus"
 
-#: ../navit/gui/internal/gui_internal.c:2896
-#: ../navit/gui/internal/gui_internal.c:3088
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Kartat"
 
-#: ../navit/gui/internal/gui_internal.c:2940
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "Näytä satelliittien tila"
 
-#: ../navit/gui/internal/gui_internal.c:2974
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "Näytä NMEA-tiedot"
 
-#: ../navit/gui/internal/gui_internal.c:2998
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "Aseta aktiiviseksi"
 
-#: ../navit/gui/internal/gui_internal.c:3004
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "Näytä satelliittien tila"
 
-#: ../navit/gui/internal/gui_internal.c:3010
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "Näytä NMEA-tiedot"
 
-#: ../navit/gui/internal/gui_internal.c:3052
-#: ../navit/gui/internal/gui_internal.c:3096
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Säännöt"
 
-#: ../navit/gui/internal/gui_internal.c:3060
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Lukitse tiehen"
 
-#: ../navit/gui/internal/gui_internal.c:3072
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Kartta seuraa ajoneuvoa"
 
-#: ../navit/gui/internal/gui_internal.c:3082
-#: ../navit/gui/internal/gui_internal.c:3140
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../navit/gui/internal/gui_internal.c:3130
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Päävalikko"
 
-#: ../navit/gui/internal/gui_internal.c:3136
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1891,7 +1923,7 @@ msgstr ""
 "Näytä\n"
 "kartta"
 
-#: ../navit/gui/internal/gui_internal.c:3143
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Työkalut"
 
@@ -2013,3 +2045,11 @@ msgstr "Työkalut"
 #~ msgstr ""
 #~ "Ajetaan lähdehakemistosta. Kirjanmerkit, keskipiste ja kohteet "
 #~ "ylikirjoitetaan tässä hakemistossa.\n"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Poistu liikenneympyrästä, %s poistumistie"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "poistu sitten liikenneympyrästä, %s poistumistie"
diff --git a/po/fr.po.in b/po/fr.po.in
index e602b52d7..d18561411 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-03-03 16:47+0000\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-13 15:37+0000\n"
 "Last-Translator: metehyi <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,281 +30,309 @@ msgstr "Execution depuis le dossier d'origine\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' mis à '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "zéroième"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "première"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "seconde"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "troisième"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "quatrième"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "cinquième"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "sixième"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "la zéroème sortie"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "la première sortie"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "la seconde sortie"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "la troisième sortie"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "la quatrième sortie"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "la cinquième sortie"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "la sixième sortie"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "dans %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d mètres"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "dans %d mètres"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilomètre"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "dans %d.%d kilomètres"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilomètre"
 msgstr[1] "%d kilomètres"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "dans un kilomètre"
 msgstr[1] "dans %d kilomètres"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "sortie"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "vers la sortie"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%ssur %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%ssur le %s%s%s|male form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%ssur la %s%s%s|female form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%ssur l'%s%s%s|neutral form"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s vers la %s"
 
 # tournez à droite
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "à droite"
 
 # tournez à gauche
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "à gauche"
 
 # utilisé pour les changements de voie pour les sorties?
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "légèrement "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "fortement "
 
 # attention à l'espace à la fin
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "inconnu "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Si possible, faites demi-tour"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Bientôt rejoindre le rond-point"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Aprrès %s, rejoindre le rond-point"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Prenez la sortie %s du rond-point"
+msgid "Leave the roundabout at the %s"
+msgstr "sortez du rond-point au %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "puis quittez le rond-point à la sortie %s"
+msgid "then leave the roundabout at the %s"
+msgstr "puis sortez du rond-point au %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Suivez la route sur %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "bientôt"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prenez la %1$s route vers la %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "après %i rues"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "maintenant"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "puis prenez la %1$s route vers la %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "erreur"
 
 # espace important après le 2
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "%3$s, tournez %1$s%2$s %4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "puis tournez %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Vous êtes arrivé à destination : %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "ensuite vous serez à destination"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Commande"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Distance"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Durée"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Distance à parcourir"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Temps de parcours"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Carnet de route"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Définir comme position"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Définir comme destination"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Ajouter aux favoris"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Point 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coord. à l'écran : %d %d"
@@ -1553,7 +1581,7 @@ msgid "Iso3"
 msgstr "iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Pays"
 
@@ -1564,9 +1592,9 @@ msgstr "Code postal"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Ville"
 
@@ -1577,8 +1605,8 @@ msgstr "Quartier"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Rue"
 
@@ -1615,8 +1643,8 @@ msgid "Destination"
 msgstr "Destination"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "_Affichage"
 
@@ -1629,14 +1657,14 @@ msgid "Former Destinations"
 msgstr "Destinations précédentes"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Signets"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Calques"
 
@@ -1645,8 +1673,8 @@ msgid "Projection"
 msgstr "Projection"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Véhicule"
 
@@ -1687,7 +1715,7 @@ msgid "Lock on Road"
 msgstr "Rester sur la route"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Orientation toujours au Nord"
 
@@ -1696,7 +1724,7 @@ msgid "Autozoom"
 msgstr "Zoom automatique"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Plein écran"
 
@@ -1749,12 +1777,12 @@ msgid "No"
 msgstr "Non"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1771,70 +1799,70 @@ msgstr "Trajet restant %4.0f km    heure d'arrivée estimée %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Trajet 0000 km  temps estimé 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Retourner à la carte"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Menu principal"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Aide"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Retour"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "Points d'intérêt"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Rues"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Voir dans le navigateur"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Voir les attributs"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Voir sur la carte"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Ajouter %s aux favoris"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Mode fenêtré"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Actions"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Point sur la carte"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Position du véhicule"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1842,54 +1870,54 @@ msgstr ""
 "Arrêter la\n"
 "navigation"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Cartes"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "Afficher les infos satellite"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "Afficher les données NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "Activer"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "Afficher les infos satellite"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "Afficher les données NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Règles"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Coller à la route"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "La carte suit le véhicule"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Menu principal"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1897,7 +1925,7 @@ msgstr ""
 "Afficher\n"
 "la carte"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Outils"
 
@@ -2010,3 +2038,11 @@ msgstr "Outils"
 
 #~ msgid "distance_pos"
 #~ msgstr "1"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Prenez la sortie %s du rond-point"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "puis quittez le rond-point à la sortie %s"
diff --git a/po/he.po.in b/po/he.po.in
index 6494cb3a6..4dfd19326 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 11:28+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2009-02-11 15:34+0000\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-02-13 06:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,276 +29,304 @@ msgstr "מופעל מתיקיית המקור\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "הגדרת '%s' ל־'%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "במקום ה־0"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "ראשון"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "שני"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "שלישי"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "רביעי"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "חמישי"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "שישי"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d מ'"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "בעוד %d מ'"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d מטרים"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "בעוד %d מטרים"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d קילומטר"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "בעוד  %d.%d קילומטרים"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "קילומטר אחד"
 msgstr[1] "%d קילומטרים"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "בעוד קילומטר אחד"
 msgstr[1] "בעוד %d קילומטרים"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "יציאה"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "אל הרמפה"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sאל תוך ה%s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "ימינה"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "שמאלה"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "מעט "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "בצורה חדה "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "לא ידוע "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "כשיתאפשר לך, פנה חזרה"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "הכנס לכיכר הקרובה"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "ב%s, הכנס לכיכר"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "עזוב את הכיכר ביציאה ה%s"
+msgid "Leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "ואז עזוב את הכיכר ביציאה ה%s"
+msgid "then leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "המשך בדרך זו למשך %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "בקרוב"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "קח את הכביש ה%1$s אל %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "לאחר %i כבישים"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "כעת"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "ואז קח את הכביש ה%1$s אל ה%2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "שגיאה"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "פנה %1$s %2$s %4$s %3$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "ואז פנה %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "הגעת ליעדך %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "ואז הגעת ליעד."
 
-#: ../navit/navit.c:1125
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "מיקום"
 
-#: ../navit/navit.c:1126
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "פקודה"
 
-#: ../navit/navit.c:1130
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "אורך"
 
-#: ../navit/navit.c:1134 ../navit/navit.c:1159
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "ק\"מ"
 
-#: ../navit/navit.c:1138 ../navit/navit.c:1163
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "מ'"
 
-#: ../navit/navit.c:1144
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "זמן"
 
-#: ../navit/navit.c:1156
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "מרחק ליעד"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "זמן ליעד"
 
-#: ../navit/navit.c:1202 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "הוראות נסיעה"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "קבע כמיקום נוכחי"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "קבע כיעד"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "צור סימניה למקום זה"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "נקודה 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "קואורדינטת מסך: %d %d"
@@ -1547,7 +1575,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2729
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "ארץ"
 
@@ -1558,9 +1586,9 @@ msgstr "דואר"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2737
-#: ../navit/gui/internal/gui_internal.c:2870
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "עיירה"
 
@@ -1571,8 +1599,8 @@ msgstr "מחוז"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2689
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "רחוב"
 
@@ -1596,7 +1624,7 @@ msgstr "עיר"
 msgid "District/Township"
 msgstr "מחוז/איזור העיר"
 
-#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "מפה"
 
@@ -1604,93 +1632,97 @@ msgstr "מפה"
 msgid "Bookmark"
 msgstr "סימניה"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "יעד"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2791
-#: ../navit/gui/internal/gui_internal.c:3084
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "תצוגה"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "מסלול"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "יעדים קודמים"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2846
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "סימניות"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2748
-#: ../navit/gui/internal/gui_internal.c:2793
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "מערך"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "תכנון"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:3027
-#: ../navit/gui/internal/gui_internal.c:3092
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "רכב (ׂGPS)"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "התרחק"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "התקרב"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "חשב מחדש"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "מידע"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "עצור ניווט"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "בדיקה"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_יציאה"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "סמן"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "הנעל על הדרך"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:3066
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "הצפנה"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2803
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "מסך מלא"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "מידע"
 
@@ -1739,12 +1771,12 @@ msgid "No"
 msgstr "לא"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "דו-מימד"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2816
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "תלת מימד"
 
@@ -1761,70 +1793,70 @@ msgstr "נשארו עוד %4.0f ק\"מ, זמן הגעה משוער %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "מסלול 0000ק\"מ 0+00:00 זמן הגעה משוער"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "חזור למפה"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "תפריט ראשי"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "עזרה"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "חזרה"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "נ\"צ"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "רחובות"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "צפה בדפדפן אינטרנט"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "צפה בתכונות"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "צפה במפה"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "סימנייה %s"
 
-#: ../navit/gui/internal/gui_internal.c:2798
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "מצב חלון"
 
-#: ../navit/gui/internal/gui_internal.c:2844
-#: ../navit/gui/internal/gui_internal.c:3132
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "פעולות"
 
-#: ../navit/gui/internal/gui_internal.c:2855
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "נקודה במפה"
 
-#: ../navit/gui/internal/gui_internal.c:2865
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "מיקום רכב"
 
-#: ../navit/gui/internal/gui_internal.c:2874
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../navit/gui/internal/gui_internal.c:2880
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1832,54 +1864,54 @@ msgstr ""
 "עצור\n"
 "ניווט"
 
-#: ../navit/gui/internal/gui_internal.c:2896
-#: ../navit/gui/internal/gui_internal.c:3088
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "מפות"
 
-#: ../navit/gui/internal/gui_internal.c:2940
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "הצגת מצב הלוויינים"
 
-#: ../navit/gui/internal/gui_internal.c:2974
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "הצגת נתוני NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2998
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "הגדרה כפעיל"
 
-#: ../navit/gui/internal/gui_internal.c:3004
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "הצגת מצב הלוויינים"
 
-#: ../navit/gui/internal/gui_internal.c:3010
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "הצגת נתוני NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3052
-#: ../navit/gui/internal/gui_internal.c:3096
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "כללים"
 
-#: ../navit/gui/internal/gui_internal.c:3060
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "נעול על הדרך"
 
-#: ../navit/gui/internal/gui_internal.c:3072
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "מפה עוקבת אחר הרכב"
 
-#: ../navit/gui/internal/gui_internal.c:3082
-#: ../navit/gui/internal/gui_internal.c:3140
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ../navit/gui/internal/gui_internal.c:3130
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "תפריט ראשי"
 
-#: ../navit/gui/internal/gui_internal.c:3136
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1887,7 +1919,7 @@ msgstr ""
 "הצגת\n"
 "מפה"
 
-#: ../navit/gui/internal/gui_internal.c:3143
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "כלים"
 
@@ -1935,3 +1967,11 @@ msgstr "כלים"
 #~ "Running from source directory. Bookmarks, center and destinations will be "
 #~ "r/w from this directory\n"
 #~ msgstr "פועל מספריית המקור. סימניות, מרכז ויעדים יקראו/יכתבו במקום זה.\n"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "עזוב את הכיכר ביציאה ה%s"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "ואז עזוב את הכיכר ביציאה ה%s"
diff --git a/po/hu.po.in b/po/hu.po.in
index 8a6c0ea6b..a3a5a0dd3 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-10-19 21:40+0000\n"
 "Last-Translator: WintermuteHun <wintermute@valodi.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr "Futtatás a forráskönyvtárból\n"
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "%s %s beállítása\n"
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "%d m múlva"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d méter"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "%d méter múlva"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilométer"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d.%d kilométer múlva"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "egy kilométer"
 msgstr[1] "%d kilométer"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "egy kilométer múlva"
 msgstr[1] "%d kilométer múlva"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "kijárat"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s a(z) %s%s%s utcába"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s a(z) %s%s%s utcába"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s a(z) %s%s%s utcába"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s a(z) %s%s%s utcába"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "jobbra"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "balra"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "enyhén "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "erősen "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "ismeretlen "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Ha lehet, fordujon meg"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Haladjon az úton a következő %sig"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "hamarosan"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "most"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "hiba"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Fordulj %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Érkezés a célhoz %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Parancs"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Hossz"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Idő"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Távolság a céltól"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Menetidő"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Útvonalak"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Pozicionálás"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Uticél megjelölése"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Könyvjelző hozzáadása"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Pont 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Koordináták: %d %d"
@@ -1525,8 +1574,8 @@ msgstr "Iso2"
 msgid "Iso3"
 msgstr "Iso3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Ország"
 
@@ -1537,9 +1586,9 @@ msgstr "Postai"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Település"
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr "Kerület"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Utca"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Szám"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Célpont megadása"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Irányítószám"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Város"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Kerület/Környék"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Térkép"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Könyvjelző"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Cél"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Mutat"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Útvonal"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Előzmények"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Könyvjelzők"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Elrendezés"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Vetület"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Jármű"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Távolít"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Közelít"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Újratervezés"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Információk"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Navigálás vége"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Teszt"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Mutató"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Rögzítés az úton"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Adat"
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,95 +1793,129 @@ msgstr "Út hossza %4.0fkm Becsült menetidő %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Út hossza 0000km Becsült menetidő 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/id.po.in b/po/id.po.in
index c1de81a06..c79963dec 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"Project-Id-Version: navit 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-09-16 00:04+0000\n"
 "Last-Translator: Joel-apobae.com <amanda2000@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr ""
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "keluar"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "kanan"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "Kiri"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "dengan mudah "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "tidak diketahui "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "bila memungkinkan, balik arah"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "segera"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "saat ini"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "kesalahan"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "anda telah sampai pada tujuan %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr ""
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr ""
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr ""
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr ""
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1525,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr ""
 
@@ -1537,9 +1586,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr ""
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,94 +1793,128 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
diff --git a/po/it.po.in b/po/it.po.in
index 030b14d97..efd03b8ef 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-03-01 20:51+0000\n"
-"Last-Translator: ernia <monghitri@aruba.it>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-27 10:46+0000\n"
+"Last-Translator: MeltingShell <Unknown>\n"
 "Language-Team: Italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,276 +30,304 @@ msgstr "Esecuzione dalla cartella di compilazione\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "impostazione di '%s' a '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "zeresimo"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "primo"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "secondo"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "terzo"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "quarto"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "quinto"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "sesto"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "prima uscita"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "seconda uscita"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "terza uscita"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "quarta uscita"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "quinta uscita"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sesta uscita"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "fra %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metri"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "fra %d metri"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d chilometri"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "fra %d,%d chilometri"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un chilometro"
 msgstr[1] "%d chilometri"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "fra un chilometro"
 msgstr[1] "fra %d chilometri"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "esci"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "nella rampa"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sin %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sin %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "destra"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "sinistra"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "leggermente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "decisamente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "facendo quasi inversione "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Appena possibile, invertire il senso di marcia"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Entrare in rotatoria"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Tra %s entrare nella rotonda"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "lasciare la rotatoria alla %s uscita"
+msgid "Leave the roundabout at the %s"
+msgstr "Alla rotonda prendere l'uscita %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "poi lasciare la rotatoria alla %s uscita"
+msgid "then leave the roundabout at the %s"
+msgstr "e alla rotonda prendere l'uscita %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Seguire la strada per i prossimi %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "tra poco"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prendere la %1$s strada a %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "tra %i roads"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "adesso"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "poi prendere la %1$s strada a %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "errore"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Svoltare %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "poi girare %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Destinazione raggiunta %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "poi sarete arrivati a destinazione"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Posizione"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Indicazione"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Distanza"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tempo"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Distanza all'arrivo"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Tempo all'arrivo"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Quaderno di viaggio"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Imposta come posizione"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Imposta come destinazione"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Aggiungi come segnalibro"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punto 0x%x, 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordinate schermo: %d, %d"
@@ -1548,7 +1576,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Stato"
 
@@ -1559,9 +1587,9 @@ msgstr "Postale"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Centro abitato"
 
@@ -1572,8 +1600,8 @@ msgstr "Regione"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Via"
 
@@ -1610,8 +1638,8 @@ msgid "Destination"
 msgstr "Destinazione"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Visualizza"
 
@@ -1624,14 +1652,14 @@ msgid "Former Destinations"
 msgstr "Destinazioni precedenti"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Layout"
 
@@ -1640,8 +1668,8 @@ msgid "Projection"
 msgstr "Proiezione"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Veicolo"
 
@@ -1682,16 +1710,16 @@ msgid "Lock on Road"
 msgstr "Prosegui su questa strada"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Visione verso nord"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr ""
+msgstr "Zoom automatico"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
@@ -1744,12 +1772,12 @@ msgid "No"
 msgstr "No"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1766,129 +1794,131 @@ msgstr "Percorso %4.0f km, %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Percorso 0000 km, 00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Torna alla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Menù principale"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
-msgstr ""
+msgstr "Aiuto"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
-msgstr ""
+msgstr "Indietro"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "Punti d'interesse"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Strade"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Visualizza nel browser"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Visualizza attributi"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Visualizza sulla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Segnalibro %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Modalità finestre"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Punto sulla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Posizione del veicolo"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Esci"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr "Stop"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Mappe"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
-msgstr ""
+msgstr "Mostra stato satellite"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
-msgstr ""
+msgstr "Mostra dati NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
-msgstr ""
+msgstr "Imposta come attivo"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
-msgstr ""
+msgstr "Mostra stato satellite"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
-msgstr ""
+msgstr "Mostra dati NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Regole"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Blocca sulla strada"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "La mappa segue il veicolo"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Menù principale"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
+"Mostra\n"
+"Mappa"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Strumenti"
 
@@ -1950,3 +1980,11 @@ msgstr "Strumenti"
 
 #~ msgid "Turn %1$s%2$s %3$s into %4$s"
 #~ msgstr "%3$s svoltare %1$sa %2$s in %4$s"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "lasciare la rotatoria alla %s uscita"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "poi lasciare la rotatoria alla %s uscita"
diff --git a/po/ja.po.in b/po/ja.po.in
index 5e478a535..cfcffb2a7 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-09-12 05:04+0000\n"
 "Last-Translator: MontBlanc <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d メートル"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d キロメートル"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr ""
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "右"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "左"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr ""
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "まもなく"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "今"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr ""
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "目的地の%sにつきました"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "コマンド"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr ""
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "現在地として設定"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "目的地として設定"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1525,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "国"
 
@@ -1537,9 +1586,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr ""
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "目的地を入力"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "郵便番号"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "地図"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "ブックマーク"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "目的地"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "ルート"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "前の目的地"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "ズームアウト"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "ズームイン"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "再計算"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "案内中止"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "テスト"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "全画面表示"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,95 +1793,129 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/lt.po.in b/po/lt.po.in
index ee063a925..9ccd1a2f3 100644
--- a/po/lt.po.in
+++ b/po/lt.po.in
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: Launchpad\n"
-"POT-Creation-Date: 2009-01-15 09:53+0100\n"
-"PO-Revision-Date: 2009-02-09 16:56+0000\n"
+"Project-Id-Version: navit 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-12 14:45+0000\n"
 "Last-Translator: laimonas <laimonas.mockus@gmail.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
-"X-Launchpad-Export-Date: 2009-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,65 +30,93 @@ msgstr "Paleidžiu pradiniame kataloge\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nustatau '%s' į '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "nulinis"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "pirmas"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "antras"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "trečias"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "ketvirtas"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "penktas"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "šeštas"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "už %d m"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metrai"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "už %d metrų"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometrai"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "už %d.%d kilometrų"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -96,7 +124,7 @@ msgstr[0] "%d kilometras"
 msgstr[1] "%d kilometrai"
 msgstr[2] "%d kilometrai"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -104,204 +132,204 @@ msgstr[0] "už %d kilometro"
 msgstr[1] "už %d kilometrų"
 msgstr[2] "už %d kilometrų"
 
-#: ../navit/navigation.c:1205
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "išvažiavimas"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "į rampą"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1237
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s į gatvę %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1241
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s į %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1245
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s į %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1249
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s į %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1256
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s į %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "dešinėn"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "kairėn"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "lengvai "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "stipriai "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "nežinomas "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "kai įmanoma, apsisukite"
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Netrukus įsukite į žiedą"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Už %s, įsukite į žiedą"
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "%s išvažiavime išsukite iš žiedo"
+msgid "Leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "tada %s išvažiavime išsukite iš žiedo"
+msgid "then leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Laikykitės kelio sekančius %s"
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "netrukus"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "dabar"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1420
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr ""
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1450
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1453
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr ""
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr ""
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr ""
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr ""
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1549,8 +1577,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr ""
 
@@ -1561,9 +1589,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr ""
 
@@ -1573,127 +1601,131 @@ msgid "District"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1742,12 +1774,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1764,94 +1796,136 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "%s išvažiavime išsukite iš žiedo"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "tada %s išvažiavime išsukite iš žiedo"
diff --git a/po/nb.po.in b/po/nb.po.in
index 54fdf80ea..8ed70cf3a 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -8,277 +8,326 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
-"PO-Revision-Date: 2008-08-27 16:21+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-24 01:01+0000\n"
+"Last-Translator: Kenneth Langdalen <Unknown>\n"
 "Language-Team: Bendik Brenne <bendik@xplore.nu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr "Kjører fra kildemappa\n"
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "setter '%s' til '%s'\n"
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
-msgstr ""
+msgstr "første"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
-msgstr ""
+msgstr "andre"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
-msgstr ""
+msgstr "tredje"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
-msgstr ""
+msgstr "fjerde"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
-msgstr ""
+msgstr "femte"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
+msgstr "sjette"
+
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "første avkjøring"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "andre avkjøring"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "tredje avkjøring"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "fjerde avkjøring"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "femte avkjøring"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sjette avkjøring"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "om %d meter"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "om %d meter"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilometer"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "om %d,%d kilometer"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "én kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om én kilometer"
 msgstr[1] "om %d kilometer"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr ""
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "høyre"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "venstre"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "slakt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "skarpt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "ukjent "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Snu, om det er mulig"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1434
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Følg veien de neste %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "snart"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nå"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "feil"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du har nådd ditt reisemål %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Instruks"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Avstand"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tid"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Avstand til målet"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Tid til målet"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Kjørebok"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Sett som posisjon"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Sett som destinasjon"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Legg til som bokmerke"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skjerm koord: %d %d"
@@ -1526,8 +1575,8 @@ msgstr "Iso2"
 msgid "Iso3"
 msgstr "Iso3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Land"
 
@@ -1538,9 +1587,9 @@ msgstr "Post"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "By"
 
@@ -1550,127 +1599,131 @@ msgid "District"
 msgstr "Distrikt/Kommune"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Gate"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Nummer"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Oppgi reisemålet"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "By"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Distrikt/Kommune"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Kart"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Bokmerke"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Destinasjon"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Display"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Rute"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Tidligere reisemål"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Layout"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projeksjon"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Kjøretøy"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "ZoomUt"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "ZoomInn"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Info"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Test"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "Avslutt"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Markør"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Data"
 
@@ -1716,17 +1769,17 @@ msgstr "NV"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
-msgstr ""
+msgstr "Nei"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
-msgstr ""
+msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:78
 msgid "OT"
@@ -1741,95 +1794,131 @@ msgstr "Rute %4.0fkm    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rute 0000km  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr "Hjelp"
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
+msgstr "Kart"
+
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
-msgid "Rules"
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
+msgid "Rules"
+msgstr "Regler"
+
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
+msgstr "Hovedmeny"
+
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Vis\n"
+"Kart"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/nds.po.in b/po/nds.po.in
new file mode 100644
index 000000000..7922050c6
--- /dev/null
+++ b/po/nds.po.in
@@ -0,0 +1,1924 @@
+# German, Low translation for navit
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the navit package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: navit\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-04-06 10:31+0000\n"
+"Last-Translator: Roschkor <Unknown>\n"
+"Language-Team: German, Low <nds@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
+
+#: ../navit/main.c:231
+#, c-format
+msgid "Running from source directory\n"
+msgstr "Aus dem Quellverzeichins starten\n"
+
+#: ../navit/main.c:263
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr "%s zu %s setzen\n"
+
+#: ../navit/navigation.c:240
+msgid "zeroth"
+msgstr "diese"
+
+#: ../navit/navigation.c:242
+msgid "first"
+msgstr "erste"
+
+#: ../navit/navigation.c:244
+msgid "second"
+msgstr "zweite"
+
+#: ../navit/navigation.c:246
+msgid "third"
+msgstr "dritte"
+
+#: ../navit/navigation.c:248
+msgid "fourth"
+msgstr "vierte"
+
+#: ../navit/navigation.c:250
+msgid "fifth"
+msgstr "fünfte"
+
+#: ../navit/navigation.c:252
+msgid "sixth"
+msgstr "sechste"
+
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "diese Ausfahrt"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "erste Ausfahrt"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "zweite Ausfahrt"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "dritte Ausfahrt"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "vierte Ausfahrt"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "fünfte Ausfahrt"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sechste Ausfahrt"
+
+#: ../navit/navigation.c:316
+#, c-format
+msgid "%d m"
+msgstr "%d m"
+
+#: ../navit/navigation.c:318
+#, c-format
+msgid "in %d m"
+msgstr "in %d m"
+
+#: ../navit/navigation.c:322
+#, c-format
+msgid "%d meters"
+msgstr "%d Meter"
+
+#: ../navit/navigation.c:324
+#, c-format
+msgid "in %d meters"
+msgstr "in %d Metern"
+
+#: ../navit/navigation.c:330
+#, c-format
+msgid "%d.%d kilometer"
+msgstr "%d %d Kilometer"
+
+#: ../navit/navigation.c:332
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "in %d %d Kilometern"
+
+#: ../navit/navigation.c:336
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "ein Kilometer"
+msgstr[1] "%d Kilometer"
+
+#: ../navit/navigation.c:338
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "in einem Kilometer"
+msgstr[1] "in %d Kilometern"
+
+#: ../navit/navigation.c:1268
+msgid "exit"
+msgstr "Ausfahrt"
+
+#: ../navit/navigation.c:1270
+msgid "into the ramp"
+msgstr "auf die Auffahrt"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#: ../navit/navigation.c:1300
+#, c-format
+msgid "%sinto the street %s%s%s"
+msgstr "%s in die Straße %s %s %s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1304
+#, c-format
+msgid "%sinto the %s%s%s|male form"
+msgstr "%s in den %s%s%s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1308
+#, c-format
+msgid "%sinto the %s%s%s|female form"
+msgstr "%s in die %s%s%s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1312
+#, c-format
+msgid "%sinto the %s%s%s|neutral form"
+msgstr "%s in das %s%s%s"
+
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1319
+#, c-format
+msgid "%sinto the %s"
+msgstr "%s in die %s"
+
+#. TRANSLATORS: right, as in 'Turn right'
+#: ../navit/navigation.c:1340
+msgid "right"
+msgstr "Rechts"
+
+#. TRANSLATORS: left, as in 'Turn left'
+#: ../navit/navigation.c:1379
+msgid "left"
+msgstr "Links"
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1386
+msgid "easily "
+msgstr "einfach "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1391
+msgid "strongly "
+msgstr "dringend "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1395
+msgid "unknown "
+msgstr "unbekannt "
+
+#: ../navit/navigation.c:1402
+msgid "When possible, please turn around"
+msgstr "Wenn möglich, bitte wenden"
+
+#: ../navit/navigation.c:1412
+msgid "Enter the roundabout soon"
+msgstr "In Kürze in den Kreisverkehr einfahren"
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr "In %s, in den Kreisverkehr einfahren"
+
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Den Kreisverkehr an der %s verlassen"
+
+#: ../navit/navigation.c:1434
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "dann den Kreisverkehr an der %s verlassen"
+
+#: ../navit/navigation.c:1444
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Der Straße %s folgen"
+
+#: ../navit/navigation.c:1448
+msgid "soon"
+msgstr "in Kürze"
+
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1458
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Die %1$s Straße zur %2$s nehmen"
+
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#, c-format
+msgid "after %i roads"
+msgstr "nach %i Straßen"
+
+#: ../navit/navigation.c:1464
+msgid "now"
+msgstr "jetzt"
+
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "Dann die %1$s Straße zur %2$s nehmen"
+
+#: ../navit/navigation.c:1483
+msgid "error"
+msgstr "Fehler"
+
+#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
+#: ../navit/navigation.c:1513
+#, c-format
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "In %3$s %1$s%2$s %4$s abbiegen"
+
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "Sie haben Ihr Ziel erreicht %s"
+
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr "Dann haben Sie Ihr Ziel erreicht"
+
+#: ../navit/navit.c:1142
+msgid "Position"
+msgstr "Position"
+
+#: ../navit/navit.c:1143
+msgid "Command"
+msgstr "Kommando"
+
+#: ../navit/navit.c:1147
+msgid "Length"
+msgstr "Länge"
+
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
+msgid "km"
+msgstr "km"
+
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
+msgid "m"
+msgstr "m"
+
+#: ../navit/navit.c:1161
+msgid "Time"
+msgstr "Zeit"
+
+#: ../navit/navit.c:1173
+msgid "Destination Length"
+msgstr "Fahrstrecke"
+
+#: ../navit/navit.c:1186
+msgid "Destination Time"
+msgstr "Fahrzeit"
+
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
+msgid "Roadbook"
+msgstr "Straßenatlas"
+
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
+msgid "Set as position"
+msgstr "Als Position setzen"
+
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
+msgid "Set as destination"
+msgstr "Als Ziel setzen"
+
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
+msgid "Add as bookmark"
+msgstr "Als Lesezeichen hinzufügen"
+
+#: ../navit/popup.c:282
+#, c-format
+msgid "Point 0x%x 0x%x"
+msgstr "Punkt 0x%x 0x%x"
+
+#: ../navit/popup.c:283
+#, c-format
+msgid "Screen coord : %d %d"
+msgstr "Koordinaten der Anzeige: %d %d"
+
+#. 020
+#: ../navit/country.c:39
+msgid "Andorra"
+msgstr "Andorra"
+
+#. 784
+#: ../navit/country.c:40
+msgid "United Arab Emirates"
+msgstr "Vereinigte Arabische Emirate"
+
+#. 004
+#: ../navit/country.c:41
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#. 028
+#: ../navit/country.c:42
+msgid "Antigua and Barbuda"
+msgstr "Antigua und Barbados"
+
+#. 660
+#: ../navit/country.c:43
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#. 008
+#: ../navit/country.c:44
+msgid "Albania"
+msgstr "Albanien"
+
+#. 051
+#: ../navit/country.c:45
+msgid "Armenia"
+msgstr "Armenien"
+
+#. 530
+#: ../navit/country.c:46
+msgid "Netherlands Antilles"
+msgstr "Niederländische Antillen"
+
+#. 024
+#: ../navit/country.c:47
+msgid "Angola"
+msgstr "Angola"
+
+#. 010
+#: ../navit/country.c:48
+msgid "Antarctica"
+msgstr "Antarktis"
+
+#. 032
+#: ../navit/country.c:49
+msgid "Argentina"
+msgstr "Argentinien"
+
+#. 016
+#: ../navit/country.c:50
+msgid "American Samoa"
+msgstr "Amerikanisch Samoa"
+
+#. 040
+#: ../navit/country.c:51
+msgid "Austria"
+msgstr "Österreich"
+
+#. 036
+#: ../navit/country.c:52
+msgid "Australia"
+msgstr "Australien"
+
+#. 533
+#: ../navit/country.c:53
+msgid "Aruba"
+msgstr "Aruba"
+
+#. 248
+#: ../navit/country.c:54
+msgid "Aland Islands"
+msgstr "Åland"
+
+#. 031
+#: ../navit/country.c:55
+msgid "Azerbaijan"
+msgstr "Aserbaidschan"
+
+#. 070
+#: ../navit/country.c:56
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnien und Herzegowina"
+
+#. 052
+#: ../navit/country.c:57
+msgid "Barbados"
+msgstr "Barbados"
+
+#. 050
+#: ../navit/country.c:58
+msgid "Bangladesh"
+msgstr "Bangladesch"
+
+#. 056
+#: ../navit/country.c:59
+msgid "Belgium"
+msgstr "Belgien"
+
+#. 854
+#: ../navit/country.c:60
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#. 100
+#: ../navit/country.c:61
+msgid "Bulgaria"
+msgstr "Bulgarien"
+
+#. 048
+#: ../navit/country.c:62
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#. 108
+#: ../navit/country.c:63
+msgid "Burundi"
+msgstr "Burundi"
+
+#. 204
+#: ../navit/country.c:64
+msgid "Benin"
+msgstr "Benin"
+
+#. 652
+#: ../navit/country.c:65
+msgid "Saint Barthelemy"
+msgstr "Sankt Bartholomäus"
+
+#. 060
+#: ../navit/country.c:66
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#. 096
+#: ../navit/country.c:67
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+#. 068
+#: ../navit/country.c:68
+msgid "Bolivia"
+msgstr "Bolivien"
+
+#. 076
+#: ../navit/country.c:69
+msgid "Brazil"
+msgstr "Brasilien"
+
+#. 044
+#: ../navit/country.c:70
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#. 064
+#: ../navit/country.c:71
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#. 074
+#: ../navit/country.c:72
+msgid "Bouvet Island"
+msgstr "Insel Bouvet"
+
+#. 072
+#: ../navit/country.c:73
+msgid "Botswana"
+msgstr "Botswana"
+
+#. 112
+#: ../navit/country.c:74
+msgid "Belarus"
+msgstr "Weißrussland"
+
+#. 084
+#: ../navit/country.c:75
+msgid "Belize"
+msgstr "Belize"
+
+#. 124
+#: ../navit/country.c:76
+msgid "Canada"
+msgstr "Kanada"
+
+#. 166
+#: ../navit/country.c:77
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokos Inseln"
+
+#. 180
+#: ../navit/country.c:78
+msgid "Congo, Democratic Republic of the"
+msgstr "Demokratische Republik Kongo"
+
+#. 140
+#: ../navit/country.c:79
+msgid "Central African Republic"
+msgstr "Zentralafrikanische Republik"
+
+#. 178
+#: ../navit/country.c:80
+msgid "Congo"
+msgstr "Kongo"
+
+#. 756
+#: ../navit/country.c:81
+msgid "Switzerland"
+msgstr "Schweiz"
+
+#. 384
+#: ../navit/country.c:82
+msgid "Cote d'Ivoire"
+msgstr "Elfenbeinküste"
+
+#. 184
+#: ../navit/country.c:83
+msgid "Cook Islands"
+msgstr "Insel Cook"
+
+#. 152
+#: ../navit/country.c:84
+msgid "Chile"
+msgstr "Chile"
+
+#. 120
+#: ../navit/country.c:85
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#. 156
+#: ../navit/country.c:86
+msgid "China"
+msgstr "China"
+
+#. 170
+#: ../navit/country.c:87
+msgid "Colombia"
+msgstr "Kolumbien"
+
+#. 188
+#: ../navit/country.c:88
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#. 192
+#: ../navit/country.c:89
+msgid "Cuba"
+msgstr "Kuba"
+
+#. 132
+#: ../navit/country.c:90
+msgid "Cape Verde"
+msgstr "Kap Verde"
+
+#. 162
+#: ../navit/country.c:91
+msgid "Christmas Island"
+msgstr "Weihnachtsinsel"
+
+#. 196
+#: ../navit/country.c:92
+msgid "Cyprus"
+msgstr "Zypern"
+
+#. 203
+#: ../navit/country.c:93
+msgid "Czech Republic"
+msgstr "Tschechische Republik"
+
+#. 276
+#: ../navit/country.c:94
+msgid "Germany"
+msgstr "Deutschland"
+
+#. 262
+#: ../navit/country.c:95
+msgid "Djibouti"
+msgstr "Dschibuti"
+
+#. 208
+#: ../navit/country.c:96
+msgid "Denmark"
+msgstr "Dänemark"
+
+#. 212
+#: ../navit/country.c:97
+msgid "Dominica"
+msgstr "Dominika"
+
+#. 214
+#: ../navit/country.c:98
+msgid "Dominican Republic"
+msgstr "Dominikanische Republik"
+
+#. 012
+#: ../navit/country.c:99
+msgid "Algeria"
+msgstr "Algerien"
+
+#. 218
+#: ../navit/country.c:100
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#. 233
+#: ../navit/country.c:101
+msgid "Estonia"
+msgstr "Estland"
+
+#. 818
+#: ../navit/country.c:102
+msgid "Egypt"
+msgstr "Ägypten"
+
+#. 732
+#: ../navit/country.c:103
+msgid "Western Sahara"
+msgstr "Westsahara"
+
+#. 232
+#: ../navit/country.c:104
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#. 724
+#: ../navit/country.c:105
+msgid "Spain"
+msgstr "Spanien"
+
+#. 231
+#: ../navit/country.c:106
+msgid "Ethiopia"
+msgstr "Äthiopien"
+
+#. 246
+#: ../navit/country.c:107
+msgid "Finland"
+msgstr "Finnland"
+
+#. 242
+#: ../navit/country.c:108
+msgid "Fiji"
+msgstr "Fidschi"
+
+#. 238
+#: ../navit/country.c:109
+msgid "Falkland Islands (Malvinas)"
+msgstr "Falkland Inseln"
+
+#. 583
+#: ../navit/country.c:110
+msgid "Micronesia, Federated States of"
+msgstr "Mikronesien"
+
+#. 234
+#: ../navit/country.c:111
+msgid "Faroe Islands"
+msgstr "Färöer Inseln"
+
+#. 250
+#: ../navit/country.c:112
+msgid "France"
+msgstr "Frankreich"
+
+#. 266
+#: ../navit/country.c:113
+msgid "Gabon"
+msgstr "Gabun"
+
+#. 826
+#: ../navit/country.c:114
+msgid "United Kingdom"
+msgstr "Vereinigtes Königreich"
+
+#. 308
+#: ../navit/country.c:115
+msgid "Grenada"
+msgstr "Grenada"
+
+#. 268
+#: ../navit/country.c:116
+msgid "Georgia"
+msgstr "Georgien"
+
+#. 254
+#: ../navit/country.c:117
+msgid "French Guiana"
+msgstr "Französisch Guyana"
+
+#. 831
+#: ../navit/country.c:118
+msgid "Guernsey"
+msgstr "Guernsey"
+
+#. 288
+#: ../navit/country.c:119
+msgid "Ghana"
+msgstr "Ghana"
+
+#. 292
+#: ../navit/country.c:120
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#. 304
+#: ../navit/country.c:121
+msgid "Greenland"
+msgstr "Grönland"
+
+#. 270
+#: ../navit/country.c:122
+msgid "Gambia"
+msgstr "Gambia"
+
+#. 324
+#: ../navit/country.c:123
+msgid "Guinea"
+msgstr "Guinea"
+
+#. 312
+#: ../navit/country.c:124
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#. 226
+#: ../navit/country.c:125
+msgid "Equatorial Guinea"
+msgstr "Äquatorial Guinea"
+
+#. 300
+#: ../navit/country.c:126
+msgid "Greece"
+msgstr "Griechenland"
+
+#. 239
+#: ../navit/country.c:127
+msgid "South Georgia and the South Sandwich Islands"
+msgstr "Südgeorgien und die Südlichen Sandwichinseln"
+
+#. 320
+#: ../navit/country.c:128
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#. 316
+#: ../navit/country.c:129
+msgid "Guam"
+msgstr "Guam"
+
+#. 624
+#: ../navit/country.c:130
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
+
+#. 328
+#: ../navit/country.c:131
+msgid "Guyana"
+msgstr "Guyana"
+
+#. 344
+#: ../navit/country.c:132
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#. 334
+#: ../navit/country.c:133
+msgid "Heard Island and McDonald Islands"
+msgstr "Heard Insel und die McDonaldinseln"
+
+#. 340
+#: ../navit/country.c:134
+msgid "Honduras"
+msgstr "Honduras"
+
+#. 191
+#: ../navit/country.c:135
+msgid "Croatia"
+msgstr "Kroatien"
+
+#. 332
+#: ../navit/country.c:136
+msgid "Haiti"
+msgstr "Haiti"
+
+#. 348
+#: ../navit/country.c:137
+msgid "Hungary"
+msgstr "Ungarn"
+
+#. 360
+#: ../navit/country.c:138
+msgid "Indonesia"
+msgstr "Indonesien"
+
+#. 372
+#: ../navit/country.c:139
+msgid "Ireland"
+msgstr "Irland"
+
+#. 376
+#: ../navit/country.c:140
+msgid "Israel"
+msgstr "Israel"
+
+#. 833
+#: ../navit/country.c:141
+msgid "Isle of Man"
+msgstr "Isle of Man"
+
+#. 356
+#: ../navit/country.c:142
+msgid "India"
+msgstr "Indien"
+
+#. 086
+#: ../navit/country.c:143
+msgid "British Indian Ocean Territory"
+msgstr "Britisches Territorium im Indischen Ozean"
+
+#. 368
+#: ../navit/country.c:144
+msgid "Iraq"
+msgstr "Irak"
+
+#. 364
+#: ../navit/country.c:145
+msgid "Iran, Islamic Republic of"
+msgstr "Iran"
+
+#. 352
+#: ../navit/country.c:146
+msgid "Iceland"
+msgstr "Island"
+
+#. 380
+#: ../navit/country.c:147
+msgid "Italy"
+msgstr "Italien"
+
+#. 832
+#: ../navit/country.c:148
+msgid "Jersey"
+msgstr "Jersey"
+
+#. 388
+#: ../navit/country.c:149
+msgid "Jamaica"
+msgstr "Jamaika"
+
+#. 400
+#: ../navit/country.c:150
+msgid "Jordan"
+msgstr "Jordanien"
+
+#. 392
+#: ../navit/country.c:151
+msgid "Japan"
+msgstr "Japan"
+
+#. 404
+#: ../navit/country.c:152
+msgid "Kenya"
+msgstr "Kenia"
+
+#. 417
+#: ../navit/country.c:153
+msgid "Kyrgyzstan"
+msgstr "Kirgisien"
+
+#. 116
+#: ../navit/country.c:154
+msgid "Cambodia"
+msgstr "Kambodscha"
+
+#. 296
+#: ../navit/country.c:155
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#. 174
+#: ../navit/country.c:156
+msgid "Comoros"
+msgstr "Komoren"
+
+#. 659
+#: ../navit/country.c:157
+msgid "Saint Kitts and Nevis"
+msgstr "St. Kitts und Nevis"
+
+#. 408
+#: ../navit/country.c:158
+msgid "Korea, Democratic People's Republic of"
+msgstr "Nordkorea"
+
+#. 410
+#: ../navit/country.c:159
+msgid "Korea, Republic of"
+msgstr "Südkorea"
+
+#. 414
+#: ../navit/country.c:160
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#. 136
+#: ../navit/country.c:161
+msgid "Cayman Islands"
+msgstr "Kaiman-Inseln"
+
+#. 398
+#: ../navit/country.c:162
+msgid "Kazakhstan"
+msgstr "Kasachstan"
+
+#. 418
+#: ../navit/country.c:163
+msgid "Lao People's Democratic Republic"
+msgstr "Laos"
+
+#. 422
+#: ../navit/country.c:164
+msgid "Lebanon"
+msgstr "Libanon"
+
+#. 662
+#: ../navit/country.c:165
+msgid "Saint Lucia"
+msgstr "St. Lucia"
+
+#. 438
+#: ../navit/country.c:166
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#. 144
+#: ../navit/country.c:167
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#. 430
+#: ../navit/country.c:168
+msgid "Liberia"
+msgstr "Liberia"
+
+#. 426
+#: ../navit/country.c:169
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#. 440
+#: ../navit/country.c:170
+msgid "Lithuania"
+msgstr "Litauen"
+
+#. 442
+#: ../navit/country.c:171
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+#. 428
+#: ../navit/country.c:172
+msgid "Latvia"
+msgstr "Lettland"
+
+#. 434
+#: ../navit/country.c:173
+msgid "Libyan Arab Jamahiriya"
+msgstr "Libyen"
+
+#. 504
+#: ../navit/country.c:174
+msgid "Morocco"
+msgstr "Marokko"
+
+#. 492
+#: ../navit/country.c:175
+msgid "Monaco"
+msgstr "Monaco"
+
+#. 498
+#: ../navit/country.c:176
+msgid "Moldova, Republic of"
+msgstr "Republik Moldau"
+
+#. 499
+#: ../navit/country.c:177
+msgid "Montenegro"
+msgstr "Montenegro"
+
+#. 663
+#: ../navit/country.c:178
+msgid "Saint Martin (French part)"
+msgstr "St. Martin"
+
+#. 450
+#: ../navit/country.c:179
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#. 584
+#: ../navit/country.c:180
+msgid "Marshall Islands"
+msgstr "Marshallinseln"
+
+#. 807
+#: ../navit/country.c:181
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr "Mazedonien"
+
+#. 466
+#: ../navit/country.c:182
+msgid "Mali"
+msgstr "Mali"
+
+#. 104
+#: ../navit/country.c:183
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#. 496
+#: ../navit/country.c:184
+msgid "Mongolia"
+msgstr "Mongolei"
+
+#. 446
+#: ../navit/country.c:185
+msgid "Macao"
+msgstr "Macao"
+
+#. 580
+#: ../navit/country.c:186
+msgid "Northern Mariana Islands"
+msgstr "Nord Mariannen Inseln"
+
+#. 474
+#: ../navit/country.c:187
+msgid "Martinique"
+msgstr "Martinique"
+
+#. 478
+#: ../navit/country.c:188
+msgid "Mauritania"
+msgstr "Mauretanien"
+
+#. 500
+#: ../navit/country.c:189
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#. 470
+#: ../navit/country.c:190
+msgid "Malta"
+msgstr "Malta"
+
+#. 480
+#: ../navit/country.c:191
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#. 462
+#: ../navit/country.c:192
+msgid "Maldives"
+msgstr "Malediven"
+
+#. 454
+#: ../navit/country.c:193
+msgid "Malawi"
+msgstr "Malawi"
+
+#. 484
+#: ../navit/country.c:194
+msgid "Mexico"
+msgstr "Mexiko"
+
+#. 458
+#: ../navit/country.c:195
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#. 508
+#: ../navit/country.c:196
+msgid "Mozambique"
+msgstr "Mosambik"
+
+#. 516
+#: ../navit/country.c:197
+msgid "Namibia"
+msgstr "Namibia"
+
+#. 540
+#: ../navit/country.c:198
+msgid "New Caledonia"
+msgstr "Neukaledonien"
+
+#. 562
+#: ../navit/country.c:199
+msgid "Niger"
+msgstr "Niger"
+
+#. 574
+#: ../navit/country.c:200
+msgid "Norfolk Island"
+msgstr "Norfolkinsel"
+
+#. 566
+#: ../navit/country.c:201
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#. 558
+#: ../navit/country.c:202
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#. 528
+#: ../navit/country.c:203
+msgid "Netherlands"
+msgstr "Niederlande"
+
+#. 578
+#: ../navit/country.c:204
+msgid "Norway"
+msgstr "Norwegen"
+
+#. 524
+#: ../navit/country.c:205
+msgid "Nepal"
+msgstr "Nepal"
+
+#. 520
+#: ../navit/country.c:206
+msgid "Nauru"
+msgstr "Nauru"
+
+#. 570
+#: ../navit/country.c:207
+msgid "Niue"
+msgstr "Niue"
+
+#. 554
+#: ../navit/country.c:208
+msgid "New Zealand"
+msgstr "Neuseeland"
+
+#. 512
+#: ../navit/country.c:209
+msgid "Oman"
+msgstr "Oman"
+
+#. 591
+#: ../navit/country.c:210
+msgid "Panama"
+msgstr "Panama"
+
+#. 604
+#: ../navit/country.c:211
+msgid "Peru"
+msgstr "Peru"
+
+#. 258
+#: ../navit/country.c:212
+msgid "French Polynesia"
+msgstr "Französisch Polynesien"
+
+#. 598
+#: ../navit/country.c:213
+msgid "Papua New Guinea"
+msgstr "Papua Neu Guinea"
+
+#. 608
+#: ../navit/country.c:214
+msgid "Philippines"
+msgstr "Phillippinen"
+
+#. 586
+#: ../navit/country.c:215
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#. 616
+#: ../navit/country.c:216
+msgid "Poland"
+msgstr "Polen"
+
+#. 666
+#: ../navit/country.c:217
+msgid "Saint Pierre and Miquelon"
+msgstr "St.-Pierre und Miquelon"
+
+#. 612
+#: ../navit/country.c:218
+msgid "Pitcairn"
+msgstr "Pitcairninseln"
+
+#. 630
+#: ../navit/country.c:219
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#. 275
+#: ../navit/country.c:220
+msgid "Palestinian Territory, Occupied"
+msgstr "Palästina"
+
+#. 620
+#: ../navit/country.c:221
+msgid "Portugal"
+msgstr "Portugal"
+
+#. 585
+#: ../navit/country.c:222
+msgid "Palau"
+msgstr "Palau"
+
+#. 600
+#: ../navit/country.c:223
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#. 634
+#: ../navit/country.c:224
+msgid "Qatar"
+msgstr "Katar"
+
+#. 638
+#: ../navit/country.c:225
+msgid "Reunion"
+msgstr "Reunion"
+
+#. 642
+#: ../navit/country.c:226
+msgid "Romania"
+msgstr "Rumänien"
+
+#. 688
+#: ../navit/country.c:227
+msgid "Serbia"
+msgstr "Serbien"
+
+#. 643
+#: ../navit/country.c:228
+msgid "Russian Federation"
+msgstr "Russland"
+
+#. 646
+#: ../navit/country.c:229
+msgid "Rwanda"
+msgstr "Ruanda"
+
+#. 682
+#: ../navit/country.c:230
+msgid "Saudi Arabia"
+msgstr "Saudi Arabien"
+
+#. 090
+#: ../navit/country.c:231
+msgid "Solomon Islands"
+msgstr "Salomonen"
+
+#. 690
+#: ../navit/country.c:232
+msgid "Seychelles"
+msgstr "Seychellen"
+
+#. 736
+#: ../navit/country.c:233
+msgid "Sudan"
+msgstr "Sudan"
+
+#. 752
+#: ../navit/country.c:234
+msgid "Sweden"
+msgstr "Schweden"
+
+#. 702
+#: ../navit/country.c:235
+msgid "Singapore"
+msgstr "Singapur"
+
+#. 654
+#: ../navit/country.c:236
+msgid "Saint Helena"
+msgstr "St. Helena"
+
+#. 705
+#: ../navit/country.c:237
+msgid "Slovenia"
+msgstr "Slowenien"
+
+#. 744
+#: ../navit/country.c:238
+msgid "Svalbard and Jan Mayen"
+msgstr "Svalbard und Jan Mayen"
+
+#. 703
+#: ../navit/country.c:239
+msgid "Slovakia"
+msgstr "Slowakei"
+
+#. 694
+#: ../navit/country.c:240
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#. 674
+#: ../navit/country.c:241
+msgid "San Marino"
+msgstr "San Marino"
+
+#. 686
+#: ../navit/country.c:242
+msgid "Senegal"
+msgstr "Senegal"
+
+#. 706
+#: ../navit/country.c:243
+msgid "Somalia"
+msgstr "Somalia"
+
+#. 740
+#: ../navit/country.c:244
+msgid "Suriname"
+msgstr "Surinam"
+
+#. 678
+#: ../navit/country.c:245
+msgid "Sao Tome and Principe"
+msgstr "Sao Tome and Principe"
+
+#. 222
+#: ../navit/country.c:246
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#. 760
+#: ../navit/country.c:247
+msgid "Syrian Arab Republic"
+msgstr "Syrien"
+
+#. 748
+#: ../navit/country.c:248
+msgid "Swaziland"
+msgstr "Swasiland"
+
+#. 796
+#: ../navit/country.c:249
+msgid "Turks and Caicos Islands"
+msgstr "Turks- und Caicosinseln"
+
+#. 148
+#: ../navit/country.c:250
+msgid "Chad"
+msgstr "Tschad"
+
+#. 260
+#: ../navit/country.c:251
+msgid "French Southern Territories"
+msgstr "Französische Süd- und Antarktisgebiete"
+
+#. 768
+#: ../navit/country.c:252
+msgid "Togo"
+msgstr "Togo"
+
+#. 764
+#: ../navit/country.c:253
+msgid "Thailand"
+msgstr "Thailand"
+
+#. 762
+#: ../navit/country.c:254
+msgid "Tajikistan"
+msgstr "Tadschikistan"
+
+#. 772
+#: ../navit/country.c:255
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#. 626
+#: ../navit/country.c:256
+msgid "Timor-Leste"
+msgstr "Osttimor"
+
+#. 795
+#: ../navit/country.c:257
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#. 788
+#: ../navit/country.c:258
+msgid "Tunisia"
+msgstr "Tunesien"
+
+#. 776
+#: ../navit/country.c:259
+msgid "Tonga"
+msgstr "Tonga"
+
+#. 792
+#: ../navit/country.c:260
+msgid "Turkey"
+msgstr "Türkei"
+
+#. 780
+#: ../navit/country.c:261
+msgid "Trinidad and Tobago"
+msgstr "Trinidad und Tobago"
+
+#. 798
+#: ../navit/country.c:262
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#. 158
+#: ../navit/country.c:263
+msgid "Taiwan, Province of China"
+msgstr "Taiwan"
+
+#. 834
+#: ../navit/country.c:264
+msgid "Tanzania, United Republic of"
+msgstr "Tansania"
+
+#. 804
+#: ../navit/country.c:265
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#. 800
+#: ../navit/country.c:266
+msgid "Uganda"
+msgstr "Uganda"
+
+#. 581
+#: ../navit/country.c:267
+msgid "United States Minor Outlying Islands"
+msgstr "Amerikanisch-Ozeanien"
+
+#. 840
+#: ../navit/country.c:268
+msgid "United States"
+msgstr "USA"
+
+#. 858
+#: ../navit/country.c:269
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#. 860
+#: ../navit/country.c:270
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#. 336
+#: ../navit/country.c:271
+msgid "Holy See (Vatican City State)"
+msgstr "Vatikanstadt"
+
+#. 670
+#: ../navit/country.c:272
+msgid "Saint Vincent and the Grenadines"
+msgstr "St. Vincent und die Grenadinen"
+
+#. 862
+#: ../navit/country.c:273
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#. 092
+#: ../navit/country.c:274
+msgid "Virgin Islands, British"
+msgstr "Britische Jungferninseln"
+
+#. 850
+#: ../navit/country.c:275
+msgid "Virgin Islands, U.S."
+msgstr "Amerikanische Jungferninseln"
+
+#. 704
+#: ../navit/country.c:276
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#. 548
+#: ../navit/country.c:277
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#. 876
+#: ../navit/country.c:278
+msgid "Wallis and Futuna"
+msgstr "Wallis und Futuna"
+
+#. 882
+#: ../navit/country.c:279
+msgid "Samoa"
+msgstr "Samoa"
+
+#. 887
+#: ../navit/country.c:280
+msgid "Yemen"
+msgstr "Jemen"
+
+#. 175
+#: ../navit/country.c:281
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#. 710
+#: ../navit/country.c:282
+msgid "South Africa"
+msgstr "Südafrika"
+
+#. 894
+#: ../navit/country.c:283
+msgid "Zambia"
+msgstr "Sambia"
+
+#. 716
+#: ../navit/country.c:284
+msgid "Zimbabwe"
+msgstr "Simbabwe"
+
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:119
+#: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
+msgid "Car"
+msgstr "Auto"
+
+#: ../navit/gui/gtk/destination.c:118
+msgid "Iso2"
+msgstr "Iso2"
+
+#: ../navit/gui/gtk/destination.c:118
+msgid "Iso3"
+msgstr "Iso3"
+
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
+msgid "Country"
+msgstr "Land"
+
+#: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
+#: ../navit/gui/gtk/destination.c:121
+msgid "Postal"
+msgstr "Postanschrift"
+
+#: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
+#: ../navit/gui/gtk/destination.c:121
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
+msgid "Town"
+msgstr "Stadt"
+
+#: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
+#: ../navit/gui/gtk/destination.c:121
+msgid "District"
+msgstr "Bezirk"
+
+#: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
+msgid "Street"
+msgstr "Straße"
+
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
+msgid "Number"
+msgstr "Nummer"
+
+#: ../navit/gui/gtk/destination.c:420
+msgid "Enter Destination"
+msgstr "Reiseziel eingeben"
+
+#: ../navit/gui/gtk/destination.c:429
+msgid "Zip Code"
+msgstr "Postleitzahl"
+
+#: ../navit/gui/gtk/destination.c:431
+msgid "City"
+msgstr "Stadt"
+
+#: ../navit/gui/gtk/destination.c:434
+msgid "District/Township"
+msgstr "Ortsteil/Gemeinde"
+
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
+msgid "Map"
+msgstr "Karte"
+
+#: ../navit/gui/gtk/destination.c:463
+msgid "Bookmark"
+msgstr "Lesezeichen"
+
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
+msgid "Destination"
+msgstr "Reiseziel"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
+msgid "Display"
+msgstr "Anzeige"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:197
+msgid "Route"
+msgstr "Route"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:198
+msgid "Former Destinations"
+msgstr "Vorherige Ziele"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
+msgid "Bookmarks"
+msgstr "Lesezeichen"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
+msgid "Layout"
+msgstr "Erscheinungsbild"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:202
+msgid "Projection"
+msgstr "Darstellung"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
+msgid "Vehicle"
+msgstr "Fahrzeug"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:204
+msgid "ZoomOut"
+msgstr "Verkleinern"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:205
+msgid "ZoomIn"
+msgstr "Vergrößern"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:206
+msgid "Recalculate"
+msgstr "Neu berechnen"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
+msgid "Info"
+msgstr "Information"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:213
+msgid "Stop Navigation"
+msgstr "Navigation beenden"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:214
+msgid "Test"
+msgstr "Test"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:215
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:222
+msgid "Cursor"
+msgstr "Zeiger"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:223
+msgid "Lock on Road"
+msgstr "Auf Straße zeigen"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
+msgid "Northing"
+msgstr "Einnorden"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "automatischer Zoom"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
+msgid "Fullscreen"
+msgstr "Vollbild"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:238
+msgid "Data"
+msgstr "Daten"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "N"
+msgstr "N"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "NE"
+msgstr "NO"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "E"
+msgstr "O"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "SE"
+msgstr "SO"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "S"
+msgstr "S"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "SW"
+msgstr "SW"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "W"
+msgstr "W"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "NW"
+msgstr "NW"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
+msgid "No"
+msgstr "Nein"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
+#: ../navit/gui/internal/gui_internal.c:2829
+msgid "2D"
+msgstr "2D"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
+#: ../navit/gui/internal/gui_internal.c:2835
+msgid "3D"
+msgstr "3D"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr "OT"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
+#, c-format
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr "Route %4.0fkm    %02d:%02d ETA"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
+msgid "Route 0000km  0+00:00 ETA"
+msgstr "Route 0000km 0+00:00 ETA"
+
+#: ../navit/gui/internal/gui_internal.c:1322
+msgid "Back to map"
+msgstr "Zurück zur Karte"
+
+#: ../navit/gui/internal/gui_internal.c:1331
+msgid "Main Menu"
+msgstr "Hauptmenü"
+
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr "Zurück"
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
+msgid "POIs"
+msgstr "POI"
+
+#: ../navit/gui/internal/gui_internal.c:2067
+msgid "Streets"
+msgstr "Straßen"
+
+#: ../navit/gui/internal/gui_internal.c:2083
+msgid "View in Browser"
+msgstr "Im Browser anzeigen"
+
+#: ../navit/gui/internal/gui_internal.c:2089
+msgid "View Attributes"
+msgstr "Attribute anzeigen"
+
+#: ../navit/gui/internal/gui_internal.c:2124
+msgid "View on map"
+msgstr "Auf der Karte zeigen"
+
+#: ../navit/gui/internal/gui_internal.c:2237
+#, c-format
+msgid "Bookmark %s"
+msgstr "Lesezeichen %s"
+
+#: ../navit/gui/internal/gui_internal.c:2817
+msgid "Window Mode"
+msgstr "Fenstermodus"
+
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
+msgid "Actions"
+msgstr "Aktionen"
+
+#: ../navit/gui/internal/gui_internal.c:2874
+msgid "Map Point"
+msgstr "Kartenpunkt"
+
+#: ../navit/gui/internal/gui_internal.c:2884
+msgid "Vehicle Position"
+msgstr "Fahrzeugposition"
+
+#: ../navit/gui/internal/gui_internal.c:2893
+msgid "Quit"
+msgstr "Beenden"
+
+#: ../navit/gui/internal/gui_internal.c:2899
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Navigation\n"
+"beenden"
+
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
+msgid "Maps"
+msgstr "Karten"
+
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr "Satellitenstatus anzeigen"
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr "zeige NMEA Daten"
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr "Als Aktiv setzen"
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr "Satellitenstatus anzeigen"
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr "NMEA Daten anzeigen"
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
+msgid "Rules"
+msgstr "Regeln"
+
+#: ../navit/gui/internal/gui_internal.c:3079
+msgid "Lock on road"
+msgstr "Auf Straße zeigen"
+
+#: ../navit/gui/internal/gui_internal.c:3091
+msgid "Map follows Vehicle"
+msgstr "Karte folgt Fahrzeug"
+
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../navit/gui/internal/gui_internal.c:3149
+msgid "Main menu"
+msgstr "Hauptmenü"
+
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Karte\n"
+"anzeigen"
+
+#: ../navit/gui/internal/gui_internal.c:3162
+msgid "Tools"
+msgstr "Werkzeuge"
diff --git a/po/nl.po.in b/po/nl.po.in
index 8e274bbba..fc3a28d34 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-03-01 12:54+0000\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-22 20:53+0000\n"
 "Last-Translator: Ed Kapitein <Unknown>\n"
 "Language-Team: afaber\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,277 +29,305 @@ msgstr "Gestart vanuit de bron directory\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setting '%s' naar '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "nulde"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "eerste"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "tweede"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "derde"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "vierde"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "vijfde"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "zesde"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "eerste afslag"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "eerste afslag"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "derde afslag"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "vierde afslag"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "vijfde afslag"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "zesde afslag"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilometer"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "na %d,%d kilometer"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "een kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "na één kilometer"
 msgstr[1] "in %d kilometer"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "afslag"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "naar de afslag"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sin de straat %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sin de %s%s%s|mannelijke vorm"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sin de %s%s%s|vrouwelijke vorm"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sin de %s%s%s|neutrale vorm"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%snaar de %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "rechts"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "flauw "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "scherp "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "niet bekend "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Indien mogelijk omkeren"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "U rijdt zodadelijk de rotonde op"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Neem de rotonde over %s"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Verlaat de rotonde op de %s uitrit"
+msgid "Leave the roundabout at the %s"
+msgstr "verlaat de rotonde bij de %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "verlaat daarna de rotonde op de %s uitrit"
+msgid "then leave the roundabout at the %s"
+msgstr "daarna de rotonde verlaten bij de %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Weg volgen voor %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "binnenkort"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem de %1$s straat naar %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "na %i wegen"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "neem daarna de %1$s weg naar %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "error"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Ga %3$s %1$s naar %2$s %4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "ga na %3$s wegen %1$s  %2$s  naar %4$s"
 
 # over 200 meter links aanhouden
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s bestemming bereikt"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "daarna bent u op uw besteming"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Positie"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Opdracht"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Lengte"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tijd"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Afstand"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Aankomsttijd"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Route"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Zet als positie"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Zet als bestemming"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Opnemen als bladwijzer"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Scherm %d %d"
@@ -1549,7 +1577,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Land"
 
@@ -1561,9 +1589,9 @@ msgstr "Postcode"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Plaats"
 
@@ -1575,8 +1603,8 @@ msgstr "District"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Straat"
 
@@ -1614,8 +1642,8 @@ msgid "Destination"
 msgstr "Bestemming"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Tonen"
 
@@ -1628,14 +1656,14 @@ msgid "Former Destinations"
 msgstr "Vorige bestemmingen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Opmaak"
 
@@ -1644,8 +1672,8 @@ msgid "Projection"
 msgstr "Projectie"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Voertuig"
 
@@ -1686,16 +1714,16 @@ msgid "Lock on Road"
 msgstr "houd de weg aan"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Kaart richting"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr ""
+msgstr "automatisch vergroten/verkleinen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Beeldvullend"
 
@@ -1748,12 +1776,12 @@ msgid "No"
 msgstr "Nee"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1770,70 +1798,70 @@ msgstr "Route %4.0fkm    %02d:%02d Aankomsttijd"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Route 0000km  0+00:00 Aankomsttijd"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Terug naar de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Hoofdmenu"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
-msgstr ""
+msgstr "Hulp"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "bezienswaardigheden"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "straten"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "bekijk in browser"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "bekijk eigenschappen"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "bekijk op de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "favoriet %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Venstermodus"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Acties"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "punt op de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "voortuig positie"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1841,60 +1869,60 @@ msgstr ""
 "stop\n"
 "navigatie"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Kaarten"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "activeren"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Regels"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "volg de weg"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "kaart volgt voertuig"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Hoofdmenu"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Gereedschappen"
 
@@ -1904,3 +1932,11 @@ msgstr "Gereedschappen"
 #, c-format
 #~ msgid "into the %s"
 #~ msgstr "in de %s"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Verlaat de rotonde op de %s uitrit"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "verlaat daarna de rotonde op de %s uitrit"
diff --git a/po/pl.po.in b/po/pl.po.in
index a16b9cdc9..f0b1b423a 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2009-03-06 20:51+0000\n"
 "Last-Translator: skrzat <Unknown>\n"
 "Language-Team: Translators\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
@@ -32,65 +32,93 @@ msgstr "Uruchamiam z katalogu źródłowego\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ustawiam '%s' na '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "zerowy"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "pierwszy"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "drugi"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "trzeci"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "czwarty"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "piąty"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "szósty"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d metrów"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "za %d metrów"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metrów"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "za %d metrów"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometra"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrów"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -98,7 +126,7 @@ msgstr[0] "jeden kilometr"
 msgstr[1] "%d kilometr"
 msgstr[2] "%d kilometr"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -106,204 +134,204 @@ msgstr[0] "za kilometr"
 msgstr[1] "%d kilometr"
 msgstr[2] "%d kilometr"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "zjazd"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "na wjazd"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s w ulicę %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sw %s%s%s|male form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sw %s%s%s|female form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sw %s%s%s|neutral form"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s na / w %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "w prawo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "w lewo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "lekko "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "silnie "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "nieznane "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Zawróc, gdy będzie to możliwe"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Wjazd na rondo wkrótce"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Wjedź na rondo za %s"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Opuść rondo, %s zjazd"
+msgid "Leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "następnie opuść rondo %s zjazd"
+msgid "then leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Jedź tą drogą %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "wkrótce"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Jedź %1$s drogą w %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "%i skrzyżowanie"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "teraz"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "następnie jedź %1$s drogą w %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "błąd"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Skręć %1$s%2$s %4$s %3$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "następnie skręć %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dotarłeś do celu %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "następnie dojechałeś do celu."
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Położenie"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Polecenie"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Odległość"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Czas"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Odległość do celu"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Czas do celu"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Szczegóły trasy"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Ustaw jako pozycję"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Ustaw jako cel"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Dodaj jako zakładkę"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Współrzędne ekranu: %d %d"
@@ -1552,7 +1580,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Państwo"
 
@@ -1563,9 +1591,9 @@ msgstr "Kod Pocztowy"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Miasto"
 
@@ -1576,8 +1604,8 @@ msgstr "Dzielnica/Okręg miejski"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Ulica"
 
@@ -1614,8 +1642,8 @@ msgid "Destination"
 msgstr "Cel"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Pokaż"
 
@@ -1628,14 +1656,14 @@ msgid "Former Destinations"
 msgstr "Poprzednie cele"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Zakładki"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Układ kolorów"
 
@@ -1644,8 +1672,8 @@ msgid "Projection"
 msgstr "Odwzorowanie"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Pojazd"
 
@@ -1686,7 +1714,7 @@ msgid "Lock on Road"
 msgstr "Trzymaj się drogi"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Północ zawsze na górze"
 
@@ -1695,7 +1723,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
@@ -1748,12 +1776,12 @@ msgid "No"
 msgstr "Nie"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2W"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3W"
 
@@ -1770,70 +1798,70 @@ msgstr "Trasa %4.0fkm    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Trasa 0000km  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Wróć do mapy"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Menu główne"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Wróć"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "Użyteczne miejsca"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Zobacz w przeglądarce"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Zobacz właściwości"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Zakładka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Tryb Widoku"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Akcje"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Punkt na mapie"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Pozycja pojazdu"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1841,54 +1869,54 @@ msgstr ""
 "Przerwij\n"
 "nawigację"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "Pokaż status satelitów"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "Pokaż dane NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "Ustaw jako aktywny"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "Pokaż status satelitów"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "Pokaż dane NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Reguły"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Trzymaj się drogi"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Wyśrodkuj mapę"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Menu główne"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1896,7 +1924,7 @@ msgstr ""
 "Pokaż\n"
 "mapę"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Narzędzia"
 
@@ -1906,3 +1934,11 @@ msgstr "Narzędzia"
 #, c-format
 #~ msgid "into the %s"
 #~ msgstr "w %s"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Opuść rondo, %s zjazd"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "następnie opuść rondo %s zjazd"
diff --git a/po/pt.po.in b/po/pt.po.in
index 9cf5e11ff..ee2195528 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-03-08 14:58+0000\n"
-"Last-Translator: Joel Patrão <joel.patrao@gmail.com>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-29 22:55+0000\n"
+"Last-Translator: Diogo Lavareda <diogolavareda9@hotmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,276 +29,304 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr "ajuste '%s' to '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "primeiro"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "segundo"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "terceiro"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "quarto"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
-msgstr ""
+msgstr "quinta"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "sexto"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "primeira saida"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "segunda saida"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "terceira saida"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "quarta saida"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "quinta saida"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sexta saida"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "em %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "em %d metros"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d quilómetros"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "em %d.%d quilómetros"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "um quilḿetro"
 msgstr[1] "%d quilómetros"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "em um quilómetro"
 msgstr[1] "em %d quilómetros"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "sair"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "na subida"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%spara a rua %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sna %s%s%s|formulário masculino"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sna %s%s%s|formulário feminino"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sna %s%s%s|formulário neutral"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "direita"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "esquerda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "facilmente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "veementemente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "desconhecido "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Quando for possível"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr ""
+msgid "Leave the roundabout at the %s"
+msgstr "Deixe a rotunda na %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr ""
+msgid "then leave the roundabout at the %s"
+msgstr "depois deixe a rotunda na %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga a estrada para a próxima %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "logo"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
-msgstr ""
+msgstr "Apanhe a %1$s estrada para %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
-msgstr ""
+msgstr "depois de %i estradas"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "agora"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "depois apanhe a %1$s estrada para %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "erro"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Vire %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "depois vire á %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Você chegou ao seu destino %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
-msgstr ""
+msgstr "depois chegou ao seu destino"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Posição"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Executar comandos"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Duração"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tempo"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Duração Destino"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Tempo Destino"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Roadbook"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Definir como posição"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Definir como destino"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Adicionar como marcador"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Ponto 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordenada da tela: %d %d"
@@ -1547,7 +1575,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "País"
 
@@ -1558,9 +1586,9 @@ msgstr "Postal"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Cidade"
 
@@ -1571,8 +1599,8 @@ msgstr "Distrito"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Rua"
 
@@ -1609,8 +1637,8 @@ msgid "Destination"
 msgstr "Destino"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Exibir"
 
@@ -1623,14 +1651,14 @@ msgid "Former Destinations"
 msgstr "Anteriores Destinos"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Marcadores"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Esquema"
 
@@ -1639,8 +1667,8 @@ msgid "Projection"
 msgstr "Projecção"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Veículo"
 
@@ -1681,16 +1709,16 @@ msgid "Lock on Road"
 msgstr "Bloqueio na estrada"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Norte"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr ""
+msgstr "Zoom Automático"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Ecrã Inteiro"
 
@@ -1743,12 +1771,12 @@ msgid "No"
 msgstr "Não"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1765,129 +1793,133 @@ msgstr "Rota %4.0fkm %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rota 0000km 0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Voltar ao mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
-msgstr ""
+msgstr "Menu Principal"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Voltar"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Ruas"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Ver Atributos"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
-msgstr ""
+msgstr "Marcador %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
-msgstr ""
+msgstr "Modo de Janela"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Acções"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Posição do Veículo"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Sair"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
+"Parar\n"
+"Navegação"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
-msgstr ""
+msgstr "Mostrar Estado do Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
-msgstr ""
+msgstr "Mostrar Dados NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
-msgstr ""
+msgstr "Definir como activo"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
-msgstr ""
+msgstr "Mostrar estado do Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
-msgstr ""
+msgstr "Mostrar dados NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
-msgstr ""
+msgstr "Regras"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
-msgstr ""
+msgstr "Definições"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
-msgstr ""
+msgstr "Menu Principal"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
+"Mostrar\n"
+"Mapa"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Ferramentas"
 
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index a25ff2b48..d24e24920 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -6,278 +6,327 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-08-27 17:47+0000\n"
-"Last-Translator: Paulohm\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr ""
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "em %d metros"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometros"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "em %d.%d kilometros"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "um kilometro"
 msgstr[1] "%d kilometros"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "em um kilometro"
 msgstr[1] "em %d kilometros"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "saída"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr ""
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "esquerda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "facilmente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "desconhecido "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "retorne assim que possivel"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "em breve"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "agora"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "erro"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr ""
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr ""
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1525,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr ""
 
@@ -1537,9 +1586,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr ""
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,95 +1793,129 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/ro.po.in b/po/ro.po.in
index 4bbc47fb3..726d801d1 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-03-12 14:11+0100\n"
-"PO-Revision-Date: 2009-02-27 11:00+0000\n"
-"Last-Translator: Eddy Petrisor <eddy.petrisor@gmail.com>\n"
+"PO-Revision-Date: 2009-03-22 04:55+0000\n"
+"Last-Translator: Daniel Ursache Dogariu <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2009-03-12 22:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 #: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
-msgstr ""
+msgstr "Rulează din directorul sursă\n"
 
 #: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
-msgstr "se configurează „%s” ls „%s”\n"
+msgstr "se setează „%s” ca „%s”\n"
 
 #: ../navit/navigation.c:240
 msgid "zeroth"
-msgstr ""
+msgstr "zero"
 
 #: ../navit/navigation.c:242
 msgid "first"
@@ -60,31 +60,31 @@ msgstr "a șasea"
 
 #: ../navit/navigation.c:263
 msgid "zeroth exit"
-msgstr ""
+msgstr "ieșirea zero"
 
 #: ../navit/navigation.c:265
 msgid "first exit"
-msgstr ""
+msgstr "prima ieșire"
 
 #: ../navit/navigation.c:267
 msgid "second exit"
-msgstr ""
+msgstr "a doua ieșire"
 
 #: ../navit/navigation.c:269
 msgid "third exit"
-msgstr ""
+msgstr "a treia ieșire"
 
 #: ../navit/navigation.c:271
 msgid "fourth exit"
-msgstr ""
+msgstr "a patra ieșire"
 
 #: ../navit/navigation.c:273
 msgid "fifth exit"
-msgstr ""
+msgstr "a cincea ieșire"
 
 #: ../navit/navigation.c:275
 msgid "sixth exit"
-msgstr ""
+msgstr "a șasea ieșire"
 
 #: ../navit/navigation.c:316
 #, c-format
@@ -168,7 +168,7 @@ msgstr "%s pe %s%s%s"
 #: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
-msgstr ""
+msgstr "%s spre %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
 #: ../navit/navigation.c:1340
@@ -197,11 +197,11 @@ msgstr "necunoscut "
 
 #: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
-msgstr "Când este posibil, vă rog să vă întoarceţi"
+msgstr "Când este posibil, întoarceţi"
 
 #: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
-msgstr ""
+msgstr "Intrați în curând în giratoriu"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #: ../navit/navigation.c:1416
@@ -212,12 +212,12 @@ msgstr "În %s, intrați în sensul giratoriu"
 #: ../navit/navigation.c:1431
 #, c-format
 msgid "Leave the roundabout at the %s"
-msgstr ""
+msgstr "Ieșiți din giratoriu la %s"
 
 #: ../navit/navigation.c:1434
 #, c-format
 msgid "then leave the roundabout at the %s"
-msgstr ""
+msgstr "apoi ieșiți din giratoriu la %s"
 
 #: ../navit/navigation.c:1444
 #, c-format
@@ -246,7 +246,7 @@ msgstr "acum"
 #: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr "apoi luați-o %2s pe %1s stradă"
+msgstr "apoi faceți %2s pe %1s stradă"
 
 #: ../navit/navigation.c:1483
 msgid "error"
@@ -256,13 +256,13 @@ msgstr "eroare"
 #: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Virează %1$s%2$s %3$s%4$s"
+msgstr "Virați %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
 #: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "apoi virați %1$s%2$s %3$s%4$s"
 
 #: ../navit/navigation.c:1521
 #, c-format
@@ -1598,7 +1598,7 @@ msgstr "Oraş"
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
 msgid "District"
-msgstr "District"
+msgstr "Cartier"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
@@ -1613,11 +1613,11 @@ msgstr "Număr"
 
 #: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
-msgstr "Introdu destinaţia"
+msgstr "Introduceți destinaţia"
 
 #: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
-msgstr "Cod poştal"
+msgstr "Cod poștal"
 
 #: ../navit/gui/gtk/destination.c:431
 msgid "City"
@@ -1625,7 +1625,7 @@ msgstr "Oraș"
 
 #: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
-msgstr "District/Reşedinţă"
+msgstr "District/Reședință"
 
 #: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
@@ -1651,7 +1651,7 @@ msgstr "Traseu"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
-msgstr "Destinaţii anterioare"
+msgstr "Destinații anterioare"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
 #: ../navit/gui/internal/gui_internal.c:2201
@@ -1663,11 +1663,11 @@ msgstr "Semne de carte"
 #: ../navit/gui/internal/gui_internal.c:2767
 #: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
-msgstr "Faţetă"
+msgstr "Dispunere"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
-msgstr "Proiecţie"
+msgstr "Proiecție"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
 #: ../navit/gui/internal/gui_internal.c:3046
@@ -1689,11 +1689,11 @@ msgstr "Recalculează"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
-msgstr "Informaţii"
+msgstr "Informații"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
-msgstr "Opreşte Navigarea"
+msgstr "Oprește navigarea"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
@@ -1701,7 +1701,7 @@ msgstr "Testează"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
-msgstr "_Ieşire"
+msgstr "_Ieșire"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
@@ -1709,7 +1709,7 @@ msgstr "Cursor"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
-msgstr "Fixează Strada"
+msgstr "Fixează strada"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
 #: ../navit/gui/internal/gui_internal.c:3085
@@ -1718,7 +1718,7 @@ msgstr "Nimic"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr ""
+msgstr "Autozoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
 #: ../navit/gui/internal/gui_internal.c:2822
@@ -1771,7 +1771,7 @@ msgstr "NV"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
-msgstr ""
+msgstr "Nu"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
 #: ../navit/gui/internal/gui_internal.c:2829
@@ -1785,16 +1785,16 @@ msgstr "3D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:78
 msgid "OT"
-msgstr ""
+msgstr "Glob"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Ruta %4.0f km sosire la %02d:%02d"
+msgstr "Rută %4.0f km sosire estimată %02d:%02d"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:164
 msgid "Route 0000km  0+00:00 ETA"
-msgstr "Ruta 0000 km sosire la 0+00:00"
+msgstr "Rută 0000 km sosire estimată 0+00:00"
 
 #: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
@@ -1802,20 +1802,20 @@ msgstr "Înapoi la hartă"
 
 #: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
-msgstr ""
+msgstr "Meniu principal"
 
 #: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
-msgstr ""
+msgstr "Ajutor"
 
 #: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
-msgstr ""
+msgstr "Înapoi"
 
 #: ../navit/gui/internal/gui_internal.c:1905
 #: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
-msgstr ""
+msgstr "Puncte de interes"
 
 #: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
@@ -1836,7 +1836,7 @@ msgstr "Arată pe hartă"
 #: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
-msgstr ""
+msgstr "%s ca semn de carte"
 
 #: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
@@ -1849,7 +1849,7 @@ msgstr "Acțiuni"
 
 #: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
-msgstr ""
+msgstr "Locație pe hartă"
 
 #: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
@@ -1865,7 +1865,7 @@ msgid ""
 "Navigation"
 msgstr ""
 "Oprește\n"
-"Navigația"
+"navigația"
 
 #: ../navit/gui/internal/gui_internal.c:2915
 #: ../navit/gui/internal/gui_internal.c:3107
@@ -1899,7 +1899,7 @@ msgstr "Reguli"
 
 #: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
-msgstr "Legat de drum"
+msgstr "Fixează strada"
 
 #: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
@@ -1912,7 +1912,7 @@ msgstr "Configurații"
 
 #: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
-msgstr "Meniul principal"
+msgstr "Meniu principal"
 
 #: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
@@ -1920,7 +1920,7 @@ msgid ""
 "Map"
 msgstr ""
 "Afișează\n"
-"Harta"
+"hartă"
 
 #: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
diff --git a/po/ru.po.in b/po/ru.po.in
index 3c83d11d1..5c2fb4ab9 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2009-03-07 19:28+0000\n"
 "Last-Translator: edilion <Unknown>\n"
 "Language-Team: Rustam T. Usmanov\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,65 +30,93 @@ msgstr "Запуск в исходном каталоге\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "установка '%s' в '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d м"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "через %d м"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d метров"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "через %d метров"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d километр"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "через %d.%d километр(а,ов"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -96,7 +124,7 @@ msgstr[0] "%d километр"
 msgstr[1] "%d километра"
 msgstr[2] "%d километров"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -104,204 +132,204 @@ msgstr[0] "через %d километр"
 msgstr[1] "%d километра"
 msgstr[2] "%d километров"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "съезд"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "направо"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "налево"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "слегка "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "сильно "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "неизвестно "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Развернитесь, пожалуйста, если это возможно"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Двигайтесь по дороге следующие %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "скоро"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "сейчас"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "ошибка"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 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
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Вы прибыли в пункт назначения %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Команда"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Длина"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "км"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "м"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Время"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Дистанция до пункта назначения"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Время до пункта назначения"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Дорожный справочник"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Установить как пункт отправления"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Установить как пункт назначения"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Добавить в закладки"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Точка 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Экран %d %d"
@@ -1550,7 +1578,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Страна"
 
@@ -1561,9 +1589,9 @@ msgstr "Индекс"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Город"
 
@@ -1574,8 +1602,8 @@ msgstr "Район"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Улица"
 
@@ -1612,8 +1640,8 @@ msgid "Destination"
 msgstr "Пункт назначения"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Дисплей"
 
@@ -1626,14 +1654,14 @@ msgid "Former Destinations"
 msgstr "Прошлые пункты назначения"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Закладки"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Схема"
 
@@ -1642,8 +1670,8 @@ msgid "Projection"
 msgstr "Проекция"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Т/с"
 
@@ -1684,7 +1712,7 @@ msgid "Lock on Road"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
@@ -1693,7 +1721,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Во весь экран"
 
@@ -1746,12 +1774,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1768,129 +1796,129 @@ msgstr "Маршрут %4.0fкм    %02d:%02d РВП"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Маршрут 0000км  0+00:00 РВП"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/sk.po.in b/po/sk.po.in
index 07f082dd2..61ffa1164 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
-"PO-Revision-Date: 2009-03-05 08:06+0000\n"
-"Last-Translator: kayle.sk <webmaster@kayle.sk>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-30 08:40+0000\n"
+"Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovenčina\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -27,67 +27,95 @@ msgstr "Beží zo zdrojového adresára\n"
 #: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
-msgstr "nastavujem '%s' na '%s'\n"
+msgstr "nastavuje sa „%s“ na „%s“\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "nultý"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "prvý"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "druhý"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "tretí"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "štvrtý"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "piaty"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "šiesty"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "nultý výjazd"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "prvý výjazd"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "druhý výjazd"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "tretí výjazd"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "štvrtý výjazd"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "piaty výjazd"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "šiesty výjazd"
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "o %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "o %d metrov"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometra"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "o %d.%d kilometrov"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -95,7 +123,7 @@ msgstr[0] "%d kilometrov"
 msgstr[1] "jeden kilometer"
 msgstr[2] "%d kilometre"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -103,204 +131,204 @@ msgstr[0] "o %d kilometrov"
 msgstr[1] "o jeden kilometer"
 msgstr[2] "o %d kilometre"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "výjazd"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s do ulice %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s do %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s do %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s do %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s na %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "vpravo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "vľavo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "mierne "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "prudko "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "neznámy "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Ak to bude možné, prosím, otočte sa"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Vstúpte do kruhového objazdu onedlho"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "O %s vstúpte do kruhového objazdu"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Opustite kruhový objaz na %s výjazde"
+msgid "Leave the roundabout at the %s"
+msgstr "Opustite kruhový objazd na %s"
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "potom opustite kruhový objazd na %s výjazde"
+msgid "then leave the roundabout at the %s"
+msgstr "potom opustite kruhový objazd na %s"
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte naďalej po ceste %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "onedlho"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Choďte %1$s cestou na %2$s"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "po %i cestách"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "teraz"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "potom nasledujte cestu %1$s do %2$s"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "chyba"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Zabočte %1s%2s%3s%4s"
+msgstr "Odbočte %1s%2s%3s%4s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "potom %1$s odbočte %2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dorazili ste do svojho cieľa %s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "potom dosiahnete svoj cieľ cesty"
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Pozícia"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Príkaz"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Cieľová vzdialenosť"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Čas k cieľu"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Plán trasy"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Nastaviť ako pozíciu"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Nastaviť ako cieľ"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Pridať ako záložku"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Bod 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Súradnice obrazovky: %d %d"
@@ -1549,7 +1577,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Krajina"
 
@@ -1560,9 +1588,9 @@ msgstr "PSČ"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Mesto"
 
@@ -1573,8 +1601,8 @@ msgstr "Kraj"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Ulica"
 
@@ -1611,8 +1639,8 @@ msgid "Destination"
 msgstr "Cieľ"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Displej"
 
@@ -1625,14 +1653,14 @@ msgid "Former Destinations"
 msgstr "Predošlé cieľe"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Záložky"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Značenie"
 
@@ -1641,8 +1669,8 @@ msgid "Projection"
 msgstr "Projekcia"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Vozidlo"
 
@@ -1683,7 +1711,7 @@ msgid "Lock on Road"
 msgstr "Uzamknúť na cesty"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Sever vždy hore"
 
@@ -1692,7 +1720,7 @@ msgid "Autozoom"
 msgstr "Automatické zväčšenie"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
@@ -1745,12 +1773,12 @@ msgid "No"
 msgstr "Nie"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1767,70 +1795,70 @@ msgstr "Cesta %4.0fkm    čas %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Cesta 0000km  čas 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Späť na mapu"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Hlavné menu"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr "Späť"
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr "POI"
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Zobraziť v prehliadači"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Zobraziť atribúty"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Zobraziť na mape"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "V okne"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Akcie"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Bod na mape"
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Pozícia vozidla"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1838,54 +1866,54 @@ msgstr ""
 "Zastaviť\n"
 "navigáciu"
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr "Zobraziť stav satelitov"
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr "Zobraziť NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr "Nastaviť ako aktívny"
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr "Zobraziť stav satelitov"
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr "Zobraziť NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Pravidlá"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Prichytiť k ceste"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Hlavné menu"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
@@ -1893,7 +1921,7 @@ msgstr ""
 "Zobraziť\n"
 "mapu"
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Nástroje"
 
@@ -1988,3 +2016,11 @@ msgstr "Nástroje"
 #~ msgstr ""
 #~ "Spustený zo zdrojového adresára. Záložky, poloha a cieľe budú "
 #~ "čítane/zapisované do tohto adresára\n"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Opustite kruhový objaz na %s výjazde"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "potom opustite kruhový objazd na %s výjazde"
diff --git a/po/sl.po.in b/po/sl.po.in
index 7e478fa7b..64990d559 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2009-01-14 16:08+0000\n"
 "Last-Translator: Štefan Baebler <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
-"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,65 +30,93 @@ msgstr "Zagon iz mape z izvorno kodo\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavljam '%s' na '%s'\n"
 
-#: ../navit/navigation.c:224
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "ničt"
 
-#: ../navit/navigation.c:226
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "prv"
 
-#: ../navit/navigation.c:228
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "drug"
 
-#: ../navit/navigation.c:230
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "tretj"
 
-#: ../navit/navigation.c:232
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "četrt"
 
-#: ../navit/navigation.c:234
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "pet"
 
-#: ../navit/navigation.c:236
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "šest"
 
-#: ../navit/navigation.c:278
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:280
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "Čez %d m"
 
-#: ../navit/navigation.c:284
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
-#: ../navit/navigation.c:286
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "Čez %d metrov"
 
-#: ../navit/navigation.c:292
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometrov"
 
-#: ../navit/navigation.c:294
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "Čez %d.%d kilometov"
 
-#: ../navit/navigation.c:298
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -97,7 +125,7 @@ msgstr[1] "%d kilometer"
 msgstr[2] "%d kilometra"
 msgstr[3] "%d kilometri"
 
-#: ../navit/navigation.c:300
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -106,204 +134,204 @@ msgstr[1] "Čez %d kilometer"
 msgstr[2] "Čez %d kilometra"
 msgstr[3] "Čez %d kilometre"
 
-#: ../navit/navigation.c:1228
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "odcep"
 
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1260
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1272
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sna %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1279
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "desno"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "levo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "rahlo "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1351
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "ostro "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1355
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "neznano "
 
-#: ../navit/navigation.c:1362
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Obrnite čim bo to mogoče"
 
-#: ../navit/navigation.c:1372
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr "Kmalu zapeljite v krožišče"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1376
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Čez %s zapeljite v krožišče"
 
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr "Krožišče zapustite pri %sem izvozu"
+msgid "Leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
-msgstr "nato zapustite krožišče pri %sem izvozu"
+msgid "then leave the roundabout at the %s"
+msgstr ""
 
-#: ../navit/navigation.c:1404
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Ostanite na tej cesti naslednjih %s"
 
-#: ../navit/navigation.c:1408
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "kmalu"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1418
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Zavijte na %2$s v %1$so cesto"
 
-#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "čez %i cest"
 
-#: ../navit/navigation.c:1424
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "sedaj"
 
-#: ../navit/navigation.c:1432
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "nato zavijte na %2$s v %1$so cesto"
 
-#: ../navit/navigation.c:1443
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "napaka"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1473
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "%3$s zavijte %1$s%2$s %4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1476
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "nato zavijte %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1481
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s ste na cilju"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr "in ste na cilju."
 
-#: ../navit/navit.c:1141
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Položaj"
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Navodilo"
 
-#: ../navit/navit.c:1146
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Razdalja"
 
-#: ../navit/navit.c:1150 ../navit/navit.c:1175
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1154 ../navit/navit.c:1179
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1160
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1172
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Razdalja do cilja"
 
-#: ../navit/navit.c:1185
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Čas do cilja"
 
-#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Načrt poti"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:2095
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Nastavi kot položaj"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:2091
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Nastavi kot cilj"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:2099
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Dodaj zaznamek"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Točka 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Koordinate zaslona: %d %d"
@@ -1552,7 +1580,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2730
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Država"
 
@@ -1563,9 +1591,9 @@ msgstr "Pošta"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2709
-#: ../navit/gui/internal/gui_internal.c:2738
-#: ../navit/gui/internal/gui_internal.c:2871
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Mesto"
 
@@ -1576,8 +1604,8 @@ msgstr "Regija"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
 #: ../navit/gui/gtk/destination.c:437
-#: ../navit/gui/internal/gui_internal.c:2690
-#: ../navit/gui/internal/gui_internal.c:2699
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Ulica"
 
@@ -1614,8 +1642,8 @@ msgid "Destination"
 msgstr "Cilj"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2792
-#: ../navit/gui/internal/gui_internal.c:3085
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Prikaz"
 
@@ -1628,14 +1656,14 @@ msgid "Former Destinations"
 msgstr "Prejšnji cilji"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2847
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Zaznamki"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2749
-#: ../navit/gui/internal/gui_internal.c:2794
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Razporeditev"
 
@@ -1644,8 +1672,8 @@ msgid "Projection"
 msgstr "Projekcija"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3028
-#: ../navit/gui/internal/gui_internal.c:3093
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Vozilo"
 
@@ -1686,7 +1714,7 @@ msgid "Lock on Road"
 msgstr "Ostani na cesti"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3067
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Sever zgoraj"
 
@@ -1695,7 +1723,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2804
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
@@ -1748,12 +1776,12 @@ msgid "No"
 msgstr "Ne"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2811
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3D"
 
@@ -1770,129 +1798,129 @@ msgstr "Načrt poti %4.0fkm    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Načrt poti 0000km  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1321
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Nazaj na zemljevid"
 
-#: ../navit/gui/internal/gui_internal.c:1330
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Glavni meni"
 
-#: ../navit/gui/internal/gui_internal.c:1450
+#: ../navit/gui/internal/gui_internal.c:1451
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1600
+#: ../navit/gui/internal/gui_internal.c:1601
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1904
-#: ../navit/gui/internal/gui_internal.c:2104
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2061
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Ceste"
 
-#: ../navit/gui/internal/gui_internal.c:2077
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Prikaz v brskalniku"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Prikaz lastnosti"
 
-#: ../navit/gui/internal/gui_internal.c:2118
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: ../navit/gui/internal/gui_internal.c:2231
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Zaznamuj %s"
 
-#: ../navit/gui/internal/gui_internal.c:2799
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Okenski način"
 
-#: ../navit/gui/internal/gui_internal.c:2845
-#: ../navit/gui/internal/gui_internal.c:3133
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Dejanja"
 
-#: ../navit/gui/internal/gui_internal.c:2856
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2866
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Položaj vozila"
 
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Izhod"
 
-#: ../navit/gui/internal/gui_internal.c:2881
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2897
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Zemljevidi"
 
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2959
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2975
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2999
+#: ../navit/gui/internal/gui_internal.c:3017
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3005
+#: ../navit/gui/internal/gui_internal.c:3023
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3011
+#: ../navit/gui/internal/gui_internal.c:3029
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3053
-#: ../navit/gui/internal/gui_internal.c:3097
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr "Pravila"
 
-#: ../navit/gui/internal/gui_internal.c:3061
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr "Prikleni na cesto"
 
-#: ../navit/gui/internal/gui_internal.c:3073
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Zemljevid sledi vozilu"
 
-#: ../navit/gui/internal/gui_internal.c:3083
-#: ../navit/gui/internal/gui_internal.c:3141
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: ../navit/gui/internal/gui_internal.c:3131
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Glavni meni"
 
-#: ../navit/gui/internal/gui_internal.c:3137
+#: ../navit/gui/internal/gui_internal.c:3155
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3144
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Orodja"
 
@@ -1955,3 +1983,11 @@ msgstr "Orodja"
 #~ msgstr ""
 #~ "Zagon iz mape z izvorno kodo. Zaznamki in trenutni položaj bodo shranjeni v "
 #~ "tej mapi.\n"
+
+#, c-format
+#~ msgid "Leave the roundabout at the %s exit"
+#~ msgstr "Krožišče zapustite pri %sem izvozu"
+
+#, c-format
+#~ msgid "then leave the roundabout at the %s exit"
+#~ msgstr "nato zapustite krožišče pri %sem izvozu"
diff --git a/po/sv.po.in b/po/sv.po.in
index bd60937b2..b88c372bd 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -7,277 +7,326 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
-"PO-Revision-Date: 2008-10-28 22:04+0000\n"
-"Last-Translator: Christian Widell <Christian_widell@hotmail.com>\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-03-17 00:59+0000\n"
+"Last-Translator: Squall Leonhart <webmaster@square-one.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr "Körs från källkodsbiblioteket\n"
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "sätter '%s' till '%s'\n"
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
-msgstr ""
+msgstr "första"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
-msgstr ""
+msgstr "andra"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
-msgstr ""
+msgstr "tredje"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
-msgstr ""
+msgstr "fjärde"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
-msgstr ""
+msgstr "femte"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
-msgstr ""
+msgstr "sjätte"
+
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr "ingen avfart"
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr "första avfarten"
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr "andra  avfarten"
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr "tredje avfarten"
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr "fjärde avfarten"
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr "femte avfarten"
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr "sjätte avfarten"
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "i %d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "i %d meter"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometer"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "i %d.%d kilometer"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "en kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om en kilometer"
 msgstr[1] "om %d kilometer"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "avfart"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
-msgstr ""
+msgstr "ut på påfarten"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sin på gatan %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
-msgstr ""
+msgstr "%sav på %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "höger"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "vänster"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "lätt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "brant "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "okänd "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
-msgstr "Vänd om det går"
+msgstr "Vänd när det går"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
-msgstr ""
+msgstr "Kör snart in i rondellen"
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
-msgstr ""
+msgstr "På %s, kör in i rondellen"
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
-msgstr ""
+msgid "Leave the roundabout at the %s"
+msgstr "Kör ut ur rondellen mot %s"
+
+#: ../navit/navigation.c:1434
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "kör sedan ut ur rondellen mot %s"
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Följ vägen till nästa %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "snart"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
-msgstr ""
+msgstr "Ta %1$s vägen till %2$s"
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "ta sedan %1$s vägen till %2$s"
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "fel"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Sväng %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr "sväng sedan %1$s%2$s %3$s%4$s"
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du har nått din destination %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr "sedan har du nått din destination."
+
+#: ../navit/navit.c:1142
 msgid "Position"
-msgstr ""
+msgstr "Position"
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Kommando"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Längd"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Tid"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Sträcka kvar"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Restid"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Vägbok"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Ange som position"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Ange som destination"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Lägg till som bokmärke"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skärm koordinat : %d %d"
@@ -1525,8 +1574,8 @@ msgstr "Iso2"
 msgid "Iso3"
 msgstr "Iso3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Land"
 
@@ -1537,9 +1586,9 @@ msgstr "Post"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Stad"
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr "Distrikt"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Gata"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Nummer"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Ange destination"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Stad"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Distrikt"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Karta"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Bokmärke"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Destination"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Visa"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Rutt"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Tidigare destinationer"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Layout"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projektion"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Fordon"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Zooma ut"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Zooma in"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Gör ny beräkning"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Info"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Avsluta navigering"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Testa"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Markör"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Lås till vägen"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Norrvärde"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Autozoom"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Helskärm"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Data"
 
@@ -1715,17 +1768,17 @@ msgstr "NV"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
-msgstr ""
+msgstr "Nej"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
-msgstr ""
+msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:78
 msgid "OT"
@@ -1740,97 +1793,135 @@ msgstr "Rutt %4.0fkm    %02d:%02d Ankomsttid"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rutt 0000km  0+00:00 Ankomsttid"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
-msgstr ""
+msgstr "Tillbaka till kartan"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
-msgstr ""
+msgstr "Huvudmeny"
+
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr "Hjälp"
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr "Tillbaka"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
-msgstr ""
+msgstr "Intressepunkter"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
-msgstr ""
+msgstr "Gator"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
-msgstr ""
+msgstr "Visa i webbläsare"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
-msgstr ""
+msgstr "Visa attribut"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
-msgstr ""
+msgstr "Visa på karta"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
-msgstr ""
+msgstr "Bokmärk %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
-msgstr ""
+msgstr "Fönsterläge"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
-msgstr ""
+msgstr "Åtgärder"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
-msgstr ""
+msgstr "Kartpunkt"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
-msgstr ""
+msgstr "Fordonsposition"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
-msgstr ""
+msgstr "Avsluta"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
+"Stoppa\n"
+"Navigering"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
-msgstr ""
+msgstr "Kartor"
+
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr "Visa satellitstatus"
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr "Visa NMEA-data"
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr "Sätt som aktiv"
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr "Visa satellitstatus"
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr "Visa NMEA-data"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
-msgstr ""
+msgstr "Regler"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
-msgstr ""
+msgstr "Lås på väg"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
-msgstr ""
+msgstr "Kartan följer fordonet"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
-msgstr ""
+msgstr "Inställningar"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
+msgstr "Huvudmeny"
+
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Visa\n"
+"Karta"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
-msgstr ""
+msgstr "Verktyg"
 
 #~ msgid "ramp"
 #~ msgstr "påfart"
diff --git a/po/te.po.in b/po/te.po.in
index 2310f9202..40af27a5b 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-09-06 13:58+0000\n"
 "Last-Translator: వీవెన్ (Veeven) <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d మీటర్లు"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ఒక కిలోమీటరు"
 msgstr[1] "%d కిలోమీటర్లు"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr ""
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "కుడి"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "ఎడమ"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "తేలికగా "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr ""
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "త్వరలో"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "ఇప్పుడు"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "పొరపాటు"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "మీరు మీ గమ్యస్థానం %s చేరారు"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "ఆదేశం"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "పొడవు"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "కిమీ"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr ""
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "సమయం"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1525,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "దేశం"
 
@@ -1537,9 +1586,9 @@ msgstr "తపాలా"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "పట్టణం"
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr "జిల్లా"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "వీధి"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "సంఖ్య"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "నగరం"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "పటం"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "గమ్యం"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "పేజీకలు"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "కూర్పు"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "వాహనం"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "సమాచారం"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "పరీక్ష"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "నిండు తెర"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "దత్తాంశం"
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,94 +1793,128 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
diff --git a/po/th.po.in b/po/th.po.in
index 1fed58726..ec69f64f1 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-09-03 03:29+0000\n"
 "Last-Translator: mansv68 <mansv68@yahoo.co.th>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -15,267 +15,316 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "กำหนด '%s' ถึง '%s'\n"
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d เมตร"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "อีก %d เมตร"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d เมตร"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "อีก %d เมตร"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d  กิโลเมตร"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "อีก %d.%d กิโลเมตร"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d กิโลเมตร"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "อีก %d กิโลเมตร"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "ทางออก"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s เข้าสู่ถนน %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s เข้าสู่ %s%s%s| จาก"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s เข้าสู %s%s%s| จาก"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s เข้าสู่ %s%s%s| จาก"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "ขวา"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "ซ้าย"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "อย่างเคร่งคัด "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "ไม่ทราบ "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "ถ้าเป็นไปได้ ให้กลับรถ"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "ตรงไปตามถนน แล้ว %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "ในไม่ช้า"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "เดี๋ยวนี้"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "ข้อผิดพลาด"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "เลี้ยว %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "คุณได้ถึงที่หมายแล้ว %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "คำสั่ง"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "ความยาว"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "กม."
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "เมตร"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "เวลา"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "ระยะทาง ถึงที่หมาย"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "เวลา ถึงที่หมาย"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "กำหนดตำแหน่ง"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "กำหนดเป็นที่หมาย"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "เพิ่มใน บุกมาร์ก"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "จุด 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "พิกัดหน้าจอ : %d %d"
@@ -1523,8 +1572,8 @@ msgstr "ISO2"
 msgid "Iso3"
 msgstr "ISO3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "ประเทศ"
 
@@ -1535,9 +1584,9 @@ msgstr "ไปรษณีย์"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "เมือง"
 
@@ -1547,127 +1596,131 @@ msgid "District"
 msgstr "เขต"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "ถนน"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "หมายเลข"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "กำหนด ที่หมาย"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "รหัสไปรษณีย์"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "เมือง"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "แผนที่"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "จุดหมาย"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "แสดง"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "เส้นทาง"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "ก่อนถึง ที่หมาย"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "บุ๊กมาร์ก"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "การจัดเรียง"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "การฉายแผนที่"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "ยานพาหนะ"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "ขยายออก"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "ขยายเข้า"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "คำนวนใหม่"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "ข้อมูล"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "หยุดการนำทาง"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "ทดสอบ"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_ออกจากโปรแกรม"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "เคอร์เซอร์"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "ทางทิศเหนือ"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "แสดงผลเต็มจอภาพ"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "ข้อมูล"
 
@@ -1716,12 +1769,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1738,95 +1791,129 @@ msgstr "เส้นทาง %4.0f กม. %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "เส้นทาง 0000km 0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
 
diff --git a/po/tr.po.in b/po/tr.po.in
index eb61aeef0..c51b34eba 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 11:04+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2009-01-08 10:57+0000\n"
 "Last-Translator: seqizz (gurkanGur) <seqizz@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-01-15 08:20+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,273 +29,302 @@ msgstr "Kaynak klasörden çalıştırılıyor\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' , '%s' değerine ayarlanıyor\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr "sıfırıncı"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr "birinci"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr "ikinci"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr "üçüncü"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr "dördüncü"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr "beşinci"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr "altıncı"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "%d m'de"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d metre"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "%d metrede"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometre"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d.%d kilometrede"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometre"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "%d kilometrede"
 
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "çıkış"
 
-#: ../navit/navigation.c:1204
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr "rampada"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1234
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sCaddesi'ne %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1238
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%scaddesine %s%s%s|male form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1242
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%scaddesine %s%s%s|female form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1246
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%scaddesine %s%s%s|neutral form"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1253
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1274
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "Sağa"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1313
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "Sola"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1320
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "kolayca "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1325
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr "sertçe "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1329
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr "bilinmeyen "
 
-#: ../navit/navigation.c:1336
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr "Müsait olduğunda lütfen yönünü değiştir"
 
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1349
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1364
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1367
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "then leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1377
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Gelecek %s için yolu takip et"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr "yakında"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1394 ../navit/navigation.c:1408
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr "%i yol sonra"
 
-#: ../navit/navigation.c:1397
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "şimdi"
 
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1472
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr "hata"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1446
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Dönüş %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1449
+#: ../navit/navigation.c:1516
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "sonra %1$s%2$s %3$s%4$s dönün"
 
-#: ../navit/navigation.c:1454
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Hedefinize ulaştınız, %s"
 
-#: ../navit/navigation.c:1456
+#: ../navit/navigation.c:1523
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1049
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr "Konum"
 
-#: ../navit/navit.c:1050
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "Komut"
 
-#: ../navit/navit.c:1054
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "Uzaklık"
 
-#: ../navit/navit.c:1058 ../navit/navit.c:1083
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1062 ../navit/navit.c:1087
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1068
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr "Zaman"
 
-#: ../navit/navit.c:1080
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "Hedef Uzaklığı"
 
-#: ../navit/navit.c:1093
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "Varış Zamanı"
 
-#: ../navit/navit.c:1126 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Yol Haritası"
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "Pozisyon olarak ayarla"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "Hedef olarak ayarla"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "Yer imi olarak ayarla"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Nokta 0x%x 0x%x"
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Ekran koordinatları :%d %d"
@@ -1543,8 +1572,8 @@ msgstr "Iso2"
 msgid "Iso3"
 msgstr "Isa3"
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "Ülke"
 
@@ -1555,9 +1584,9 @@ msgstr "Posta"
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "Şehir"
 
@@ -1567,127 +1596,131 @@ msgid "District"
 msgstr "Bölge"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "Cadde"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "Numara"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Hedefi Giriniz"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Zip Kodu"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Şehir"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Bölge/Mahal"
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "Harita"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Yer imi"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "Hedef"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "Görüntüle"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Rota"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "önceki istikamet"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr "Yer İmleri"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr "Yerleşim"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "İzdüşüm"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "Araç"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Uzaklaştır"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Yakınlaştır"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Yeniden hesapla"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "Bilgi"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Dolaşmayı Durdur"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Test"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "Çı_kış"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "İmleç"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Kapalı yol"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr "Kuzey mesafesi"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "Tam Ekran"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Veri"
 
@@ -1736,12 +1769,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr "2B"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr "3B"
 
@@ -1758,62 +1791,70 @@ msgstr "Rota %4.0fkm %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rota 0000km 0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr "Haritaya dön"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr "Ana Menü"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr "Sokaklar"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr "Tarayıcıda Bak"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr "Özniteliklere Bak"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr "Haritada bak"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr "Yerimi ata %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr "Pencere Modu"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr "Eylemler"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr "Harita Noktası"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr "Araç Konumu"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr "Çık"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1821,34 +1862,60 @@ msgstr ""
 "Navigasyonu\n"
 "Durdur"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr "Haritalar"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr "Harita aracı takip etsin"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr "Ana menü"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr "Araçlar"
 
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index 7c0cb642c..937285d85 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -5,277 +5,326 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
-"PO-Revision-Date: 2008-09-08 13:09+0000\n"
-"Last-Translator: Kyle\n"
+"Project-Id-Version: navit 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
+"PO-Revision-Date: 2009-02-14 13:57+0000\n"
+"Last-Translator: rainofchaos <rainofchaos@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr "从根目录执行\n"
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' 设置为 '%s'\n"
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr "%d米"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr "距离%d米"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr "%d米"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr "距离%d米"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d千米"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "距离%d.%d千米"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d千米"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "距离%d千米"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "退出"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
-msgstr ""
+msgstr "右"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
-msgstr ""
+msgstr "左"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
-msgstr ""
+msgstr "轻轻 "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
-msgstr ""
+msgstr "大幅度 "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
-msgstr ""
+msgstr "未知 "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1434
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr ""
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr ""
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr ""
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr ""
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr ""
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr ""
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr ""
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1523,8 +1572,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr ""
 
@@ -1535,9 +1584,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr ""
 
@@ -1547,127 +1596,131 @@ msgid "District"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1716,12 +1769,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1738,94 +1791,128 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index e3a674da7..5efaf340c 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 15:31+0100\n"
+"POT-Creation-Date: 2009-03-12 14:11+0100\n"
 "PO-Revision-Date: 2008-09-08 12:56+0000\n"
 "Last-Translator: Kyle <Unknown>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
@@ -15,269 +15,318 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-04-06 12:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/main.c:228
+#: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
 msgstr ""
 
-#: ../navit/main.c:260
+#: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:197
+#: ../navit/navigation.c:240
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:242
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:244
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:246
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:248
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:250
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:252
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:263
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:275
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:316
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:318
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:322
 #, c-format
 msgid "%d meters"
 msgstr ""
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:324
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:330
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:332
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:336
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:338
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1268
 msgid "exit"
 msgstr "退出"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1270
 msgid "into the ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1190
+#: ../navit/navigation.c:1300
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1194
+#: ../navit/navigation.c:1304
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1198
+#: ../navit/navigation.c:1308
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1312
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr ""
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1209
+#: ../navit/navigation.c:1319
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1340
 msgid "right"
 msgstr "右"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1379
 msgid "left"
 msgstr "左"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1386
 msgid "easily "
 msgstr "简单 "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1391
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1395
 msgid "unknown "
 msgstr ""
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1402
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1412
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1416
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1431
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1434
 #, c-format
-msgid "Leave the roundabout at the %s exit"
+msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1444
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "直走到下一个%s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1448
 msgid "soon"
 msgstr ""
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1458
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1464
 msgid "now"
 msgstr "現在"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1472
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1483
 msgid "error"
 msgstr ""
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1513
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "%1$s转向%2$s %3$s至%4$s"
 
-#: ../navit/navigation.c:1374
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1516
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1521
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1523
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1142
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1143
 msgid "Command"
 msgstr "指令"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1147
 msgid "Length"
 msgstr "長度"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1151 ../navit/navit.c:1176
 msgid "km"
 msgstr "公里"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1155 ../navit/navit.c:1180
 msgid "m"
 msgstr "米"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1161
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1173
 msgid "Destination Length"
 msgstr "抵达终点距离"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1186
 msgid "Destination Time"
 msgstr "抵达终点时间"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:218 ../navit/popup.c:272
-#: ../navit/gui/internal/gui_internal.c:1831
+#: ../navit/popup.c:238 ../navit/popup.c:292
+#: ../navit/gui/internal/gui_internal.c:2101
 msgid "Set as position"
 msgstr "设置您所在位置"
 
-#: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/popup.c:239 ../navit/popup.c:293
+#: ../navit/gui/internal/gui_internal.c:2097
 msgid "Set as destination"
 msgstr "设置目的地地址"
 
-#: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/popup.c:240 ../navit/popup.c:294
+#: ../navit/gui/internal/gui_internal.c:2105
 msgid "Add as bookmark"
 msgstr "添加书签"
 
-#: ../navit/popup.c:262
+#: ../navit/popup.c:282
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:263
+#: ../navit/popup.c:283
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1525,8 +1574,8 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:428
-#: ../navit/gui/internal/gui_internal.c:2454
+#: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
+#: ../navit/gui/internal/gui_internal.c:2748
 msgid "Country"
 msgstr "国家"
 
@@ -1537,9 +1586,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/internal/gui_internal.c:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2727
+#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2889
 msgid "Town"
 msgstr "城镇"
 
@@ -1549,127 +1598,131 @@ msgid "District"
 msgstr "行政区"
 
 #: ../navit/gui/gtk/destination.c:120 ../navit/gui/gtk/destination.c:121
-#: ../navit/gui/gtk/destination.c:439
-#: ../navit/gui/internal/gui_internal.c:2414
-#: ../navit/gui/internal/gui_internal.c:2423
+#: ../navit/gui/gtk/destination.c:437
+#: ../navit/gui/internal/gui_internal.c:2708
+#: ../navit/gui/internal/gui_internal.c:2717
 msgid "Street"
 msgstr "街"
 
-#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:441
+#: ../navit/gui/gtk/destination.c:121 ../navit/gui/gtk/destination.c:439
 msgid "Number"
 msgstr "号"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "输入目的地"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "城市"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:185
+#: ../navit/gui/gtk/destination.c:462 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr ""
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "书签"
 
-#: ../navit/gui/gtk/destination.c:466 ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "目的地"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:181
-#: ../navit/gui/internal/gui_internal.c:2516
-#: ../navit/gui/internal/gui_internal.c:2710
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:3103
 msgid "Display"
 msgstr "显示"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "路"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "前一个目的地"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
-#: ../navit/gui/internal/gui_internal.c:1931
-#: ../navit/gui/internal/gui_internal.c:2571
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2201
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Bookmarks"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:186
-#: ../navit/gui/internal/gui_internal.c:2473
-#: ../navit/gui/internal/gui_internal.c:2518
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2767
+#: ../navit/gui/internal/gui_internal.c:2812
 msgid "Layout"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "投影"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:188
-#: ../navit/gui/internal/gui_internal.c:2657
-#: ../navit/gui/internal/gui_internal.c:2718
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3046
+#: ../navit/gui/internal/gui_internal.c:3111
 msgid "Vehicle"
 msgstr "机动车"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "放大"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "缩小"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:193 ../navit/gui/gtk/gui_gtk_action.c:195
+#: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "信息"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "停止浏览"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "测试"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "退出"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "游标"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:209
-#: ../navit/gui/internal/gui_internal.c:2692
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Northing"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:212 ../navit/gui/gtk/gui_gtk_action.c:214
-#: ../navit/gui/internal/gui_internal.c:2528
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2822
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr ""
 
@@ -1718,12 +1771,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2829
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2835
 msgid "3D"
 msgstr ""
 
@@ -1740,95 +1793,129 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1322
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1331
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1451
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1601
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1905
+#: ../navit/gui/internal/gui_internal.c:2110
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2067
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2089
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2124
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2237
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2863
+#: ../navit/gui/internal/gui_internal.c:3151
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2874
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2884
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2893
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2899
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2915
+#: ../navit/gui/internal/gui_internal.c:3107
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2959
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3017
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3023
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3029
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3071
+#: ../navit/gui/internal/gui_internal.c:3115
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3079
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3091
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3159
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3149
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3155
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3162
 msgid "Tools"
 msgstr ""
author	kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>	2009-04-11 06:39:10 +0000
committer	kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>	2009-04-11 06:39:10 +0000
commit	da33c3547b42677b393230df3082379b4448950d (patch)
tree	fc0939692767319723b31caf69779963828e5664 /po
parent	50785b0ebb1782965921904646b4967f3deade19 (diff)
download	navit-da33c3547b42677b393230df3082379b4448950d.tar.gz