Update:i18n:Updated various translations

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2105 ffa7fe5e-494d-0410-b361-a75ebd5db220
author: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> 2009-03-12 13:15:19 +0000
committer: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> 2009-03-12 13:15:19 +0000
commit: de2828d34c8e9637774d1b3d95e0744d0fb55ded (patch)
tree: 959711ce95934a575721b35e5f8cc8574e9f3cbf /po
parent: 0062a3a56f52666cead9d3c00a43e049d1216ba0 (diff)
download: navit-de2828d34c8e9637774d1b3d95e0744d0fb55ded.tar.gz
13 files changed, 2012 insertions, 1626 deletions
diff --git a/po/ar.po.in b/po/ar.po.in
index e44f15e77..e22d2438c 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -1,14 +1,14 @@
 # Arabic 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.
+# Metehyi, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-02-19 13:51+0100\n"
-"PO-Revision-Date: 2009-02-18 16:15+0000\n"
+"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"
 "Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,9 @@ 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-02-23 15:16+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+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
@@ -1695,7 +1696,7 @@ msgstr "شمالي دائم"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr ""
+msgstr "تكبير/تصغير تلقائي"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
 #: ../navit/gui/internal/gui_internal.c:2804
diff --git a/po/cs.po.in b/po/cs.po.in
index 7d56aa9e8..4725d67ad 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-01-06 11:04+0100\n"
-"PO-Revision-Date: 2008-12-29 22:54+0000\n"
-"Last-Translator: Mike Crash <Unknown>\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"
 "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-01-15 08:20+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,65 +29,65 @@ msgstr "Běží ze zdrojového adresáře\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavuji '%s' na '%s\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
-msgstr ""
+msgstr "nultá"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
-msgstr ""
+msgstr "první"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
-msgstr ""
+msgstr "druhá"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
-msgstr ""
+msgstr "třetí"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
-msgstr ""
+msgstr "čtvrtá"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
-msgstr ""
+msgstr "pátá"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
-msgstr ""
+msgstr "šestá"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "za %d m"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d metrů"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "za %d metrů"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometrů"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrů"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -95,7 +95,7 @@ msgstr[0] "%d kilometr"
 msgstr[1] "%d kilometry"
 msgstr[2] "%d  kilometrů"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -103,194 +103,195 @@ msgstr[0] "za %d  kilometr"
 msgstr[1] "za %d  kilometry"
 msgstr[2] "za %d kilometrů"
 
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "konec"
 
-#: ../navit/navigation.c:1204
+#: ../navit/navigation.c:1230
 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:1234
+#: ../navit/navigation.c:1260
 #, 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:1238
+#: ../navit/navigation.c:1264
 #, 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:1242
+#: ../navit/navigation.c:1268
 #, 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:1246
+#: ../navit/navigation.c:1272
 #, 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:1253
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1274
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "vpravo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1313
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "vlevo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1320
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "mírně "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1325
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "silně "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1329
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "neurčitě "
 
-#: ../navit/navigation.c:1336
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Až to bude možné, otočte se"
 
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1349
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1364
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr ""
 
-#: ../navit/navigation.c:1367
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr ""
 
-#: ../navit/navigation.c:1377
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte po další %s"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "brzy"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1394 ../navit/navigation.c:1408
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1397
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "nyní"
 
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1443
 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:1446
+#: ../navit/navigation.c:1473
 #, 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:1449
+#: ../navit/navigation.c:1476
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1454
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dorazili jste do cíle %s"
 
-#: ../navit/navigation.c:1456
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1049
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Poloha"
 
-#: ../navit/navit.c:1050
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Příkaz"
 
-#: ../navit/navit.c:1054
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Délka"
 
-#: ../navit/navit.c:1058 ../navit/navit.c:1083
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1062 ../navit/navit.c:1087
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1068
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1080
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Cílová vzdálenost"
 
-#: ../navit/navit.c:1093
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Cílový čas"
 
-#: ../navit/navit.c:1126 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Použít jako pozici"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Nastavit jako cíl"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Použít jako záložku"
 
@@ -1547,8 +1548,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:2730
 msgid "Country"
 msgstr "Země"
 
@@ -1559,9 +1560,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:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Město"
 
@@ -1571,127 +1572,131 @@ msgid "District"
 msgstr "Kraj/Okres"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Ulice"
 
-#: ../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 "Číslo"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Zadejte cíl"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "PSČ"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Město"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Kraj/Okres"
 
-#: ../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 "Mapa"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Záložka"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Zobrazit"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Trasa"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Minulé cíle"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Rozvržení"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projekce"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Vozidlo"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Zmenšit"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Zvětšit"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Přepočítat"
 
-#: ../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 "Informace"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Přestat navigovat"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Vyzkoušet"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Konec"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Jet jen po silnici"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Severně"
 
-#: ../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:2804
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Data"
 
@@ -1740,12 +1745,12 @@ msgid "No"
 msgstr "Ne"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1762,62 +1767,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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Zpět na mapu"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Hlavní menu"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr "Nápověda"
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr "Body zájmu"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Zobrazit v prohlížeči"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Zobrazit atributy"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "V okně"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Akce"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "Bod na mapě"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Poloha vozidla"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Konec"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1825,34 +1838,60 @@ msgstr ""
 "Ukonči\n"
 "Navigaci"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Pravidla"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Uchytit na cestu"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Hlavní menu"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Nástroje"
 
diff --git a/po/da.po.in b/po/da.po.in
index 0dbfc77ec..cf5a1463f 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -7,289 +7,289 @@ 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"
-"PO-Revision-Date: 2009-01-19 19:36+0000\n"
+"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"PO-Revision-Date: 2009-03-07 13:32+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-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+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 "Afvikler fra kildekode mappen\n"
+msgstr "Kører fra kildekode mappen\n"
 
 #: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "sætter '%s' til '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "første"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
-msgstr "sekund"
+msgstr "anden"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "tredje"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
-msgstr "fjerde"
+msgstr "fourth"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
-msgstr "femte"
+msgstr "fifth"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
-msgstr "sjette"
+msgstr "sixth"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "i %d m"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "om %d meters"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometer"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "om %d.%d kilometer"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "én kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om én kilometer"
 msgstr[1] "om %d kilometer"
 
-#: ../navit/navigation.c:1205
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "afslut"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1230
 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:1237
+#: ../navit/navigation.c:1260
 #, 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:1241
+#: ../navit/navigation.c:1264
 #, 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:1245
+#: ../navit/navigation.c:1268
 #, 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:1249
+#: ../navit/navigation.c:1272
 #, 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:1256
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sind i %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "højre"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "venstre"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "blødt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "skarpt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "ukendt "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Når muligt, vend venligst om"
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "Kør snart ind i rundkørslen"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Om %s, kør ind i rundkørslen"
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr "Forlad rundkørslen ved %s afkørsel"
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr "forlad så rundkørslen ved den %s afkørsel"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Følg vejen de næste %s"
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "snart"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Tag den %1$s vej til %2$s"
 
-#: ../navit/navigation.c:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr "efter %i veje"
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1432
 #, 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:1420
+#: ../navit/navigation.c:1443
 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:1450
+#: ../navit/navigation.c:1473
 #, 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:1453
+#: ../navit/navigation.c:1476
 #, 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:1458
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du er fremme ved destinationen %s"
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr "og så ankommer du til din destination"
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Kommando"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Længde"
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Tid"
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Længde til destinationen"
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Tid til destinationen"
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Sæt som position"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Sæt som destination"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Tilføj som bogmærke"
 
@@ -1546,8 +1546,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:2730
 msgid "Country"
 msgstr "Land"
 
@@ -1558,9 +1558,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:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "By"
 
@@ -1570,127 +1570,131 @@ msgid "District"
 msgstr "Område"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Gade"
 
-#: ../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 "Indtast 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 "By"
 
-#: ../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 "Kort"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Bogmæ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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Vis"
 
-#: ../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 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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Layout"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Visning"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Køretøj"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Zoom ud"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Zoom ind"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Genberegn"
 
-#: ../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 "Information"
 
-#: ../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 "_Afslut"
 
-#: ../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 "Stop Navigation"
 
-#: ../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:3067
 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:2804
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Data"
 
@@ -1739,12 +1743,12 @@ msgid "No"
 msgstr "Nej"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1761,62 +1765,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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Tilbage til kort"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Hovedmenu"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr "Hjælp"
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr "Tilbage"
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Gader"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Vis i Browser"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Bogmærke %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Vinduestilstand"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "Kort Punkt"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Køretøj Positaion"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Luk"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1824,34 +1836,62 @@ msgstr ""
 "Stop\n"
 "Navigation"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Kort"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr "Vis Satellit Status"
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr "Vis NMEA Data"
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr "Sæt til aktiv"
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr "Vis Satellit status"
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr "Vis NMEA data"
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Regler"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Lås til vej"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "Kort følger Køretøj"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Hovedmenu"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Vis\n"
+"Kort"
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Værktøjer"
 
diff --git a/po/de.po.in b/po/de.po.in
index ee2cc1a02..1dc567d97 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-03-11 10:34+0100\n"
-"PO-Revision-Date: 2009-02-12 16:04+0000\n"
-"Last-Translator: metehyi <Unknown>\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"
 "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-02-13 06:28+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,306 +29,278 @@ msgstr "Aufruf aus Quellverzeichnis\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setze '%s' auf '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr "nullte"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "erste"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr "zweite"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "dritte"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr "vierte"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr "fünfte"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr "sechste"
 
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr "nullten Ausfahrt"
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr "ersten Ausfahrt"
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr "zweiten Ausfahrt"
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr "dritten Ausfahrt"
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr "vierten Ausfahrt"
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr "fünften Ausfahrt"
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr "sechsten Ausfahrt"
-
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
-msgstr "%d Meter"
+msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
-msgstr "In %d metern"
+msgstr "in %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "In %d Metern"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d Kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "In %d,%d Kilometern"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "einen Kilometer"
 msgstr[1] "%d Kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:300
 #, 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
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "Ausfahrt"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1230
 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:1300
+#: ../navit/navigation.c:1260
 #, 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:1304
+#: ../navit/navigation.c:1264
 #, 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:1308
+#: ../navit/navigation.c:1268
 #, 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:1312
+#: ../navit/navigation.c:1272
 #, 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:1319
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sauf die %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "rechts"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "leicht "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1351
 msgid "strongly "
-msgstr "scharf "
+msgstr "stark "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "unbekannt "
 
 #
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Wenn möglich bitte wenden"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "Demnächst in den Kreisverkehr einfahren"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "In %s in den Kreisverkehr einfahren"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1391
 #, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Den Kreisverkehr an der %s verlassen"
+msgid "Leave the roundabout at the %s exit"
+msgstr "Den Kreisverkehr an der %s Ausfahrt verlassen"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1394
 #, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "dann den Kreisverkehr an der %s verlassen"
+msgid "then leave the roundabout at the %s exit"
+msgstr "dann den Kreisverkehr an der %s Ausfahrt verlassen"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Dem Straßenverlauf %s folgen"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "Demnächst"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Die %1$s Straße %2$s abbiegen"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "Jetzt"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1432
 #, 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:1483
+#: ../navit/navigation.c:1443
 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:1513
+#: ../navit/navigation.c:1473
 #, 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:1516
+#: ../navit/navigation.c:1476
 #, 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:1521
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
-msgstr "%s haben Sie ihr Ziel erreicht"
+msgstr "Sie haben Ihr Ziel %s erreicht"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
-msgstr "dann haben Sie ihr Ziel erreicht"
+msgstr "dann haben Sie Ihr Ziel erreicht."
 
-#: ../navit/navit.c:1142
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1143
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Befehl"
 
-#: ../navit/navit.c:1147
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Länge"
 
-#: ../navit/navit.c:1151 ../navit/navit.c:1176
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1155 ../navit/navit.c:1180
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1161
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Zeit"
 
-#: ../navit/navit.c:1173
+#: ../navit/navit.c:1172
 msgid "Destination Length"
-msgstr "Verbleibende Strecke"
+msgstr "Verbleibende Strecke zum Ziel"
 
-#: ../navit/navit.c:1186
+#: ../navit/navit.c:1185
 msgid "Destination Time"
-msgstr "Fahrzeit"
+msgstr "Fahrzeit zum Ziel"
 
-#: ../navit/navit.c:1219 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
-msgstr "Straßenliste"
+msgstr "Straßenkarte"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2101
+#: ../navit/popup.c:218 ../navit/popup.c:272
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Als Position setzen"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2097
+#: ../navit/popup.c:219 ../navit/popup.c:273
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Als Ziel setzen"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2105
+#: ../navit/popup.c:220 ../navit/popup.c:274
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Als Lesezeichen aufnehmen"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:262
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:263
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Bildschirm %d %d"
@@ -341,7 +313,7 @@ msgstr "Andorra"
 #. 784
 #: ../navit/country.c:40
 msgid "United Arab Emirates"
-msgstr "Vereinigte Arabische Emirate"
+msgstr "Die Vereinigte arabische Emirate"
 
 #. 004
 #: ../navit/country.c:41
@@ -374,11 +346,10 @@ msgstr "Armenien"
 msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
-#
 #. 024
 #: ../navit/country.c:47
 msgid "Angola"
-msgstr "Andorra"
+msgstr "Angola"
 
 #. 010
 #: ../navit/country.c:48
@@ -938,7 +909,7 @@ msgstr "Korea, Demokratische Volksrepublik"
 #. 410
 #: ../navit/country.c:159
 msgid "Korea, Republic of"
-msgstr "Tschechische Republik"
+msgstr "Südkorea"
 
 #. 414
 #: ../navit/country.c:160
@@ -973,7 +944,7 @@ msgstr "St. Lucia"
 #. 438
 #: ../navit/country.c:166
 msgid "Liechtenstein"
-msgstr "Lichtenstein"
+msgstr "Liechtenstein"
 
 #. 144
 #: ../navit/country.c:167
@@ -1580,7 +1551,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:118 ../navit/gui/gtk/destination.c:426
-#: ../navit/gui/internal/gui_internal.c:2748
+#: ../navit/gui/internal/gui_internal.c:2730
 msgid "Country"
 msgstr "Land"
 
@@ -1592,22 +1563,21 @@ 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:2727
-#: ../navit/gui/internal/gui_internal.c:2756
-#: ../navit/gui/internal/gui_internal.c:2889
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Ort"
 
-#
 #: ../navit/gui/gtk/destination.c:119 ../navit/gui/gtk/destination.c:120
 #: ../navit/gui/gtk/destination.c:121
 msgid "District"
-msgstr "Ortsteil"
+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:2708
-#: ../navit/gui/internal/gui_internal.c:2717
+#: ../navit/gui/internal/gui_internal.c:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Straße"
 
@@ -1615,18 +1585,17 @@ msgstr "Straße"
 msgid "Number"
 msgstr "Nummer"
 
-#
 #: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
-msgstr "Ziel eingeben"
+msgstr "Reiseziel eingeben"
 
 #: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
-msgstr "PLZ"
+msgstr "Postleitzahl"
 
 #: ../navit/gui/gtk/destination.c:431
 msgid "City"
-msgstr "Ort"
+msgstr "Stadt"
 
 #: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
@@ -1642,11 +1611,11 @@ msgstr "Lesezeichen"
 
 #: ../navit/gui/gtk/destination.c:464 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
-msgstr "Ziel"
+msgstr "Reiseziel"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2810
-#: ../navit/gui/internal/gui_internal.c:3103
+#: ../navit/gui/internal/gui_internal.c:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Anzeige"
 
@@ -1656,17 +1625,17 @@ msgstr "Route"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
-msgstr "Letzte Ziele"
+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
+#: ../navit/gui/internal/gui_internal.c:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 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
+#: ../navit/gui/internal/gui_internal.c:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Erscheinungsbild"
 
@@ -1675,8 +1644,8 @@ msgid "Projection"
 msgstr "Projektion"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3046
-#: ../navit/gui/internal/gui_internal.c:3111
+#: ../navit/gui/internal/gui_internal.c:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Fahrzeug"
 
@@ -1706,27 +1675,27 @@ msgstr "Test"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
-msgstr "Beenden"
+msgstr "_Beenden"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
-msgstr "Marke"
+msgstr "Positionsmarke"
 
 #: ../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
+#: ../navit/gui/internal/gui_internal.c:3067
 msgid "Northing"
 msgstr "Einnorden"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr "Automatische Vergrößerung"
+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
+#: ../navit/gui/internal/gui_internal.c:2804
 msgid "Fullscreen"
 msgstr "Vollbild"
 
@@ -1776,15 +1745,15 @@ msgstr "NW"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
-msgstr "No"
+msgstr "Nein"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2829
+#: ../navit/gui/internal/gui_internal.c:2811
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2835
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1801,70 +1770,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:1322
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Zurück zur Karte"
 
-#: ../navit/gui/internal/gui_internal.c:1331
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:1451
+#: ../navit/gui/internal/gui_internal.c:1450
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../navit/gui/internal/gui_internal.c:1601
+#: ../navit/gui/internal/gui_internal.c:1600
 msgid "Back"
 msgstr "Zurück"
 
-#: ../navit/gui/internal/gui_internal.c:1905
-#: ../navit/gui/internal/gui_internal.c:2110
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
-msgstr "Interressante Wegpunkte"
+msgstr "Interressante Kartenpunkte"
 
-#: ../navit/gui/internal/gui_internal.c:2067
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Straßen"
 
-#: ../navit/gui/internal/gui_internal.c:2083
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Im Browser anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2089
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Attribute anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2124
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Auf der Karte zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2237
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Lesezeichen %s"
 
-#: ../navit/gui/internal/gui_internal.c:2817
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
-#: ../navit/gui/internal/gui_internal.c:2863
-#: ../navit/gui/internal/gui_internal.c:3151
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../navit/gui/internal/gui_internal.c:2874
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "Kartenpunkt"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Fahrzeugposition"
 
-#: ../navit/gui/internal/gui_internal.c:2893
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Ende"
 
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1872,61 +1841,61 @@ msgstr ""
 "Navigation\n"
 "beenden"
 
-#: ../navit/gui/internal/gui_internal.c:2915
-#: ../navit/gui/internal/gui_internal.c:3107
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Karten"
 
-#: ../navit/gui/internal/gui_internal.c:2959
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Show Satellite Status"
-msgstr "zeige Satellitstatus"
+msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2993
+#: ../navit/gui/internal/gui_internal.c:2975
 msgid "Show NMEA Data"
 msgstr "zeige NMEA Daten"
 
-#: ../navit/gui/internal/gui_internal.c:3017
+#: ../navit/gui/internal/gui_internal.c:2999
 msgid "Set as active"
 msgstr "Als Aktiv setzen"
 
-#: ../navit/gui/internal/gui_internal.c:3023
+#: ../navit/gui/internal/gui_internal.c:3005
 msgid "Show Satellite status"
-msgstr "zeige Satellitstatus"
+msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3029
+#: ../navit/gui/internal/gui_internal.c:3011
 msgid "Show NMEA data"
-msgstr "zeige NMEA Daten"
+msgstr "NMEA Daten anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3071
-#: ../navit/gui/internal/gui_internal.c:3115
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Regeln"
 
-#: ../navit/gui/internal/gui_internal.c:3079
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Auf Straße zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3091
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "Karte folgt Fahrzeug"
 
-#: ../navit/gui/internal/gui_internal.c:3101
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../navit/gui/internal/gui_internal.c:3149
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:3155
+#: ../navit/gui/internal/gui_internal.c:3137
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
-"zeige\n"
-"Karte"
+"Karte\n"
+"anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3162
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Werkzeuge"
diff --git a/po/es.po.in b/po/es.po.in
index de0a67b62..07c409c9c 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-01-15 09:53+0100\n"
-"PO-Revision-Date: 2009-01-28 20:38+0000\n"
-"Last-Translator: David A Páez <Unknown>\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"
 "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-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+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,267 +30,267 @@ msgstr "Ejecutando desde el directorio fuente\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "configurando '%s' a '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr "zeroth"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "primera"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr "segunda"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "tercera"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr "cuarta"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr "quinta"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr "sexta"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "en %d metros"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "en %d metros"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilómetro"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "en %d.%d kilómetros"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilómetro"
 msgstr[1] "%d kilómetro"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, 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:1205
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "salir"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1230
 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:1237
+#: ../navit/navigation.c:1260
 #, 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:1241
+#: ../navit/navigation.c:1264
 #, 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:1245
+#: ../navit/navigation.c:1268
 #, 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:1249
+#: ../navit/navigation.c:1272
 #, 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:1256
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s en la %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "derecha"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "izquierda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "suavemente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "brúscamente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "desconocido "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Cuando sea posible, por favor de la vuelta"
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "Métete pronto en la rotonda"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "En %s entra en la rotonda"
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr "Sal de la rotona en al %s salida"
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr "sal de la rotonda en la %s salida"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga el camino hasta la siguiente %s"
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "pronto"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1418
 #, 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:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr "después de %i carreteras"
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "ahora"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1432
 #, 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:1420
+#: ../navit/navigation.c:1443
 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:1473
 #, 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:1453
+#: ../navit/navigation.c:1476
 #, 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:1458
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ha llegado a su destino %s"
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr "ya has llegado al destino"
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Posición"
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Comando"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Longitud"
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Tiempo"
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Distancia a Destino"
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Tiempo a Destino"
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Fijar una posición"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Definir como destino"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Agregar como favorito"
 
@@ -1547,8 +1547,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:2730
 msgid "Country"
 msgstr "País"
 
@@ -1559,9 +1559,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:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Ciudad"
 
@@ -1571,127 +1571,131 @@ msgid "District"
 msgstr "Distrito"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Calle"
 
-#: ../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 "Número"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Ingresar Destino"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Código Postal"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Ciudad"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Distrito"
 
-#: ../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 "Mapa"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: ../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 "Destino"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Visualizar"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Ruta"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Anteriores destinos"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Favoritos"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Diseño"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Proyección"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Vehículo"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Alejar"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Aumentar"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Recalcular"
 
-#: ../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 "Información"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Detener Navegación"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Prueba"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../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 "Bloquear Ruta"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Norteando"
 
-#: ../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 "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
 msgid "Fullscreen"
 msgstr "Pantalla Completa"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Datos"
 
@@ -1740,12 +1744,12 @@ msgid "No"
 msgstr "No"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1762,62 +1766,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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Volver al mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Menú Principal"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr "Ayuda"
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr "Atrás"
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr "PDIs"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Calles"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Ver en el Navegador"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Ver Atributos"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Marcador %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Modo de Ventana"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "Punto en el Mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Posición del Vehiculo"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Cerrar"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1825,34 +1837,62 @@ msgstr ""
 "Parar\n"
 "Navegación"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr "Mostrar estado de Satélite"
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr "Mostar datos NMEA"
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr "Establecer como Activo"
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr "Mostrar estado de Satélite"
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr "Mostar datos NMEA"
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Reglas"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Bloqueado en la calle"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "El mapa sigue al Vehiculo"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Menú principal"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Mostrar\n"
+"Mapa"
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Herramientas"
 
diff --git a/po/fr.po.in b/po/fr.po.in
index 253be5c01..e602b52d7 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -8,22 +8,22 @@ 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 10:30+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"PO-Revision-Date: 2009-03-03 16:47+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-02-12 10:48+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+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 "Execution depuis le dossier source\n"
+msgstr "Execution depuis le dossier d'origine\n"
 
 #: ../navit/main.c:263
 #, c-format
@@ -171,27 +171,27 @@ msgstr "inconnu "
 
 #: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
-msgstr "Dès que possible, faites demi-tour"
+msgstr "Si possible, faites demi-tour"
 
 #: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
-msgstr "Prenez le rond point"
+msgstr "Bientôt rejoindre le rond-point"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
-msgstr "Dans %s, prenez le rond point"
+msgstr "Aprrès %s, rejoindre le rond-point"
 
 #: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
-msgstr "Prenez la %s sortie"
+msgstr "Prenez la sortie %s du rond-point"
 
 #: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
-msgstr "puis quittez le rond point à la %s sortie"
+msgstr "puis quittez le rond-point à la sortie %s"
 
 #: ../navit/navigation.c:1404
 #, c-format
@@ -246,41 +246,41 @@ msgstr "Vous êtes arrivé à destination : %s"
 
 #: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
-msgstr "puis vous serez à destination"
+msgstr "ensuite vous serez à destination"
 
-#: ../navit/navit.c:1125
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1126
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Commande"
 
-#: ../navit/navit.c:1130
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Distance"
 
-#: ../navit/navit.c:1134 ../navit/navit.c:1159
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1138 ../navit/navit.c:1163
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1144
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Durée"
 
-#: ../navit/navit.c:1156
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Distance à parcourir"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Temps de parcours"
 
-#: ../navit/navit.c:1202 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Carnet de route"
 
@@ -1553,7 +1553,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:2730
 msgid "Country"
 msgstr "Pays"
 
@@ -1564,9 +1564,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:2708
-#: ../navit/gui/internal/gui_internal.c:2737
-#: ../navit/gui/internal/gui_internal.c:2870
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Ville"
 
@@ -1577,8 +1577,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:2689
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Rue"
 
@@ -1602,7 +1602,7 @@ msgstr "Ville"
 msgid "District/Township"
 msgstr "Canton"
 
-#: ../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 "Carte"
 
@@ -1610,93 +1610,97 @@ msgstr "Carte"
 msgid "Bookmark"
 msgstr "Signet"
 
-#: ../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 "Destination"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "_Affichage"
 
-#: ../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 "Destinations précédentes"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:184
+#: ../navit/gui/gtk/gui_gtk_action.c:199
 #: ../navit/gui/internal/gui_internal.c:2195
-#: ../navit/gui/internal/gui_internal.c:2846
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Calques"
 
-#: ../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:3027
-#: ../navit/gui/internal/gui_internal.c:3092
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Véhicule"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Zoom arrière"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Zoom avant"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Recalculer"
 
-#: ../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 "Annuler le trajet"
 
-#: ../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 "_Quitter"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
-msgstr "Afficher le curseur"
+msgstr "Curseur"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Rester sur la route"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Orientation toujours au Nord"
 
-#: ../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 "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
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Données"
 
@@ -1728,29 +1732,29 @@ msgstr "S"
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "SW"
-msgstr "SW"
+msgstr "SO"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "W"
-msgstr "W"
+msgstr "O"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "NW"
-msgstr "NW"
+msgstr "NO"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr "Non"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2810
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1809,28 +1813,28 @@ msgstr "Voir sur la carte"
 msgid "Bookmark %s"
 msgstr "Ajouter %s aux favoris"
 
-#: ../navit/gui/internal/gui_internal.c:2798
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Mode fenêtré"
 
-#: ../navit/gui/internal/gui_internal.c:2844
-#: ../navit/gui/internal/gui_internal.c:3132
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Actions"
 
-#: ../navit/gui/internal/gui_internal.c:2855
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "Point sur la carte"
 
-#: ../navit/gui/internal/gui_internal.c:2865
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Position du véhicule"
 
-#: ../navit/gui/internal/gui_internal.c:2874
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../navit/gui/internal/gui_internal.c:2880
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1838,54 +1842,54 @@ msgstr ""
 "Arrêter la\n"
 "navigation"
 
-#: ../navit/gui/internal/gui_internal.c:2896
-#: ../navit/gui/internal/gui_internal.c:3088
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Cartes"
 
-#: ../navit/gui/internal/gui_internal.c:2940
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Show Satellite Status"
 msgstr "Afficher les infos satellite"
 
-#: ../navit/gui/internal/gui_internal.c:2974
+#: ../navit/gui/internal/gui_internal.c:2975
 msgid "Show NMEA Data"
 msgstr "Afficher les données NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:2998
+#: ../navit/gui/internal/gui_internal.c:2999
 msgid "Set as active"
 msgstr "Activer"
 
-#: ../navit/gui/internal/gui_internal.c:3004
+#: ../navit/gui/internal/gui_internal.c:3005
 msgid "Show Satellite status"
 msgstr "Afficher les infos satellite"
 
-#: ../navit/gui/internal/gui_internal.c:3010
+#: ../navit/gui/internal/gui_internal.c:3011
 msgid "Show NMEA data"
 msgstr "Afficher les données NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3052
-#: ../navit/gui/internal/gui_internal.c:3096
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Règles"
 
-#: ../navit/gui/internal/gui_internal.c:3060
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Coller à la route"
 
-#: ../navit/gui/internal/gui_internal.c:3072
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "La carte suit le véhicule"
 
-#: ../navit/gui/internal/gui_internal.c:3082
-#: ../navit/gui/internal/gui_internal.c:3140
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../navit/gui/internal/gui_internal.c:3130
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Menu principal"
 
-#: ../navit/gui/internal/gui_internal.c:3136
+#: ../navit/gui/internal/gui_internal.c:3137
 msgid ""
 "Show\n"
 "Map"
@@ -1893,7 +1897,7 @@ msgstr ""
 "Afficher\n"
 "la carte"
 
-#: ../navit/gui/internal/gui_internal.c:3143
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Outils"
 
diff --git a/po/it.po.in b/po/it.po.in
index 87af0a425..030b14d97 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-01-15 09:53+0100\n"
-"PO-Revision-Date: 2009-02-06 16:06+0000\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"
 "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-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,267 +30,267 @@ msgstr "Esecuzione dalla cartella di compilazione\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "impostazione di '%s' a '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr "zeresimo"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "primo"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr "secondo"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "terzo"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr "quarto"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr "quinto"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr "sesto"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "fra %d m"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d metri"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "fra %d metri"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d chilometri"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "fra %d,%d chilometri"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un chilometro"
 msgstr[1] "%d chilometri"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "fra un chilometro"
 msgstr[1] "fra %d chilometri"
 
-#: ../navit/navigation.c:1205
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "esci"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1230
 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:1237
+#: ../navit/navigation.c:1260
 #, 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:1241
+#: ../navit/navigation.c:1264
 #, 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:1245
+#: ../navit/navigation.c:1268
 #, 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:1249
+#: ../navit/navigation.c:1272
 #, 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:1256
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s nella %s"
+msgstr "%sin %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "destra"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "sinistra"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "leggermente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "decisamente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "facendo quasi inversione "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Appena possibile, invertire il senso di marcia"
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "Entrare in rotatoria"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Tra %s entrare nella rotonda"
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr "lasciare la rotatoria alla %s uscita"
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr "poi lasciare la rotatoria alla %s uscita"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Seguire la strada per i prossimi %s"
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "tra poco"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prendere la %1$s strada a %2$s"
 
-#: ../navit/navigation.c:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr "tra %i roads"
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "adesso"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1432
 #, 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:1420
+#: ../navit/navigation.c:1443
 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:1450
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr "Svoltare %1$sa %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:1453
+#: ../navit/navigation.c:1476
 #, 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:1458
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Destinazione raggiunta %s"
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr "poi sarete arrivati a destinazione"
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Posizione"
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Indicazione"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Distanza"
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Tempo"
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Distanza all'arrivo"
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Tempo all'arrivo"
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Imposta come posizione"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Imposta come destinazione"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Aggiungi come segnalibro"
 
@@ -1547,8 +1547,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:2730
 msgid "Country"
 msgstr "Stato"
 
@@ -1559,9 +1559,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:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Centro abitato"
 
@@ -1571,127 +1571,131 @@ msgid "District"
 msgstr "Regione"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Via"
 
-#: ../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 "Numero"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Inserire la destinazione"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "C.A.P."
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Città"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Regione/provincia"
 
-#: ../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 "Mappa"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Segnalibro"
 
-#: ../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 "Destinazione"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Visualizza"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Percorso"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Destinazioni precedenti"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Layout"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Proiezione"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Veicolo"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Zoom -"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Zoom +"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Ricalcola"
 
-#: ../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 "Informazioni"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Interrompi la navigazione"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Prova"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Posizione attuale"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Prosegui su questa strada"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Visione verso nord"
 
-#: ../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:2804
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Dati"
 
@@ -1740,12 +1744,12 @@ msgid "No"
 msgstr "No"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1762,95 +1766,129 @@ 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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Torna alla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Menù principale"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr "Punti d'interesse"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Strade"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Visualizza nel browser"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Visualizza attributi"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Visualizza sulla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Segnalibro %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Modalità finestre"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "Punto sulla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Posizione del veicolo"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Esci"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr "Stop"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Mappe"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Regole"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Blocca sulla strada"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "La mappa segue il veicolo"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Menù principale"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Strumenti"
 
diff --git a/po/nl.po.in b/po/nl.po.in
index a5f58c70c..8e274bbba 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-01-06 11:04+0100\n"
-"PO-Revision-Date: 2009-01-07 17:59+0000\n"
-"Last-Translator: Christ van Willegen <cvwillegen+launchpad@gmail.com>\n"
+"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"PO-Revision-Date: 2009-03-01 12:54+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-01-15 08:20+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,267 +29,268 @@ msgstr "Gestart vanuit de bron directory\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setting '%s' naar '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr "nulde"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "eerste"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr "tweede"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "derde"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr "vierde"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr "vijfde"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr "zesde"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilometer"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "na %d,%d kilometer"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "een kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "na één kilometer"
 msgstr[1] "in %d kilometer"
 
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "afslag"
 
-#: ../navit/navigation.c:1204
+#: ../navit/navigation.c:1230
 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:1234
+#: ../navit/navigation.c:1260
 #, 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:1238
+#: ../navit/navigation.c:1264
 #, 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:1242
+#: ../navit/navigation.c:1268
 #, 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:1246
+#: ../navit/navigation.c:1272
 #, 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:1253
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr "%snaar de %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1274
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "rechts"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1313
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1320
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "flauw "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1325
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "scherp "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1329
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "niet bekend "
 
-#: ../navit/navigation.c:1336
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Indien mogelijk omkeren"
 
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "U rijdt zodadelijk de rotonde op"
 
-#: ../navit/navigation.c:1349
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Neem de rotonde over %s"
 
-#: ../navit/navigation.c:1364
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr "Verlaat de rotonde op de %s uitrit"
 
-#: ../navit/navigation.c:1367
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr "verlaat daarna de rotonde op de %s uitrit"
 
-#: ../navit/navigation.c:1377
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Weg volgen voor %s"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "binnenkort"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem de %1$s straat naar %2$s"
 
-#: ../navit/navigation.c:1394 ../navit/navigation.c:1408
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr "na %i wegen"
 
-#: ../navit/navigation.c:1397
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1432
 #, 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:1416
+#: ../navit/navigation.c:1443
 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:1446
+#: ../navit/navigation.c:1473
 #, 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:1449
+#: ../navit/navigation.c:1476
 #, 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:1454
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s bestemming bereikt"
 
-#: ../navit/navigation.c:1456
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr "daarna bent u op uw besteming"
 
-#: ../navit/navit.c:1049
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Positie"
 
-#: ../navit/navit.c:1050
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Opdracht"
 
-#: ../navit/navit.c:1054
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Lengte"
 
-#: ../navit/navit.c:1058 ../navit/navit.c:1083
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1062 ../navit/navit.c:1087
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1068
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Tijd"
 
-#: ../navit/navit.c:1080
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Afstand"
 
-#: ../navit/navit.c:1093
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Aankomsttijd"
 
-#: ../navit/navit.c:1126 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Zet als positie"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Zet als bestemming"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Opnemen als bladwijzer"
 
@@ -1547,8 +1548,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:2730
 msgid "Country"
 msgstr "Land"
 
@@ -1560,9 +1561,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:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Plaats"
 
@@ -1573,128 +1574,132 @@ 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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 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 "Nummer"
 
 #
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Bestemming"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../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 "Gebied"
 
-#: ../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 "Markeren"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Tonen"
 
-#: ../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 "Vorige bestemmingen"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Opmaak"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projectie"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Voertuig"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Verkleinen"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Vergroten"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Herberekenen"
 
-#: ../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 navigatie"
 
-#: ../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 "Beëindigen"
 
-#: ../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 "houd de weg aan"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Kaart richting"
 
-#: ../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:2804
 msgid "Fullscreen"
 msgstr "Beeldvullend"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Data"
 
@@ -1743,12 +1748,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:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1765,62 +1770,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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Terug naar de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Hoofdmenu"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr "bezienswaardigheden"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "straten"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "bekijk in browser"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "bekijk eigenschappen"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "bekijk op de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "favoriet %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Venstermodus"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Acties"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "punt op de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "voortuig positie"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1828,34 +1841,60 @@ msgstr ""
 "stop\n"
 "navigatie"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Kaarten"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr "activeren"
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Regels"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "volg de weg"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "kaart volgt voertuig"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Hoofdmenu"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Gereedschappen"
 
diff --git a/po/pl.po.in b/po/pl.po.in
index 56b504eda..a16b9cdc9 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -7,16 +7,16 @@ 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"
-"PO-Revision-Date: 2009-02-08 19:29+0000\n"
-"Last-Translator: Mineque <Unknown>\n"
+"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"PO-Revision-Date: 2009-03-06 20:51+0000\n"
+"Last-Translator: skrzat <Unknown>\n"
 "Language-Team: Translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
@@ -32,65 +32,65 @@ msgstr "Uruchamiam z katalogu źródłowego\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ustawiam '%s' na '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr "zerowy"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "pierwszy"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr "drugi"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "trzeci"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr "czwarty"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr "piąty"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr "szósty"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d metrów"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "za %d metrów"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d metrów"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "za %d metrów"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometra"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrów"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -98,7 +98,7 @@ msgstr[0] "jeden kilometr"
 msgstr[1] "%d kilometr"
 msgstr[2] "%d kilometr"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -106,195 +106,195 @@ msgstr[0] "za kilometr"
 msgstr[1] "%d kilometr"
 msgstr[2] "%d kilometr"
 
-#: ../navit/navigation.c:1205
+#: ../navit/navigation.c:1228
 msgid "exit"
-msgstr "wyjście"
+msgstr "zjazd"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1230
 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:1237
+#: ../navit/navigation.c:1260
 #, c-format
 msgid "%sinto the street %s%s%s"
-msgstr "%s w ulice %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:1241
+#: ../navit/navigation.c:1264
 #, 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:1245
+#: ../navit/navigation.c:1268
 #, 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:1249
+#: ../navit/navigation.c:1272
 #, 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:1256
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s na / w %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "w prawo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "w lewo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "lekko "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "silnie "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "nieznane "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Zawróc, gdy będzie to możliwe"
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "Wjazd na rondo wkrótce"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
-msgstr "Wjedz na rondo za %s"
+msgstr "Wjedź na rondo za %s"
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr "Opuść rondo, %s zjazd"
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr "następnie opuść rondo %s zjazd"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Jedź tą drogą %s"
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "wkrótce"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Jedź %1$s drogą w %2$s"
 
-#: ../navit/navigation.c:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr "%i skrzyżowanie"
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "teraz"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1432
 #, 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:1420
+#: ../navit/navigation.c:1443
 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:1450
+#: ../navit/navigation.c:1473
 #, 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:1453
+#: ../navit/navigation.c:1476
 #, 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:1458
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dotarłeś do celu %s"
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
-msgstr "Dojechałeś do celu."
+msgstr "następnie dojechałeś do celu."
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Położenie"
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Polecenie"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Odległość"
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Czas"
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Odległość do celu"
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Czas do celu"
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Ustaw jako pozycję"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Ustaw jako cel"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Dodaj jako zakładkę"
 
@@ -436,7 +436,7 @@ msgstr "Republika Burundi"
 #. 204
 #: ../navit/country.c:64
 msgid "Benin"
-msgstr "Pekin"
+msgstr "Benin"
 
 #. 652
 #: ../navit/country.c:65
@@ -566,7 +566,7 @@ msgstr "Kuba"
 #. 132
 #: ../navit/country.c:90
 msgid "Cape Verde"
-msgstr "Zielony Przylądek"
+msgstr "Republika Zielonego Przylądka"
 
 #. 162
 #: ../navit/country.c:91
@@ -686,7 +686,7 @@ msgstr "Gabon"
 #. 826
 #: ../navit/country.c:114
 msgid "United Kingdom"
-msgstr "Zjednoczone Królestwo"
+msgstr "Wielka Brytania"
 
 #. 308
 #: ../navit/country.c:115
@@ -866,7 +866,7 @@ msgstr "Jamajka"
 #. 400
 #: ../navit/country.c:150
 msgid "Jordan"
-msgstr "Jorndan"
+msgstr "Jordania"
 
 #. 392
 #: ../navit/country.c:151
@@ -1006,7 +1006,7 @@ msgstr "Czarnogóra"
 #. 663
 #: ../navit/country.c:178
 msgid "Saint Martin (French part)"
-msgstr "Saint Martin (francuzka część)"
+msgstr "Saint Martin (część francuska)"
 
 #. 450
 #: ../navit/country.c:179
@@ -1551,8 +1551,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:2730
 msgid "Country"
 msgstr "Państwo"
 
@@ -1563,9 +1563,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:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Miasto"
 
@@ -1575,127 +1575,131 @@ msgid "District"
 msgstr "Dzielnica/Okręg miejski"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Ulica"
 
-#: ../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 "Numer"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Podaj cel"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Kod Pocztowy"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Miasto"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Dzielnica/Okręg miejski"
 
-#: ../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 "Mapa"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Zakładka"
 
-#: ../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 "Cel"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Pokaż"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Trasa"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
-msgstr "Cel"
+msgstr "Poprzednie cele"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Układ kolorów"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Odwzorowanie"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Pojazd"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Oddal"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Zbliż"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Oblicz ponownie"
 
-#: ../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 "Zatrzymaj nawigację"
 
-#: ../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 "Zakończ"
 
-#: ../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 "Trzymaj się drogi"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Północ zawsze na górze"
 
-#: ../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:2804
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Dane"
 
@@ -1744,12 +1748,12 @@ msgid "No"
 msgstr "Nie"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 msgid "2D"
 msgstr "2W"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "3D"
 msgstr "3W"
 
@@ -1766,62 +1770,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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
-msgstr "Powrót do mapy"
+msgstr "Wróć do mapy"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Menu główne"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr "Pomoc"
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr "Wróć"
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr "Użyteczne miejsca"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
-msgstr "Ulica"
+msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Zobacz w przeglądarce"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Zobacz właściwości"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Zakładka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Tryb Widoku"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Akcje"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr "Punkt na mapie"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Pozycja pojazdu"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1829,34 +1841,62 @@ msgstr ""
 "Przerwij\n"
 "nawigację"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr "Pokaż status satelitów"
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr "Pokaż dane NMEA"
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr "Ustaw jako aktywny"
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr "Pokaż status satelitów"
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr "Pokaż dane NMEA"
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Reguły"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Trzymaj się drogi"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "Wyśrodkuj mapę"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Menu główne"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Pokaż\n"
+"mapę"
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Narzędzia"
 
diff --git a/po/pt.po.in b/po/pt.po.in
index 7cb690c16..9cf5e11ff 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-01-15 09:53+0100\n"
-"PO-Revision-Date: 2009-02-07 10:57+0000\n"
-"Last-Translator: Tiago Silva <Unknown>\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"
 "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-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,267 +29,267 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr "ajuste '%s' to '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
-msgstr ""
+msgstr "primeiro"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
-msgstr ""
+msgstr "segundo"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
-msgstr ""
+msgstr "terceiro"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
-msgstr ""
+msgstr "quarto"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
-msgstr ""
+msgstr "sexto"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "em %d m"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "em %d metros"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d quilómetros"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "em %d.%d quilómetros"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "um quilḿetro"
 msgstr[1] "%d quilómetros"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, 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:1205
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "sair"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1230
 msgid "into the ramp"
-msgstr ""
+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:1237
+#: ../navit/navigation.c:1260
 #, 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:1241
+#: ../navit/navigation.c:1264
 #, 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:1245
+#: ../navit/navigation.c:1268
 #, 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:1249
+#: ../navit/navigation.c:1272
 #, 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:1256
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "direita"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "esquerda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "facilmente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "veementemente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "desconhecido "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Quando for possível"
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr ""
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr ""
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga a estrada para a próxima %s"
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "logo"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "agora"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1420
+#: ../navit/navigation.c:1443
 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:1450
+#: ../navit/navigation.c:1473
 #, 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:1453
+#: ../navit/navigation.c:1476
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Você chegou ao seu destino %s"
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Posição"
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Executar comandos"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Duração"
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Tempo"
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Duração Destino"
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Tempo Destino"
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Definir como posição"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Definir como destino"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Adicionar como marcador"
 
@@ -1546,8 +1546,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:2730
 msgid "Country"
 msgstr "País"
 
@@ -1558,9 +1558,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:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Cidade"
 
@@ -1570,127 +1570,131 @@ msgid "District"
 msgstr "Distrito"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Rua"
 
-#: ../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 "Número"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Introduza destino"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Código Postal"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Cidade"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
-msgstr ""
+msgstr "Distrito/Concelho"
 
-#: ../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 "Mapa"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: ../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 "Destino"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Exibir"
 
-#: ../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 "Anteriores Destinos"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Esquema"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projecção"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Veículo"
 
-#: ../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 "Recalcular"
 
-#: ../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 "Parar Navegação"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Teste"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../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 "Bloqueio na estrada"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Norte"
 
-#: ../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:2804
 msgid "Fullscreen"
 msgstr "Ecrã Inteiro"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Dados"
 
@@ -1739,12 +1743,12 @@ msgid "No"
 msgstr "Não"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1761,95 +1765,129 @@ 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:1321
 msgid "Back to map"
-msgstr ""
+msgstr "Voltar ao mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr "Voltar"
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Ruas"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Ver Atributos"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
-msgstr ""
+msgstr "Ver no mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
-msgstr ""
+msgstr "Acções"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Posição do Veículo"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
-msgstr ""
+msgstr "Sair"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 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:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 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:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Ferramentas"
 
diff --git a/po/ru.po.in b/po/ru.po.in
index d70d7d998..3c83d11d1 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -7,88 +7,88 @@ 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 15:54+0000\n"
-"Last-Translator: zcc <zcc@mail.ru>\n"
+"POT-Creation-Date: 2009-02-23 17:01+0100\n"
+"PO-Revision-Date: 2009-03-07 19:28+0000\n"
+"Last-Translator: edilion <Unknown>\n"
 "Language-Team: Rustam T. Usmanov\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-01-06 08:28+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+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:224
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:199
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:251
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d м"
 
-#: ../navit/navigation.c:253
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "через %d м"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d метров"
 
-#: ../navit/navigation.c:259
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "через %d метров"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d километр"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "через %d.%d километр(а,ов"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -96,7 +96,7 @@ msgstr[0] "%d километр"
 msgstr[1] "%d километра"
 msgstr[2] "%d километров"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -104,174 +104,195 @@ msgstr[0] "через %d километр"
 msgstr[1] "%d километра"
 msgstr[2] "%d километров"
 
-#: ../navit/navigation.c:1158
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "съезд"
 
-#: ../navit/navigation.c:1160
+#: ../navit/navigation.c:1230
 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:1260
 #, 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:1264
 #, 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:1268
 #, 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:1272
 #, 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:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1230
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "направо"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1264
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "налево"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1271
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "слегка "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1276
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "сильно "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1280
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "неизвестно "
 
-#: ../navit/navigation.c:1287
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Развернитесь, пожалуйста, если это возможно"
 
-#: ../navit/navigation.c:1295
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr ""
 
-#: ../navit/navigation.c:1298
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1310
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr ""
 
-#: ../navit/navigation.c:1318
+#: ../navit/navigation.c:1394
+#, c-format
+msgid "then leave the roundabout at the %s exit"
+msgstr ""
+
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Двигайтесь по дороге следующие %s"
 
-#: ../navit/navigation.c:1322
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "скоро"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1335
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1338
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "сейчас"
 
-#: ../navit/navigation.c:1342
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1443
 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:1473
 #, 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:1476
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Вы прибыли в пункт назначения %s"
 
-#: ../navit/navit.c:1042
+#: ../navit/navigation.c:1483
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1043
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Команда"
 
-#: ../navit/navit.c:1047
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Длина"
 
-#: ../navit/navit.c:1051 ../navit/navit.c:1076
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "км"
 
-#: ../navit/navit.c:1055 ../navit/navit.c:1080
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "м"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Время"
 
-#: ../navit/navit.c:1073
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Дистанция до пункта назначения"
 
-#: ../navit/navit.c:1086
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Время до пункта назначения"
 
-#: ../navit/navit.c:1119 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Установить как пункт отправления"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Установить как пункт назначения"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Добавить в закладки"
 
@@ -1528,8 +1549,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:2730
 msgid "Country"
 msgstr "Страна"
 
@@ -1540,9 +1561,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:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Город"
 
@@ -1552,127 +1573,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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 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:3067
 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:2804
 msgid "Fullscreen"
 msgstr "Во весь экран"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Данные"
 
@@ -1721,12 +1746,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:2811
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2541
+#: ../navit/gui/internal/gui_internal.c:2817
 msgid "3D"
 msgstr ""
 
@@ -1743,95 +1768,129 @@ msgstr "Маршрут %4.0fкм    %02d:%02d РВП"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Маршрут 0000км  0+00:00 РВП"
 
-#: ../navit/gui/internal/gui_internal.c:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 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:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 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:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr ""
 
diff --git a/po/sk.po.in b/po/sk.po.in
index da5e4d35f..07f082dd2 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-01-15 09:53+0100\n"
-"PO-Revision-Date: 2009-01-26 07:06+0000\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"
 "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-02-11 10:08+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,65 +29,65 @@ msgstr "Beží zo zdrojového adresára\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavujem '%s' na '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr "nultý"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "prvý"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr "druhý"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "tretí"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr "štvrtý"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr "piaty"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr "šiesty"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "o %d m"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "o %d metrov"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometra"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "o %d.%d kilometrov"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -95,7 +95,7 @@ msgstr[0] "%d kilometrov"
 msgstr[1] "jeden kilometer"
 msgstr[2] "%d kilometre"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -103,195 +103,195 @@ msgstr[0] "o %d kilometrov"
 msgstr[1] "o jeden kilometer"
 msgstr[2] "o %d kilometre"
 
-#: ../navit/navigation.c:1205
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "výjazd"
 
-#: ../navit/navigation.c:1207
+#: ../navit/navigation.c:1230
 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:1260
 #, 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:1241
+#: ../navit/navigation.c:1264
 #, 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:1245
+#: ../navit/navigation.c:1268
 #, 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:1249
+#: ../navit/navigation.c:1272
 #, 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:1256
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
-msgstr ""
+msgstr "%s na %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1277
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "vpravo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1316
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "vľavo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1323
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "mierne "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1328
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "prudko "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1332
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "neznámy "
 
-#: ../navit/navigation.c:1339
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Ak to bude možné, prosím, otočte sa"
 
-#: ../navit/navigation.c:1349
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "Vstúpte do kruhového objazdu onedlho"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1353
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "O %s vstúpte do kruhového objazdu"
 
-#: ../navit/navigation.c:1368
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr "Opustite kruhový objaz na %s výjazde"
 
-#: ../navit/navigation.c:1371
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr "potom opustite kruhový objazd na %s výjazde"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte naďalej po ceste %s"
 
-#: ../navit/navigation.c:1385
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "onedlho"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Choďte %1$s cestou na %2$s"
 
-#: ../navit/navigation.c:1398 ../navit/navigation.c:1412
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
-msgstr ""
+msgstr "po %i cestách"
 
-#: ../navit/navigation.c:1401
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "teraz"
 
-#: ../navit/navigation.c:1409
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "potom nasledujte cestu %1$s do %2$s"
 
-#: ../navit/navigation.c:1420
+#: ../navit/navigation.c:1443
 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:1450
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Zabočte %1s%2s%3s%4s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1453
+#: ../navit/navigation.c:1476
 #, 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:1458
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dorazili ste do svojho cieľa %s"
 
-#: ../navit/navigation.c:1460
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr "potom dosiahnete svoj cieľ cesty"
 
-#: ../navit/navit.c:1056
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Pozícia"
 
-#: ../navit/navit.c:1057
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Príkaz"
 
-#: ../navit/navit.c:1061
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../navit/navit.c:1065 ../navit/navit.c:1090
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1069 ../navit/navit.c:1094
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1075
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1087
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Cieľová vzdialenosť"
 
-#: ../navit/navit.c:1100
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Čas k cieľu"
 
-#: ../navit/navit.c:1133 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Nastaviť ako pozíciu"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Nastaviť ako cieľ"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Pridať ako záložku"
 
@@ -1548,8 +1548,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:2730
 msgid "Country"
 msgstr "Krajina"
 
@@ -1560,9 +1560,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:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Mesto"
 
@@ -1572,127 +1572,131 @@ msgid "District"
 msgstr "Kraj"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Ulica"
 
-#: ../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 "Číslo"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Uveďte cieľ"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "PSČ"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Mesto"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Kraj/Okres"
 
-#: ../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 "Mapa"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Záložka"
 
-#: ../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 "Cieľ"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Displej"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Trasa"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Predošlé cieľe"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Značenie"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projekcia"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Vozidlo"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Oddialiť"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Priblížiť"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Prepočítať"
 
-#: ../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ácie"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Zastaviť navigáciu"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Otestovať"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Uzamknúť na cesty"
 
-#: ../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:3067
 msgid "Northing"
-msgstr "Kompas"
+msgstr "Sever vždy hore"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Automatické zväčšenie"
 
-#: ../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:228 ../navit/gui/gtk/gui_gtk_action.c:230
+#: ../navit/gui/internal/gui_internal.c:2804
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Dáta"
 
@@ -1741,12 +1745,12 @@ msgid "No"
 msgstr "Nie"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1763,62 +1767,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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Späť na mapu"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Hlavné menu"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr "Pomoc"
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr "Späť"
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr "POI"
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Zobraziť v prehliadači"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Zobraziť atribúty"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Zobraziť na mape"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "V okne"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Akcie"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
-msgstr ""
+msgstr "Bod na mape"
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Pozícia vozidla"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1826,34 +1838,62 @@ msgstr ""
 "Zastaviť\n"
 "navigáciu"
 
-#: ../navit/gui/internal/gui_internal.c:2621
-#: ../navit/gui/internal/gui_internal.c:2714
+#: ../navit/gui/internal/gui_internal.c:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr "Zobraziť stav satelitov"
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr "Zobraziť NMEA data"
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr "Nastaviť ako aktívny"
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr "Zobraziť stav satelitov"
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr "Zobraziť NMEA data"
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Pravidlá"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Prichytiť k ceste"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Hlavné menu"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Zobraziť\n"
+"mapu"
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Nástroje"
 
diff --git a/po/sl.po.in b/po/sl.po.in
index 00019c3b5..7e478fa7b 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-01-06 11:04+0100\n"
+"POT-Creation-Date: 2009-02-23 17:01+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-01-15 08:20+0000\n"
+"X-Launchpad-Export-Date: 2009-03-09 09:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,65 +30,65 @@ msgstr "Zagon iz mape z izvorno kodo\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavljam '%s' na '%s'\n"
 
-#: ../navit/navigation.c:201
+#: ../navit/navigation.c:224
 msgid "zeroth"
 msgstr "ničt"
 
-#: ../navit/navigation.c:203
+#: ../navit/navigation.c:226
 msgid "first"
 msgstr "prv"
 
-#: ../navit/navigation.c:205
+#: ../navit/navigation.c:228
 msgid "second"
 msgstr "drug"
 
-#: ../navit/navigation.c:207
+#: ../navit/navigation.c:230
 msgid "third"
 msgstr "tretj"
 
-#: ../navit/navigation.c:209
+#: ../navit/navigation.c:232
 msgid "fourth"
 msgstr "četrt"
 
-#: ../navit/navigation.c:211
+#: ../navit/navigation.c:234
 msgid "fifth"
 msgstr "pet"
 
-#: ../navit/navigation.c:213
+#: ../navit/navigation.c:236
 msgid "sixth"
 msgstr "šest"
 
-#: ../navit/navigation.c:255
+#: ../navit/navigation.c:278
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:257
+#: ../navit/navigation.c:280
 #, c-format
 msgid "in %d m"
 msgstr "Čez %d m"
 
-#: ../navit/navigation.c:261
+#: ../navit/navigation.c:284
 #, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:286
 #, c-format
 msgid "in %d meters"
 msgstr "Čez %d metrov"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:292
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometrov"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:294
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "Čez %d.%d kilometov"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:298
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -97,7 +97,7 @@ msgstr[1] "%d kilometer"
 msgstr[2] "%d kilometra"
 msgstr[3] "%d kilometri"
 
-#: ../navit/navigation.c:277
+#: ../navit/navigation.c:300
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -106,194 +106,195 @@ msgstr[1] "Čez %d kilometer"
 msgstr[2] "Čez %d kilometra"
 msgstr[3] "Čez %d kilometre"
 
-#: ../navit/navigation.c:1202
+#: ../navit/navigation.c:1228
 msgid "exit"
 msgstr "odcep"
 
-#: ../navit/navigation.c:1204
+#: ../navit/navigation.c:1230
 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:1234
+#: ../navit/navigation.c:1260
 #, 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:1238
+#: ../navit/navigation.c:1264
 #, 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:1242
+#: ../navit/navigation.c:1268
 #, 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:1246
+#: ../navit/navigation.c:1272
 #, 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:1253
+#: ../navit/navigation.c:1279
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1274
+#: ../navit/navigation.c:1300
 msgid "right"
 msgstr "desno"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1313
+#: ../navit/navigation.c:1339
 msgid "left"
 msgstr "levo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1320
+#: ../navit/navigation.c:1346
 msgid "easily "
 msgstr "rahlo "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1325
+#: ../navit/navigation.c:1351
 msgid "strongly "
 msgstr "ostro "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1329
+#: ../navit/navigation.c:1355
 msgid "unknown "
 msgstr "neznano "
 
-#: ../navit/navigation.c:1336
+#: ../navit/navigation.c:1362
 msgid "When possible, please turn around"
 msgstr "Obrnite čim bo to mogoče"
 
-#: ../navit/navigation.c:1346
+#: ../navit/navigation.c:1372
 msgid "Enter the roundabout soon"
 msgstr "Kmalu zapeljite v krožišče"
 
-#: ../navit/navigation.c:1349
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1376
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Čez %s zapeljite v krožišče"
 
-#: ../navit/navigation.c:1364
+#: ../navit/navigation.c:1391
 #, c-format
 msgid "Leave the roundabout at the %s exit"
 msgstr "Krožišče zapustite pri %sem izvozu"
 
-#: ../navit/navigation.c:1367
+#: ../navit/navigation.c:1394
 #, c-format
 msgid "then leave the roundabout at the %s exit"
 msgstr "nato zapustite krožišče pri %sem izvozu"
 
-#: ../navit/navigation.c:1377
+#: ../navit/navigation.c:1404
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Ostanite na tej cesti naslednjih %s"
 
-#: ../navit/navigation.c:1381
+#: ../navit/navigation.c:1408
 msgid "soon"
 msgstr "kmalu"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1418
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Zavijte na %2$s v %1$so cesto"
 
-#: ../navit/navigation.c:1394 ../navit/navigation.c:1408
+#: ../navit/navigation.c:1421 ../navit/navigation.c:1435
 #, c-format
 msgid "after %i roads"
 msgstr "čez %i cest"
 
-#: ../navit/navigation.c:1397
+#: ../navit/navigation.c:1424
 msgid "now"
 msgstr "sedaj"
 
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1432
 #, 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:1416
+#: ../navit/navigation.c:1443
 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:1446
+#: ../navit/navigation.c:1473
 #, 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:1449
+#: ../navit/navigation.c:1476
 #, 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:1454
+#: ../navit/navigation.c:1481
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s ste na cilju"
 
-#: ../navit/navigation.c:1456
+#: ../navit/navigation.c:1483
 msgid "then you have reached your destination."
 msgstr "in ste na cilju."
 
-#: ../navit/navit.c:1049
+#: ../navit/navit.c:1141
 msgid "Position"
 msgstr "Položaj"
 
-#: ../navit/navit.c:1050
+#: ../navit/navit.c:1142
 msgid "Command"
 msgstr "Navodilo"
 
-#: ../navit/navit.c:1054
+#: ../navit/navit.c:1146
 msgid "Length"
 msgstr "Razdalja"
 
-#: ../navit/navit.c:1058 ../navit/navit.c:1083
+#: ../navit/navit.c:1150 ../navit/navit.c:1175
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1062 ../navit/navit.c:1087
+#: ../navit/navit.c:1154 ../navit/navit.c:1179
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1068
+#: ../navit/navit.c:1160
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1080
+#: ../navit/navit.c:1172
 msgid "Destination Length"
 msgstr "Razdalja do cilja"
 
-#: ../navit/navit.c:1093
+#: ../navit/navit.c:1185
 msgid "Destination Time"
 msgstr "Čas do cilja"
 
-#: ../navit/navit.c:1126 ../navit/gui/gtk/gui_gtk_action.c:210
+#: ../navit/navit.c:1218 ../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:1831
+#: ../navit/gui/internal/gui_internal.c:2095
 msgid "Set as position"
 msgstr "Nastavi kot položaj"
 
 #: ../navit/popup.c:219 ../navit/popup.c:273
-#: ../navit/gui/internal/gui_internal.c:1827
+#: ../navit/gui/internal/gui_internal.c:2091
 msgid "Set as destination"
 msgstr "Nastavi kot cilj"
 
 #: ../navit/popup.c:220 ../navit/popup.c:274
-#: ../navit/gui/internal/gui_internal.c:1835
+#: ../navit/gui/internal/gui_internal.c:2099
 msgid "Add as bookmark"
 msgstr "Dodaj zaznamek"
 
@@ -1550,8 +1551,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:2730
 msgid "Country"
 msgstr "Država"
 
@@ -1562,9 +1563,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:2433
-#: ../navit/gui/internal/gui_internal.c:2462
-#: ../navit/gui/internal/gui_internal.c:2595
+#: ../navit/gui/internal/gui_internal.c:2709
+#: ../navit/gui/internal/gui_internal.c:2738
+#: ../navit/gui/internal/gui_internal.c:2871
 msgid "Town"
 msgstr "Mesto"
 
@@ -1574,127 +1575,131 @@ msgid "District"
 msgstr "Regija"
 
 #: ../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:2690
+#: ../navit/gui/internal/gui_internal.c:2699
 msgid "Street"
 msgstr "Ulica"
 
-#: ../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 "Številka"
 
-#: ../navit/gui/gtk/destination.c:422
+#: ../navit/gui/gtk/destination.c:420
 msgid "Enter Destination"
 msgstr "Vpišite cilj"
 
-#: ../navit/gui/gtk/destination.c:431
+#: ../navit/gui/gtk/destination.c:429
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: ../navit/gui/gtk/destination.c:433
+#: ../navit/gui/gtk/destination.c:431
 msgid "City"
 msgstr "Mesto"
 
-#: ../navit/gui/gtk/destination.c:436
+#: ../navit/gui/gtk/destination.c:434
 msgid "District/Township"
 msgstr "Regija"
 
-#: ../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 "Zemljevid"
 
-#: ../navit/gui/gtk/destination.c:465
+#: ../navit/gui/gtk/destination.c:463
 msgid "Bookmark"
 msgstr "Zaznamek"
 
-#: ../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 "Cilj"
 
-#: ../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:2792
+#: ../navit/gui/internal/gui_internal.c:3085
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:182
+#: ../navit/gui/gtk/gui_gtk_action.c:197
 msgid "Route"
 msgstr "Načrt poti"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:183
+#: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
 msgstr "Prejšnji cilji"
 
-#: ../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:2195
+#: ../navit/gui/internal/gui_internal.c:2847
 msgid "Bookmarks"
 msgstr "Zaznamki"
 
-#: ../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:2749
+#: ../navit/gui/internal/gui_internal.c:2794
 msgid "Layout"
 msgstr "Razporeditev"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:187
+#: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projekcija"
 
-#: ../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:3028
+#: ../navit/gui/internal/gui_internal.c:3093
 msgid "Vehicle"
 msgstr "Vozilo"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:189
+#: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "Pomanjšava"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:190
+#: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
 msgstr "Povečava"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:191
+#: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
 msgstr "Preračunaj"
 
-#: ../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 "Podrobnosti"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:198
+#: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
 msgstr "Ustavi navigacijo"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Preizkus"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:200
+#: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr "_Izhod"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:207
+#: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:208
+#: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr "Ostani na cesti"
 
-#: ../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:3067
 msgid "Northing"
 msgstr "Sever zgoraj"
 
-#: ../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:2804
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
-#: ../navit/gui/gtk/gui_gtk_action.c:222
+#: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
 msgstr "Podatki"
 
@@ -1743,12 +1748,12 @@ msgid "No"
 msgstr "Ne"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2535
+#: ../navit/gui/internal/gui_internal.c:2811
 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:2817
 msgid "3D"
 msgstr "3D"
 
@@ -1765,95 +1770,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:1184
+#: ../navit/gui/internal/gui_internal.c:1321
 msgid "Back to map"
 msgstr "Nazaj na zemljevid"
 
-#: ../navit/gui/internal/gui_internal.c:1189
+#: ../navit/gui/internal/gui_internal.c:1330
 msgid "Main Menu"
 msgstr "Glavni meni"
 
-#: ../navit/gui/internal/gui_internal.c:1640
-#: ../navit/gui/internal/gui_internal.c:1840
+#: ../navit/gui/internal/gui_internal.c:1450
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1600
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1904
+#: ../navit/gui/internal/gui_internal.c:2104
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1797
+#: ../navit/gui/internal/gui_internal.c:2061
 msgid "Streets"
 msgstr "Ceste"
 
-#: ../navit/gui/internal/gui_internal.c:1813
+#: ../navit/gui/internal/gui_internal.c:2077
 msgid "View in Browser"
 msgstr "Prikaz v brskalniku"
 
-#: ../navit/gui/internal/gui_internal.c:1819
+#: ../navit/gui/internal/gui_internal.c:2083
 msgid "View Attributes"
 msgstr "Prikaz lastnosti"
 
-#: ../navit/gui/internal/gui_internal.c:1854
+#: ../navit/gui/internal/gui_internal.c:2118
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: ../navit/gui/internal/gui_internal.c:1967
+#: ../navit/gui/internal/gui_internal.c:2231
 #, c-format
 msgid "Bookmark %s"
 msgstr "Zaznamuj %s"
 
-#: ../navit/gui/internal/gui_internal.c:2523
+#: ../navit/gui/internal/gui_internal.c:2799
 msgid "Window Mode"
 msgstr "Okenski način"
 
-#: ../navit/gui/internal/gui_internal.c:2569
-#: ../navit/gui/internal/gui_internal.c:2758
+#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:3133
 msgid "Actions"
 msgstr "Dejanja"
 
-#: ../navit/gui/internal/gui_internal.c:2580
+#: ../navit/gui/internal/gui_internal.c:2856
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2590
+#: ../navit/gui/internal/gui_internal.c:2866
 msgid "Vehicle Position"
 msgstr "Položaj vozila"
 
-#: ../navit/gui/internal/gui_internal.c:2599
+#: ../navit/gui/internal/gui_internal.c:2875
 msgid "Quit"
 msgstr "Izhod"
 
-#: ../navit/gui/internal/gui_internal.c:2605
+#: ../navit/gui/internal/gui_internal.c:2881
 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:2897
+#: ../navit/gui/internal/gui_internal.c:3089
 msgid "Maps"
 msgstr "Zemljevidi"
 
-#: ../navit/gui/internal/gui_internal.c:2678
-#: ../navit/gui/internal/gui_internal.c:2722
+#: ../navit/gui/internal/gui_internal.c:2941
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2975
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2999
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3005
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3011
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3053
+#: ../navit/gui/internal/gui_internal.c:3097
 msgid "Rules"
 msgstr "Pravila"
 
-#: ../navit/gui/internal/gui_internal.c:2686
+#: ../navit/gui/internal/gui_internal.c:3061
 msgid "Lock on road"
 msgstr "Prikleni na cesto"
 
-#: ../navit/gui/internal/gui_internal.c:2698
+#: ../navit/gui/internal/gui_internal.c:3073
 msgid "Map follows Vehicle"
 msgstr "Zemljevid sledi vozilu"
 
-#: ../navit/gui/internal/gui_internal.c:2708
-#: ../navit/gui/internal/gui_internal.c:2761
+#: ../navit/gui/internal/gui_internal.c:3083
+#: ../navit/gui/internal/gui_internal.c:3141
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:3131
 msgid "Main menu"
 msgstr "Glavni meni"
 
-#: ../navit/gui/internal/gui_internal.c:2764
+#: ../navit/gui/internal/gui_internal.c:3137
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3144
 msgid "Tools"
 msgstr "Orodja"
author	kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>	2009-03-12 13:15:19 +0000
committer	kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>	2009-03-12 13:15:19 +0000
commit	de2828d34c8e9637774d1b3d95e0744d0fb55ded (patch)
tree	959711ce95934a575721b35e5f8cc8574e9f3cbf /po
parent	0062a3a56f52666cead9d3c00a43e049d1216ba0 (diff)
download	navit-de2828d34c8e9637774d1b3d95e0744d0fb55ded.tar.gz