Added Galician translation, updated other translations

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

36 files changed, 11052 insertions, 8062 deletions

diff --git a/po/af.po.in b/po/af.po.in
index ae314bbb9..030db689f 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-15 11:56+0000\n"
-"Last-Translator: Kobus <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 11:24+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Afrikaans <af@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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,304 +29,309 @@ msgstr "Loop vanaf bron gids\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "verander '%s' na '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "nulste"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "eerste"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "tweede"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "derde"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "vierde"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "vyfde"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sesde"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "nulste uitgang"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "eerste  uitgang"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "tweede uitgang"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "derde uitgang"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "vierde uitgang"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "vyfde uitgang"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sesde uitgang"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "na %d.%d kilometer"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "een kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "na een kilometer"
 msgstr[1] "na %d kilometer"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "afrit"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "na die afrit"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sin die straat %s%s%s in"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sin die %s%s%s|"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sin die %s%s%s|"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sin die %s%s%s|"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sin die %s in"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "regs"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "maklik "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "skerp "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr "regtig sterk "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "onbekend "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Draai asseblief om wanneer moontlik"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Gaan kortliks in die sirkel in"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "In %s, gaan in die sirkel in"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Verlaat die sirkel by die %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "verlaat dan die sirkel by die %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Volg die pad vir die volgende %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "kortliks"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem die %1$s pad na %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "na %i paaie"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nou"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "neem dan die %1$s pad na %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "fout"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Draai %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "draai dan %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Jy het jou bestemming bereik %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "dan het jy jou bestemming bereik."
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Posisie"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Bevel"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Lengte"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "kilometer"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "meter"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tyd"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Bestemming lengte"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Bestemming tyd"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Padkaart"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Stel as posisie"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Stel as bestemming"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Voeg as boekmerk by"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skerm koordinaat : %d %d"
@@ -1561,6 +1566,10 @@ msgstr "Zambië"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr "* Onbekend, voeg is_in merkers by daai stede"
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1575,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Land"
 
@@ -1586,9 +1595,9 @@ msgstr "Pos"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Dorp"
 
@@ -1599,8 +1608,8 @@ msgstr "Distrik"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Straat"
 
@@ -1637,12 +1646,13 @@ msgid "Destination"
 msgstr "Bestemming"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Skerm"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Roete"
 
@@ -1651,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Voorige bestemmings"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Boekmerke"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Uitleg"
 
@@ -1667,8 +1677,8 @@ msgid "Projection"
 msgstr "Skatting"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Voertuig"
 
@@ -1709,7 +1719,7 @@ msgid "Lock on Road"
 msgstr "Koppel aan Pad"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Draai kaart noord"
 
@@ -1718,7 +1728,7 @@ msgid "Autozoom"
 msgstr "Outozoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Volskerm"
 
@@ -1771,12 +1781,12 @@ msgid "No"
 msgstr "Nee"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1793,70 +1803,79 @@ msgstr "Roete %4.0fkm %02d:%02d aankomstyd"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Roete 0000km  0+00:00 aankomstyd"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Terug kaart toe"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Hoofkieslys"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Hulp"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Terug"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Belangpunte"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Strate"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Besigtig in blaaier"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Besigtig eienskappe"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Beloer op kaart"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Boekmerk %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Venster Modus"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Aksies"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Kaart punt"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Voertuig posisie"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Verlaat"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1864,54 +1883,54 @@ msgstr ""
 "Stop\n"
 "Navigasie"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Kaarte"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Wys Satelliet Inligting"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Wys NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Maak aktief"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Wys satelliet inligting"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Wys NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Reëls"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Koppel aan pad"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Kaart volg voertuig"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Instellings"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Hoofkieslys"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1919,6 +1938,19 @@ msgstr ""
 "Wys\n"
 "Kaart"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Gereedskap"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr "Hoë profiel"
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Beskrywing"
diff --git a/po/ar.po.in b/po/ar.po.in
index 291b1e092..2846f9ffa 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-13 15:35+0000\n"
-"Last-Translator: metehyi <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 12:34+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,93 +30,93 @@ msgstr "جاري التنفيذ من المجلد المصدر\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "وضع حالة  '%s' إلى '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "(الرقم) صفر"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "الأوّل"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "الثّاني"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "الثّالث"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "الرّابع"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "الخامس"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "السادس"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "المخرج ذو الرقم صفر"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "المخرج الأول"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "المخرج الثاني"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "المخرج الثالث"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "المخرج الرابع"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "المخرج الخامس"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "المخرج السادس"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d م"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "بعد %d متر"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d متر"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "بعد %d متر"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d كلم"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "بعد %d%d كلم"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -127,7 +127,7 @@ msgstr[3] "%d كلم"
 msgstr[4] "%d كلم"
 msgstr[5] "%d كلم"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -138,204 +138,209 @@ msgstr[3] "بعد %d كلم"
 msgstr[4] "بعد %d كلم"
 msgstr[5] "بعد %d كلم"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "خروج"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s إلى داخل الشارع %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sإلى داخل %s%s%s|صفة الذكر"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sإلى داخل %s%s%s|صفة الأنثى"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sإلى داخل %s%s%s|غير محدد الجنس"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s إلى داخل %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "إلى اليمين"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "إلى اليسار"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "بسهولة "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "بكل شدة "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "غير معروف "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "حيث ممكن الرجاء اللف"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "قريباً الدخول إلى المستديرة"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "بعد %s ، أدخل المسستديرة"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "أخرج من المستديرة عند الــ  %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "ثم أخرج من المستديرة عند الــ%s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "تابع الطريق لل- %s التالية"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "قريبا"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "خذ الطريق %1$s إلى ال%2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "بعد %i طرقات"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "الآن"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "ثم خذ الطريق %1$s إلى ال- %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "حوّل %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "ثم حوّل %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "لقد وصلت إلى هدفك %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "و بعدها تكون قد وصلت إلى هدفك"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "الموقع"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "الأمر"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "الطول"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "كلم"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "م."
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "الوقت"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "بُعد الهدف"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "الوقت في مكان الوصول"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "سجل خريطة الطريق"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "عين كموقع حالي"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "عيّن كهدف"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "أضف كعلامة مراجعة"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "الموقع 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "إحداثيات الشاشة :%d %d"
@@ -1570,6 +1575,10 @@ msgstr "زامبيا"
 msgid "Zimbabwe"
 msgstr "زيمبابوي"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1584,7 +1593,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "الدولة"
 
@@ -1595,9 +1604,9 @@ msgstr "بريدي"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "البلدة"
 
@@ -1608,8 +1617,8 @@ msgstr "حي"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "الشارع"
 
@@ -1646,12 +1655,13 @@ msgid "Destination"
 msgstr "الهدف"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "المظهار"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "الطريق"
 
@@ -1660,14 +1670,14 @@ msgid "Former Destinations"
 msgstr "الأهداف السابقة"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "إشارات مرجعية"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "التصميم"
 
@@ -1676,8 +1686,8 @@ msgid "Projection"
 msgstr "الإسقاط"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "وسيلة التنقل"
 
@@ -1718,7 +1728,7 @@ msgid "Lock on Road"
 msgstr "إقفال على الطريق"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "شمالي دائم"
 
@@ -1727,7 +1737,7 @@ msgid "Autozoom"
 msgstr "تكبير/تصغير تلقائي"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "ملء الشاشة"
 
@@ -1780,12 +1790,12 @@ msgid "No"
 msgstr "لا"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "ثنائي الأبعاد"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "ثلاثي الأبعاد"
 
@@ -1802,123 +1812,132 @@ msgstr "Route %4.0fكلم    %02d:%02d ETA"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "الطريك 0000كلم  0+00:00 ETA"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "إرجع إلى الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "اللائحة الرئيسية"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "المساعدة"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "السابق"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "مواقع ذات أهمية"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "الشوارع"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "أعرض في المتصفح"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "أعرض الصفات"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "أعرض على الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "علّم %s كإشارة مرجعية"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "نمط النافذة"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "أفعال"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "النقطة على الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "موقع وسيلة التنقل"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "أخرج"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr "قفّ"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "الخرائط"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "أعرض حالة القمر الإسطناعي"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "أعرض المعطيات NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "عيّن كــفعلي"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "أعرض حالة القمر الإسطناعي"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "أعرض المعطيات NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "القواعد"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "إقفال على الطريق"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "الخريطة تتبع وسيلة التنقل"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "الإعدادات"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "اللائحة الرئيسية"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1926,6 +1945,19 @@ msgstr ""
 "أعرض\n"
 "الخريطة"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "العدة"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/bg.po.in b/po/bg.po.in
index 8d500b5c7..0925849bb 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -7,275 +7,331 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-03 17:37+0000\n"
-"Last-Translator: Anton Todorov <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 14:19+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/main.c:231
+#, c-format
+msgid "Running from source directory\n"
+msgstr ""
+
+#: ../navit/main.c:263
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr ""
+
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "нулев"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "първи"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "втори"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "трети"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "четвърти"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "пети"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "шести"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "няма изход"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "първия изход"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "втория изход"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "третия изход"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "четвъртия изход"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "петия изход"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "шестия изход"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d м"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "след %d м"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d метра"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "след %d метра"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d километра"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "след %d.%d километра"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "един километър"
 msgstr[1] "%d километра"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "след един километър"
 msgstr[1] "след %d километра"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "изход"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1298
+#, 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:1302
+#, 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:1306
+#, 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:1310
+#, 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:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "надясно"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "наляво"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "леко "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "силно "
 
-#: ../navit/navigation.c:1402
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
+msgid "unknown "
+msgstr ""
+
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Когато е възможно обърнете"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Скоро навлизате в кръгово"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "След %s влезте в кръговото"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Излезте от кръговото на %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "след това излезте от кръговото на %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Следвайте пътя през следващите %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "скоро"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "след %i пресечки"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "сега"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "тогава хванете пътя %1$s към %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Завийте %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "тогава завийте %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Достигнахте до целта %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "след това пристигате на местоназначението"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Позиция"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Команда"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Дължина"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "км"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "м"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Време"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Разстояние до целта"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Време до целта"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Пътна книга"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Установете като позиция"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Задай като цел"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Добави като Отметка"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Точка 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Координати на екрана: %d %d"
@@ -1510,13 +1566,25 @@ msgstr "Замбия"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
 msgstr "Автомобил"
 
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso2"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso3"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Държава"
 
@@ -1527,9 +1595,9 @@ msgstr "Пощенски"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Град"
 
@@ -1540,8 +1608,8 @@ msgstr "Окръг"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Улица"
 
@@ -1578,12 +1646,13 @@ msgid "Destination"
 msgstr "Местоназначение"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Показване"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Маршрут"
 
@@ -1592,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Предишни Местоназначения"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Отметки"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Изглед"
 
@@ -1608,8 +1677,8 @@ msgid "Projection"
 msgstr "Проекция"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Превозно средство"
 
@@ -1649,8 +1718,17 @@ msgstr "Курсор"
 msgid "Lock on Road"
 msgstr "Придържай към пътя"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr ""
+
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Цял екран"
 
@@ -1698,65 +1776,106 @@ msgstr "З"
 msgid "NW"
 msgstr "СЗ"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
+msgid "No"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
+#: ../navit/gui/internal/gui_internal.c:2948
+msgid "2D"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
+#: ../navit/gui/internal/gui_internal.c:2954
+msgid "3D"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
+#, c-format
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
+msgid "Route 0000km  0+00:00 ETA"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Обратно към картата"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Основно меню"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Помощ"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Назад"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Улици"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Виж в Браузър"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Виж Атрибутите"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Виж на картата"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Отметка %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Режим Прозорец"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Действия"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Точка на карта"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Позиция на автомобил"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Излез"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1764,50 +1883,54 @@ msgstr ""
 "Спри\n"
 "Навигацията"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Карти"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Покажи Състояние на Сателити"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Покажи NMEA Данни"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Укажи като активен"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Покажи състояние на Сателити"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Покажи NMEA Данни"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Правила"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3198
+msgid "Lock on road"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Картата следва Автомобила"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Главно меню"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1815,110 +1938,19 @@ msgstr ""
 "Покажи\n"
 "Картата"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Инструменти"
 
-#: ../navit/main.c:231
-#, c-format
-msgid "Running from source directory\n"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
 msgstr ""
 
-#: ../navit/main.c:263
-#, c-format
-msgid "setting '%s' to '%s'\n"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
 
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
-#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
-#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
-#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
-#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
-msgid "unknown "
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127
-msgid "Iso2"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127
-msgid "Iso3"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
-msgid "Northing"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
-msgid "No"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
-msgid "2D"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
-msgid "3D"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
-#, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
-msgid "Route 0000km  0+00:00 ETA"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
-msgid "POIs"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:3089
-msgid "Lock on road"
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
 msgstr ""
diff --git a/po/ca.po.in b/po/ca.po.in
index c10f2101d..af8efab0a 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-12 11:02+0000\n"
-"Last-Translator: Sid <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 18:28+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -24,463 +24,333 @@ msgstr ""
 msgid "Running from source directory\n"
 msgstr "Executant-se des de directori arrel\n"
 
-#: ../navit/navigation.c:242
+#: ../navit/main.c:263
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr ""
+
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "primera"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "segona"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "tercera"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "quarta"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "cinquena"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sisena"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "primera sortida"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "segona sortida"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "tercera sortida"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "cuarta sortida"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "cinquena sortida"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sisena sortida"
 
-#: ../navit/navigation.c:1268
-msgid "exit"
-msgstr "sortir"
-
-#. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
-msgid "right"
-msgstr "dreta"
-
-#. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
-msgid "left"
-msgstr "esquerra"
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
-msgid "easily "
-msgstr "fàcilment "
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
-msgid "unknown "
-msgstr "desconegut "
-
-#: ../navit/navigation.c:1464
-msgid "now"
-msgstr "ara"
-
-#: ../navit/navigation.c:1483
-msgid "error"
-msgstr "error"
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr "Posició"
-
-#: ../navit/navit.c:1165
-msgid "Command"
-msgstr "Ordre"
-
-#: ../navit/navit.c:1169
-msgid "Length"
-msgstr "Durada"
-
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
-msgid "m"
-msgstr "m"
-
-#: ../navit/navit.c:1183
-msgid "Time"
-msgstr "Temps"
-
-#. 020
-#: ../navit/country.c:39
-msgid "Andorra"
-msgstr "Andorra"
-
-#. 784
-#: ../navit/country.c:40
-msgid "United Arab Emirates"
-msgstr "Unió dels Emirats Àrabs"
-
-#. 004
-#: ../navit/country.c:41
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-#. 008
-#: ../navit/country.c:44
-msgid "Albania"
-msgstr "Albània"
-
-#. 530
-#: ../navit/country.c:46
-msgid "Netherlands Antilles"
-msgstr "Antilles Holandeses"
-
-#. 024
-#: ../navit/country.c:47
-msgid "Angola"
-msgstr "Angola"
-
-#. 032
-#: ../navit/country.c:49
-msgid "Argentina"
-msgstr "Argentina"
-
-#. 040
-#: ../navit/country.c:51
-msgid "Austria"
-msgstr "Àustria"
-
-#. 070
-#: ../navit/country.c:56
-msgid "Bosnia and Herzegovina"
-msgstr "Bòsnia i Hercegovina"
-
-#. 052
-#: ../navit/country.c:57
-msgid "Barbados"
-msgstr "Barbados"
-
-#. 050
-#: ../navit/country.c:58
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#. 056
-#: ../navit/country.c:59
-msgid "Belgium"
-msgstr "Bèlgica"
-
-#. 100
-#: ../navit/country.c:61
-msgid "Bulgaria"
-msgstr "Bulgària"
-
-#. 108
-#: ../navit/country.c:63
-msgid "Burundi"
-msgstr "Burundi"
-
-#. 060
-#: ../navit/country.c:66
-msgid "Bermuda"
-msgstr "Illes Bermudes"
-
-#. 096
-#: ../navit/country.c:67
-msgid "Brunei Darussalam"
-msgstr "Brunei"
-
-#. 068
-#: ../navit/country.c:68
-msgid "Bolivia"
-msgstr "Bolívia"
-
-#. 076
-#: ../navit/country.c:69
-msgid "Brazil"
-msgstr "Brasil"
-
-#. 064
-#: ../navit/country.c:71
-msgid "Bhutan"
-msgstr "Bhutan"
-
-#. 072
-#: ../navit/country.c:73
-msgid "Botswana"
-msgstr "Botswana"
-
-#. 124
-#: ../navit/country.c:76
-msgid "Canada"
-msgstr "Canadà"
-
-#. 180
-#: ../navit/country.c:78
-msgid "Congo, Democratic Republic of the"
-msgstr "Congo, República Democràtica del"
-
-#. 178
-#: ../navit/country.c:80
-msgid "Congo"
-msgstr "Congo"
-
-#. 756
-#: ../navit/country.c:81
-msgid "Switzerland"
-msgstr "Suïssa"
-
-#. 384
-#: ../navit/country.c:82
-msgid "Cote d'Ivoire"
-msgstr "Costa d'Ivori"
-
-#. 184
-#: ../navit/country.c:83
-msgid "Cook Islands"
-msgstr "Illes Cook"
-
-#. 156
-#: ../navit/country.c:86
-msgid "China"
-msgstr "Xina"
-
-#. 170
-#: ../navit/country.c:87
-msgid "Colombia"
-msgstr "Colòmbia"
-
-#. 188
-#: ../navit/country.c:88
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#. 192
-#: ../navit/country.c:89
-msgid "Cuba"
-msgstr "Cuba"
-
-#: ../navit/main.c:263
-#, c-format
-msgid "setting '%s' to '%s'\n"
-msgstr ""
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr ""
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1266
+msgid "exit"
+msgstr "sortir"
+
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
+#. TRANSLATORS: right, as in 'Turn right'
+#: ../navit/navigation.c:1338
+msgid "right"
+msgstr "dreta"
+
+#. TRANSLATORS: left, as in 'Turn left'
+#: ../navit/navigation.c:1377
+msgid "left"
+msgstr "esquerra"
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr "fàcilment "
+
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr ""
 
-#: ../navit/navigation.c:1402
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
+msgid "unknown "
+msgstr "desconegut "
+
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr ""
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1465
+msgid "now"
+msgstr "ara"
+
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
+#: ../navit/navigation.c:1484
+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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr "Posició"
+
+#: ../navit/navit.c:1175
+msgid "Command"
+msgstr "Ordre"
+
+#: ../navit/navit.c:1179
+msgid "Length"
+msgstr "Durada"
+
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr ""
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
+msgid "m"
+msgstr "m"
+
+#: ../navit/navit.c:1193
+msgid "Time"
+msgstr "Temps"
+
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
 
+#. 020
+#: ../navit/country.c:39
+msgid "Andorra"
+msgstr "Andorra"
+
+#. 784
+#: ../navit/country.c:40
+msgid "United Arab Emirates"
+msgstr "Unió dels Emirats Àrabs"
+
+#. 004
+#: ../navit/country.c:41
+msgid "Afghanistan"
+msgstr "Afganistan"
+
 #. 028
 #: ../navit/country.c:42
 msgid "Antigua and Barbuda"
@@ -491,21 +361,46 @@ msgstr ""
 msgid "Anguilla"
 msgstr ""
 
+#. 008
+#: ../navit/country.c:44
+msgid "Albania"
+msgstr "Albània"
+
 #. 051
 #: ../navit/country.c:45
 msgid "Armenia"
 msgstr ""
 
+#. 530
+#: ../navit/country.c:46
+msgid "Netherlands Antilles"
+msgstr "Antilles Holandeses"
+
+#. 024
+#: ../navit/country.c:47
+msgid "Angola"
+msgstr "Angola"
+
 #. 010
 #: ../navit/country.c:48
 msgid "Antarctica"
 msgstr ""
 
+#. 032
+#: ../navit/country.c:49
+msgid "Argentina"
+msgstr "Argentina"
+
 #. 016
 #: ../navit/country.c:50
 msgid "American Samoa"
 msgstr ""
 
+#. 040
+#: ../navit/country.c:51
+msgid "Austria"
+msgstr "Àustria"
+
 #. 036
 #: ../navit/country.c:52
 msgid "Australia"
@@ -526,16 +421,46 @@ msgstr ""
 msgid "Azerbaijan"
 msgstr ""
 
+#. 070
+#: ../navit/country.c:56
+msgid "Bosnia and Herzegovina"
+msgstr "Bòsnia i Hercegovina"
+
+#. 052
+#: ../navit/country.c:57
+msgid "Barbados"
+msgstr "Barbados"
+
+#. 050
+#: ../navit/country.c:58
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#. 056
+#: ../navit/country.c:59
+msgid "Belgium"
+msgstr "Bèlgica"
+
 #. 854
 #: ../navit/country.c:60
 msgid "Burkina Faso"
 msgstr ""
 
+#. 100
+#: ../navit/country.c:61
+msgid "Bulgaria"
+msgstr "Bulgària"
+
 #. 048
 #: ../navit/country.c:62
 msgid "Bahrain"
 msgstr ""
 
+#. 108
+#: ../navit/country.c:63
+msgid "Burundi"
+msgstr "Burundi"
+
 #. 204
 #: ../navit/country.c:64
 msgid "Benin"
@@ -546,16 +471,46 @@ msgstr ""
 msgid "Saint Barthelemy"
 msgstr ""
 
+#. 060
+#: ../navit/country.c:66
+msgid "Bermuda"
+msgstr "Illes Bermudes"
+
+#. 096
+#: ../navit/country.c:67
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+#. 068
+#: ../navit/country.c:68
+msgid "Bolivia"
+msgstr "Bolívia"
+
+#. 076
+#: ../navit/country.c:69
+msgid "Brazil"
+msgstr "Brasil"
+
 #. 044
 #: ../navit/country.c:70
 msgid "Bahamas"
 msgstr ""
 
+#. 064
+#: ../navit/country.c:71
+msgid "Bhutan"
+msgstr "Bhutan"
+
 #. 074
 #: ../navit/country.c:72
 msgid "Bouvet Island"
 msgstr ""
 
+#. 072
+#: ../navit/country.c:73
+msgid "Botswana"
+msgstr "Botswana"
+
 #. 112
 #: ../navit/country.c:74
 msgid "Belarus"
@@ -566,16 +521,46 @@ msgstr ""
 msgid "Belize"
 msgstr ""
 
+#. 124
+#: ../navit/country.c:76
+msgid "Canada"
+msgstr "Canadà"
+
 #. 166
 #: ../navit/country.c:77
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
+#. 180
+#: ../navit/country.c:78
+msgid "Congo, Democratic Republic of the"
+msgstr "Congo, República Democràtica del"
+
 #. 140
 #: ../navit/country.c:79
 msgid "Central African Republic"
 msgstr ""
 
+#. 178
+#: ../navit/country.c:80
+msgid "Congo"
+msgstr "Congo"
+
+#. 756
+#: ../navit/country.c:81
+msgid "Switzerland"
+msgstr "Suïssa"
+
+#. 384
+#: ../navit/country.c:82
+msgid "Cote d'Ivoire"
+msgstr "Costa d'Ivori"
+
+#. 184
+#: ../navit/country.c:83
+msgid "Cook Islands"
+msgstr "Illes Cook"
+
 #. 152
 #: ../navit/country.c:84
 msgid "Chile"
@@ -586,6 +571,26 @@ msgstr ""
 msgid "Cameroon"
 msgstr ""
 
+#. 156
+#: ../navit/country.c:86
+msgid "China"
+msgstr "Xina"
+
+#. 170
+#: ../navit/country.c:87
+msgid "Colombia"
+msgstr "Colòmbia"
+
+#. 188
+#: ../navit/country.c:88
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#. 192
+#: ../navit/country.c:89
+msgid "Cuba"
+msgstr "Cuba"
+
 #. 132
 #: ../navit/country.c:90
 msgid "Cape Verde"
@@ -1561,6 +1566,10 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1575,7 +1584,7 @@ msgid "Iso3"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr ""
 
@@ -1586,9 +1595,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr ""
 
@@ -1599,8 +1608,8 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr ""
 
@@ -1637,12 +1646,13 @@ msgid "Destination"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr ""
 
@@ -1651,14 +1661,14 @@ msgid "Former Destinations"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr ""
 
@@ -1667,8 +1677,8 @@ msgid "Projection"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr ""
 
@@ -1709,7 +1719,7 @@ msgid "Lock on Road"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr ""
 
@@ -1718,7 +1728,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr ""
 
@@ -1771,12 +1781,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1793,128 +1803,150 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/cs.po.in b/po/cs.po.in
index ef1d7ff67..3b0cec3a8 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-21 23:46+0200\n"
-"PO-Revision-Date: 2009-06-23 11:55+0000\n"
-"Last-Translator: Tomas Kukol <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 09:01+0000\n"
+"Last-Translator: KaZeR <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-06-25 21:48+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,93 +29,93 @@ msgstr "Běží ze zdrojového adresáře\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavuji '%s' na '%s\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "nultý"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "první"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "druhý"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "třetí"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "čtvrtý"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "pátý"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "šestý"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "nultý exit"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "první exit"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "druhý exit"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "třetí exit"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "čtvrtý exit"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "pátý exit"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "šestý exit"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "za %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metrů"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "za %d metrů"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometrů"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrů"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -123,7 +123,7 @@ msgstr[0] "%d kilometr"
 msgstr[1] "%d kilometry"
 msgstr[2] "%d  kilometrů"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -131,149 +131,149 @@ msgstr[0] "za %d  kilometr"
 msgstr[1] "za %d  kilometry"
 msgstr[2] "za %d kilometrů"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "konec"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "na přivadeč"
 
 #. 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:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sna %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "vpravo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "vlevo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "mírně "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "silně "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1392
 msgid "really strongly "
 msgstr "opravdu silně "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1398
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "neurčitě "
 
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Až to bude možné, otočte se"
 
-#: ../navit/navigation.c:1415
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Brzy najeďte na kruhový objezd"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1419
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Za %s, najeďte na kruhový objezd"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Opusťte kruhový objezd na výjezdu %s"
 
-#: ../navit/navigation.c:1437
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "pak opusťte kruhový objezd na výjezdu %s"
 
-#: ../navit/navigation.c:1447
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte po další %s"
 
-#: ../navit/navigation.c:1451
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "brzy"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1461
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Jeďte na %1$s silnici %2$s"
 
-#: ../navit/navigation.c:1464 ../navit/navigation.c:1478
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "za %i silnice"
 
-#: ../navit/navigation.c:1467
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nyní"
 
-#: ../navit/navigation.c:1475
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "pak jeďte %1$s silnici %2$s"
 
-#: ../navit/navigation.c:1486
+#: ../navit/navigation.c:1484
 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:1516
+#: ../navit/navigation.c:1514
 #, 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:1519
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "pak odbočte %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1524
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s dorazíte do cíle"
 
-#: ../navit/navigation.c:1526
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "pak budete v cíli."
 
@@ -314,17 +314,17 @@ msgid "Roadbook"
 msgstr "Itinerář"
 
 #: ../navit/popup.c:278 ../navit/popup.c:347
-#: ../navit/gui/internal/gui_internal.c:2124
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Použít jako pozici"
 
 #: ../navit/popup.c:279 ../navit/popup.c:348
-#: ../navit/gui/internal/gui_internal.c:2120
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Nastavit jako cíl"
 
 #: ../navit/popup.c:280 ../navit/popup.c:349
-#: ../navit/gui/internal/gui_internal.c:2128
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Použít jako záložku"
 
@@ -1586,7 +1586,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Země"
 
@@ -1597,9 +1597,9 @@ msgstr "Poštovní"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2854
-#: ../navit/gui/internal/gui_internal.c:2883
-#: ../navit/gui/internal/gui_internal.c:3018
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Město"
 
@@ -1610,8 +1610,8 @@ msgstr "Kraj/Okres"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2835
-#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Ulice"
 
@@ -1648,13 +1648,13 @@ msgid "Destination"
 msgstr "Cíl"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2939
-#: ../navit/gui/internal/gui_internal.c:3232
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Zobrazit"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
-#: ../navit/gui/internal/gui_internal.c:4592
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Trasa"
 
@@ -1663,14 +1663,14 @@ msgid "Former Destinations"
 msgstr "Minulé cíle"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2224
-#: ../navit/gui/internal/gui_internal.c:2994
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Záložky"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2894
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Rozvržení"
 
@@ -1679,8 +1679,8 @@ msgid "Projection"
 msgstr "Projekce"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3175
-#: ../navit/gui/internal/gui_internal.c:3240
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Vozidlo"
 
@@ -1721,7 +1721,7 @@ msgid "Lock on Road"
 msgstr "Jet jen po silnici"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3214
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Severně"
 
@@ -1730,7 +1730,7 @@ msgid "Autozoom"
 msgstr "Autozoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2951
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
@@ -1783,12 +1783,12 @@ msgid "No"
 msgstr "Ne"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2958
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2964
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1805,79 +1805,79 @@ 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:1334
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Zpět na mapu"
 
-#: ../navit/gui/internal/gui_internal.c:1343
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Hlavní menu"
 
-#: ../navit/gui/internal/gui_internal.c:1460
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../navit/gui/internal/gui_internal.c:1610
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Zpět"
 
-#: ../navit/gui/internal/gui_internal.c:1916
-#: ../navit/gui/internal/gui_internal.c:2133
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Body zájmu"
 
-#: ../navit/gui/internal/gui_internal.c:2081
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:2089
+#: ../navit/gui/internal/gui_internal.c:2090
 msgid "House numbers"
 msgstr "Čísla domů"
 
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Zobrazit v prohlížeči"
 
-#: ../navit/gui/internal/gui_internal.c:2112
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Zobrazit atributy"
 
-#: ../navit/gui/internal/gui_internal.c:2147
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Zobrazit na mapě"
 
-#: ../navit/gui/internal/gui_internal.c:2260
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2819
-#: ../navit/gui/internal/gui_internal.c:2828
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
 msgid "House number"
 msgstr "Číslo domu"
 
-#: ../navit/gui/internal/gui_internal.c:2946
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "V okně"
 
-#: ../navit/gui/internal/gui_internal.c:2992
-#: ../navit/gui/internal/gui_internal.c:3280
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Akce"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Bod na mapě"
 
-#: ../navit/gui/internal/gui_internal.c:3013
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Poloha vozidla"
 
-#: ../navit/gui/internal/gui_internal.c:3022
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Konec"
 
-#: ../navit/gui/internal/gui_internal.c:3028
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1885,54 +1885,54 @@ msgstr ""
 "Ukonči\n"
 "Navigaci"
 
-#: ../navit/gui/internal/gui_internal.c:3044
-#: ../navit/gui/internal/gui_internal.c:3236
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:3088
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Ukázat stav satelitu"
 
-#: ../navit/gui/internal/gui_internal.c:3122
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Ukázat NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3146
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Nastavit jako aktivní"
 
-#: ../navit/gui/internal/gui_internal.c:3152
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Ukázat stav satelitu"
 
-#: ../navit/gui/internal/gui_internal.c:3158
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Ukázat NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3200
-#: ../navit/gui/internal/gui_internal.c:3244
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Pravidla"
 
-#: ../navit/gui/internal/gui_internal.c:3208
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Uchytit na cestu"
 
-#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
-#: ../navit/gui/internal/gui_internal.c:3230
-#: ../navit/gui/internal/gui_internal.c:3288
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../navit/gui/internal/gui_internal.c:3278
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Hlavní menu"
 
-#: ../navit/gui/internal/gui_internal.c:3284
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1940,15 +1940,19 @@ msgstr ""
 "Ukázat\n"
 "mapu"
 
-#: ../navit/gui/internal/gui_internal.c:3291
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Nástroje"
 
-#: ../navit/gui/internal/gui_internal.c:4449
-#: ../navit/gui/internal/gui_internal.c:4597
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
 msgid "Height Profile"
 msgstr "Výška profilu"
 
-#: ../navit/gui/internal/gui_internal.c:4594
+#: ../navit/gui/internal/gui_internal.c:4656
 msgid "Description"
 msgstr "Popis"
diff --git a/po/da.po.in b/po/da.po.in
index 48f3f7c4c..4990b2cb9 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-15 22:22+0000\n"
-"Last-Translator: Mads Konradsen <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 16:43+0000\n"
+"Last-Translator: KaZeR <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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,296 +29,309 @@ msgstr "Kører fra kildekode mappen\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "sætter '%s' til '%s'\n"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "første"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "anden"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "tredje"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "fourth"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "fifth"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sixth"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "første afkørsel"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "anden afkørsel"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "tredje afkørsel"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "fjerde afkørsel"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "femte afkørsel"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sjette afkørsel"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "i %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "om %d meters"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "om %d.%d kilometer"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "én kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om én kilometer"
 msgstr[1] "om %d kilometer"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "afslut"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sind i %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "højre"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "venstre"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "blødt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "skarpt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr "meget kraftigt "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "ukendt "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Når muligt, vend venligst om"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Kør snart ind i rundkørslen"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Om %s, kør ind i rundkørslen"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Forlad rundkørslen ved den %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "forlad så rundkørslen ved den %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Følg vejen de næste %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "snart"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Tag den %1$s vej til %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "efter %i veje"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, 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:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, 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:1516
+#: ../navit/navigation.c:1517
 #, 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:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du er fremme ved destinationen %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "og så ankommer du til din destination"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Kommando"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Længde"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tid"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Længde til destinationen"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Tid til destinationen"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Vejbog"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Sæt som position"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Sæt som destination"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Tilføj som bogmærke"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skærm koordinater %d %d"
@@ -1553,6 +1566,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1567,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Land"
 
@@ -1578,9 +1595,9 @@ msgstr "Post"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "By"
 
@@ -1591,8 +1608,8 @@ msgstr "Område"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Gade"
 
@@ -1629,12 +1646,13 @@ msgid "Destination"
 msgstr "Destination"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Vis"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Rute"
 
@@ -1643,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Tidligere destinationer"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Layout"
 
@@ -1659,8 +1677,8 @@ msgid "Projection"
 msgstr "Visning"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Køretøj"
 
@@ -1700,8 +1718,17 @@ msgstr "Markør"
 msgid "Lock on Road"
 msgstr "Stop Navigation"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Autozoom"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
@@ -1754,15 +1781,19 @@ msgid "No"
 msgstr "Nej"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1772,61 +1803,79 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Tilbage til kort"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Hovedmenu"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Tilbage"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Gader"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Vis i Browser"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2113
+msgid "View Attributes"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Vis på kort"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Bogmærke %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Vinduestilstand"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Handlinger"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Kort Punkt"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Køretøj Positaion"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Luk"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1834,54 +1883,54 @@ msgstr ""
 "Stop\n"
 "Navigation"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Kort"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Vis Satellit Status"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Vis NMEA Data"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Sæt til aktiv"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Vis Satellit status"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Vis NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regler"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Lås til vej"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Kort følger Køretøj"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Hovedmenu"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1889,36 +1938,19 @@ msgstr ""
 "Vis\n"
 "Kort"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Værktøjer"
 
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
-msgid "Northing"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
-msgid "POIs"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
-msgid "View Attributes"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Beskrivelse"
diff --git a/po/de.po.in b/po/de.po.in
index 392fa08e0..f8a62ba4a 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-21 23:46+0200\n"
-"PO-Revision-Date: 2009-06-24 14:59+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 11:54+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-06-25 21:48+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,251 +29,251 @@ msgstr "Aufruf aus Quellverzeichnis\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setze '%s' auf '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "nullte"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "erste"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "zweite"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "dritte"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "vierte"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "fünfte"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sechste"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "nullte Ausfahrt"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "erste Ausfahrt"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "zweite Ausfahrt"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "dritte Ausfahrt"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "vierte Ausfahrt"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "fünfte Ausfahrt"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sechste Ausfahrt"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "in %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d Metern"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "In %d Metern"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d Kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "In %d,%d Kilometern"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ein Kilometer"
 msgstr[1] "%d Kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, 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:1266
 msgid "exit"
 msgstr "Ausfahrt"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1298
 #, 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:1302
 #, 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:1306
 #, 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:1310
 #, 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:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sauf die %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "rechts"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "leicht "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "stark "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1392
 msgid "really strongly "
 msgstr "Übersetz: "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1398
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "unbekannt "
 
 #
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Wenn möglich bitte wenden"
 
-#: ../navit/navigation.c:1415
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Demnächst in den Kreisverkehr einfahren"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1419
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "In %s in den Kreisverkehr einfahren"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Verlassen Sie den Kreisverkehrt an der %s"
 
-#: ../navit/navigation.c:1437
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "anschliessend verlassen Sie den Kreisverkehr an der %s"
 
-#: ../navit/navigation.c:1447
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Dem Straßenverlauf %s folgen"
 
-#: ../navit/navigation.c:1451
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "Demnächst"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1461
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Die %1$s Straße %2$s abbiegen"
 
-#: ../navit/navigation.c:1464 ../navit/navigation.c:1478
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-#: ../navit/navigation.c:1467
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "Jetzt"
 
-#: ../navit/navigation.c:1475
+#: ../navit/navigation.c:1473
 #, 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:1486
+#: ../navit/navigation.c:1484
 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:1516
+#: ../navit/navigation.c:1514
 #, 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:1519
+#: ../navit/navigation.c:1517
 #, 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:1524
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sie haben Ihr Ziel %s erreicht"
 
-#: ../navit/navigation.c:1526
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "dann haben Sie Ihr Ziel erreicht."
 
@@ -314,17 +314,17 @@ msgid "Roadbook"
 msgstr "Straßenkarte"
 
 #: ../navit/popup.c:278 ../navit/popup.c:347
-#: ../navit/gui/internal/gui_internal.c:2124
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Als Position setzen"
 
 #: ../navit/popup.c:279 ../navit/popup.c:348
-#: ../navit/gui/internal/gui_internal.c:2120
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Als Ziel setzen"
 
 #: ../navit/popup.c:280 ../navit/popup.c:349
-#: ../navit/gui/internal/gui_internal.c:2128
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Als Lesezeichen aufnehmen"
 
@@ -1588,7 +1588,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Land"
 
@@ -1600,9 +1600,9 @@ msgstr "PLZ"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2854
-#: ../navit/gui/internal/gui_internal.c:2883
-#: ../navit/gui/internal/gui_internal.c:3018
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Ort"
 
@@ -1613,8 +1613,8 @@ msgstr "Gegend"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2835
-#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Straße"
 
@@ -1651,13 +1651,13 @@ msgid "Destination"
 msgstr "Reiseziel"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2939
-#: ../navit/gui/internal/gui_internal.c:3232
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Anzeige"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
-#: ../navit/gui/internal/gui_internal.c:4592
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Route"
 
@@ -1666,14 +1666,14 @@ msgid "Former Destinations"
 msgstr "Vorherige Ziele"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2224
-#: ../navit/gui/internal/gui_internal.c:2994
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2894
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Erscheinungsbild"
 
@@ -1682,8 +1682,8 @@ msgid "Projection"
 msgstr "Projektion"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3175
-#: ../navit/gui/internal/gui_internal.c:3240
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Fahrzeug"
 
@@ -1724,7 +1724,7 @@ msgid "Lock on Road"
 msgstr "Auf Straße zeigen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3214
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Einnorden"
 
@@ -1733,7 +1733,7 @@ msgid "Autozoom"
 msgstr "automatischer Zoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2951
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Vollbild"
 
@@ -1786,12 +1786,12 @@ msgid "No"
 msgstr "Nein"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2958
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2964
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1808,79 +1808,79 @@ 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:1334
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Zurück zur Karte"
 
-#: ../navit/gui/internal/gui_internal.c:1343
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:1460
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../navit/gui/internal/gui_internal.c:1610
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Zurück"
 
-#: ../navit/gui/internal/gui_internal.c:1916
-#: ../navit/gui/internal/gui_internal.c:2133
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Interressante Kartenpunkte"
 
-#: ../navit/gui/internal/gui_internal.c:2081
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Straßen"
 
-#: ../navit/gui/internal/gui_internal.c:2089
+#: ../navit/gui/internal/gui_internal.c:2090
 msgid "House numbers"
 msgstr "Hausnummern"
 
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Im Browser anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2112
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Attribute anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2147
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Auf der Karte zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2260
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Lesezeichen %s"
 
-#: ../navit/gui/internal/gui_internal.c:2819
-#: ../navit/gui/internal/gui_internal.c:2828
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
 msgid "House number"
 msgstr "Hausnummer"
 
-#: ../navit/gui/internal/gui_internal.c:2946
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
-#: ../navit/gui/internal/gui_internal.c:2992
-#: ../navit/gui/internal/gui_internal.c:3280
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Kartenpunkt"
 
-#: ../navit/gui/internal/gui_internal.c:3013
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Fahrzeugposition"
 
-#: ../navit/gui/internal/gui_internal.c:3022
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Ende"
 
-#: ../navit/gui/internal/gui_internal.c:3028
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1888,54 +1888,54 @@ msgstr ""
 "Navigation\n"
 "beenden"
 
-#: ../navit/gui/internal/gui_internal.c:3044
-#: ../navit/gui/internal/gui_internal.c:3236
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Karten"
 
-#: ../navit/gui/internal/gui_internal.c:3088
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3122
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "zeige NMEA Daten"
 
-#: ../navit/gui/internal/gui_internal.c:3146
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Als Aktiv setzen"
 
-#: ../navit/gui/internal/gui_internal.c:3152
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3158
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "NMEA Daten anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3200
-#: ../navit/gui/internal/gui_internal.c:3244
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regeln"
 
-#: ../navit/gui/internal/gui_internal.c:3208
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Auf Straße zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Karte folgt Fahrzeug"
 
-#: ../navit/gui/internal/gui_internal.c:3230
-#: ../navit/gui/internal/gui_internal.c:3288
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../navit/gui/internal/gui_internal.c:3278
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:3284
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1943,15 +1943,19 @@ msgstr ""
 "Karte\n"
 "anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3291
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: ../navit/gui/internal/gui_internal.c:4449
-#: ../navit/gui/internal/gui_internal.c:4597
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
 msgid "Height Profile"
 msgstr "Höhenprofil"
 
-#: ../navit/gui/internal/gui_internal.c:4594
+#: ../navit/gui/internal/gui_internal.c:4656
 msgid "Description"
 msgstr "Beschreibung"
diff --git a/po/el.po.in b/po/el.po.in
index b9c495e91..c0a5af47d 100644
--- a/po/el.po.in
+++ b/po/el.po.in
@@ -7,175 +7,340 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-12-23 08:24+0000\n"
-"Last-Translator: vassilis <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 09:43+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Greek <el@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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/navigation.c:316
+#: ../navit/main.c:231
+#, c-format
+msgid "Running from source directory\n"
+msgstr ""
+
+#: ../navit/main.c:263
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr ""
+
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr ""
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr ""
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr ""
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr ""
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr ""
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr ""
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d μ"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "σε %d μ"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d μέτρα"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "σε %d μέτρα"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d %d χιλιόμετρα"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "σε %d %d χιλιόμετρα"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "Ένα χιλιόμετρο"
 msgstr[1] "%d χιλιόμετρα"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "σε ένα χιλιόμετρο"
 msgstr[1] "σε %d χιλιόμετρα"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "έξοδος"
 
+#: ../navit/navigation.c:1268
+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:1298
+#, 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:1302
+#, 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:1306
+#, 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:1310
+#, 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:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "δεξιά"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "αριστερά"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "εύκολα "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1389
+msgid "strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "άγνωστο "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Όπου είναι εφικτό, παρακαλώ πραγματοποιήστε αναστροφή"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr ""
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Ακολουθήστε το δρόμο για το επόμενο %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "σύντομα"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "τώρα"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Στρίψτε %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Φτάσατε στον προορισμό σας %s"
 
-#: ../navit/navit.c:1164
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Θέση"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Εντολή"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Μήκος"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "χλμ"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "μ"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Ώρα"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Μήκος προορισμού"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Ώρα προορισμού"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
+msgid "Roadbook"
+msgstr ""
+
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Ορισμός ως θέση"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Ορισμός ως προορισμός"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Προσθήκη ως σελιδοδείκτης"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Σημείο 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Συντεταγμένες οθόνης : %d %d"
 
+#. 020
+#: ../navit/country.c:39
+msgid "Andorra"
+msgstr ""
+
 #. 784
 #: ../navit/country.c:40
 msgid "United Arab Emirates"
@@ -246,6 +411,11 @@ msgstr "Αυστραλία"
 msgid "Aruba"
 msgstr "Αρούμπα"
 
+#. 248
+#: ../navit/country.c:54
+msgid "Aland Islands"
+msgstr ""
+
 #. 031
 #: ../navit/country.c:55
 msgid "Azerbaijan"
@@ -296,6 +466,11 @@ msgstr "Μπουρουντί"
 msgid "Benin"
 msgstr "Μπενίν"
 
+#. 652
+#: ../navit/country.c:65
+msgid "Saint Barthelemy"
+msgstr ""
+
 #. 060
 #: ../navit/country.c:66
 msgid "Bermuda"
@@ -356,6 +531,11 @@ msgstr "Καναδάς"
 msgid "Cocos (Keeling) Islands"
 msgstr "Νήσοι Κόκος (Κήλινγκ)"
 
+#. 180
+#: ../navit/country.c:78
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
 #. 140
 #: ../navit/country.c:79
 msgid "Central African Republic"
@@ -786,6 +966,11 @@ msgstr "Λαϊκή Δημοκρατία του Λάος"
 msgid "Lebanon"
 msgstr "Λίβανος"
 
+#. 662
+#: ../navit/country.c:165
+msgid "Saint Lucia"
+msgstr ""
+
 #. 438
 #: ../navit/country.c:166
 msgid "Liechtenstein"
@@ -951,6 +1136,11 @@ msgstr "Ναμίμπια"
 msgid "New Caledonia"
 msgstr "Νέα Καληδονία"
 
+#. 562
+#: ../navit/country.c:199
+msgid "Niger"
+msgstr ""
+
 #. 574
 #: ../navit/country.c:200
 msgid "Norfolk Island"
@@ -1036,6 +1226,16 @@ msgstr "Πακιστάν"
 msgid "Poland"
 msgstr "Πολωνία"
 
+#. 666
+#: ../navit/country.c:217
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. 612
+#: ../navit/country.c:218
+msgid "Pitcairn"
+msgstr ""
+
 #. 630
 #: ../navit/country.c:219
 msgid "Puerto Rico"
@@ -1051,6 +1251,11 @@ msgstr "Κατεχόμενα Παλαιστινιακά Εδάφη"
 msgid "Portugal"
 msgstr "Πορτογαλία"
 
+#. 585
+#: ../navit/country.c:222
+msgid "Palau"
+msgstr ""
+
 #. 600
 #: ../navit/country.c:223
 msgid "Paraguay"
@@ -1061,6 +1266,11 @@ msgstr "Παραγουάη"
 msgid "Qatar"
 msgstr "Κατάρ"
 
+#. 638
+#: ../navit/country.c:225
+msgid "Reunion"
+msgstr ""
+
 #. 642
 #: ../navit/country.c:226
 msgid "Romania"
@@ -1091,519 +1301,6 @@ msgstr "Σαουδική Αραβία"
 msgid "Solomon Islands"
 msgstr "Νήσοι Σολομώντος"
 
-#. 882
-#: ../navit/country.c:279
-msgid "Samoa"
-msgstr "Σαμόα"
-
-#. 887
-#: ../navit/country.c:280
-msgid "Yemen"
-msgstr "Υεμένη"
-
-#. 175
-#: ../navit/country.c:281
-msgid "Mayotte"
-msgstr "Μαγιότ"
-
-#. 710
-#: ../navit/country.c:282
-msgid "South Africa"
-msgstr "Νότιος Αφρική"
-
-#. 894
-#: ../navit/country.c:283
-msgid "Zambia"
-msgstr "Ζάμπια"
-
-#. 716
-#: ../navit/country.c:284
-msgid "Zimbabwe"
-msgstr "Ζιμπάμπουε"
-
-#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
-#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
-msgid "Car"
-msgstr "Αυτοκίνητο"
-
-#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
-msgid "Country"
-msgstr "Χώρα"
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-msgid "Postal"
-msgstr "Ταχυδρομική"
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
-msgid "Town"
-msgstr "Πόλη"
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-msgid "District"
-msgstr "Επαρχία"
-
-#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
-msgid "Street"
-msgstr "Οδός"
-
-#: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
-msgid "Number"
-msgstr "Αριθμός"
-
-#: ../navit/gui/gtk/destination.c:429
-msgid "Enter Destination"
-msgstr "Εισάγετε προορισμό"
-
-#: ../navit/gui/gtk/destination.c:438
-msgid "Zip Code"
-msgstr "Ταχ. Κώδικας"
-
-#: ../navit/gui/gtk/destination.c:440
-msgid "City"
-msgstr "Πόλη"
-
-#: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
-msgid "Map"
-msgstr "Χάρτης"
-
-#: ../navit/gui/gtk/destination.c:472
-msgid "Bookmark"
-msgstr "Σελιδοδείκτης"
-
-#: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
-msgid "Destination"
-msgstr "Προορισμός"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
-msgid "Display"
-msgstr "Προβολή"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:197
-msgid "Route"
-msgstr "Διαδρομή"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:198
-msgid "Former Destinations"
-msgstr "Προγενέστερες διαδρομές"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
-msgid "Bookmarks"
-msgstr "Σελιδοδείκτες"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
-msgid "Layout"
-msgstr "Διάταξη"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:202
-msgid "Projection"
-msgstr "Προβολή :"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
-msgid "Vehicle"
-msgstr "Όχημα"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:204
-msgid "ZoomOut"
-msgstr "Σμίκρυνση"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:205
-msgid "ZoomIn"
-msgstr "Μεγέθυνση"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:206
-msgid "Recalculate"
-msgstr "Επανάληψη υπολογισμού"
-
-#: ../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:213
-msgid "Stop Navigation"
-msgstr "Διακοπή πλοήγησης"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:214
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:215
-msgid "_Quit"
-msgstr "_Έξοδος"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:222
-msgid "Cursor"
-msgstr "Δρομέας"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
-msgid "Fullscreen"
-msgstr "Πλήρης Οθόνη"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:238
-msgid "Data"
-msgstr "Δεδομένα"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "N"
-msgstr "Β"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "NE"
-msgstr "ΒΑ"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "E"
-msgstr "Α"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "SE"
-msgstr "ΝΑ"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "S"
-msgstr "Ν"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "SW"
-msgstr "ΝΔ"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "W"
-msgstr "Δ"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
-msgid "NW"
-msgstr "ΒΔ"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
-msgid "No"
-msgstr "Όχι"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
-msgid "2D"
-msgstr "2Δ"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
-msgid "3D"
-msgstr "3Δ"
-
-#: ../navit/gui/internal/gui_internal.c:1323
-msgid "Back to map"
-msgstr "Πίσω στο χάρτη"
-
-#: ../navit/gui/internal/gui_internal.c:1332
-msgid "Main Menu"
-msgstr "Κύριο Μενού"
-
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
-msgid "POIs"
-msgstr "Σημεία Ενδιαφέροντος"
-
-#: ../navit/gui/internal/gui_internal.c:2068
-msgid "Streets"
-msgstr "Οδοί"
-
-#: ../navit/gui/internal/gui_internal.c:2090
-msgid "View Attributes"
-msgstr "Προβολή Ιδιοτήτων"
-
-#: ../navit/gui/internal/gui_internal.c:2125
-msgid "View on map"
-msgstr "Προβολή στο χάρτη"
-
-#: ../navit/gui/internal/gui_internal.c:2238
-#, c-format
-msgid "Bookmark %s"
-msgstr "Σελιδοδείκτης %s"
-
-#: ../navit/gui/internal/gui_internal.c:2827
-msgid "Window Mode"
-msgstr "Λειτουργία παραθύρων"
-
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
-msgid "Actions"
-msgstr "Ενέργειες"
-
-#: ../navit/gui/internal/gui_internal.c:2884
-msgid "Map Point"
-msgstr "Σημείο Χάρτη"
-
-#: ../navit/gui/internal/gui_internal.c:2894
-msgid "Vehicle Position"
-msgstr "Θέση Οχήματος"
-
-#: ../navit/gui/internal/gui_internal.c:2903
-msgid "Quit"
-msgstr "Έξοδος"
-
-#: ../navit/gui/internal/gui_internal.c:2909
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr "Διακοπή"
-
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
-msgid "Maps"
-msgstr "Χάρτες"
-
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
-msgid "Rules"
-msgstr "Κανόνες"
-
-#: ../navit/gui/internal/gui_internal.c:3101
-msgid "Map follows Vehicle"
-msgstr "Ο χάρτης ακολουθεί το Όχημα"
-
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#: ../navit/gui/internal/gui_internal.c:3159
-msgid "Main menu"
-msgstr "Κύριο Μενού"
-
-#: ../navit/gui/internal/gui_internal.c:3172
-msgid "Tools"
-msgstr "Εργαλεία"
-
-#: ../navit/main.c:231
-#, c-format
-msgid "Running from source directory\n"
-msgstr ""
-
-#: ../navit/main.c:263
-#, c-format
-msgid "setting '%s' to '%s'\n"
-msgstr ""
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:242
-msgid "first"
-msgstr ""
-
-#: ../navit/navigation.c:244
-msgid "second"
-msgstr ""
-
-#: ../navit/navigation.c:246
-msgid "third"
-msgstr ""
-
-#: ../navit/navigation.c:248
-msgid "fourth"
-msgstr ""
-
-#: ../navit/navigation.c:250
-msgid "fifth"
-msgstr ""
-
-#: ../navit/navigation.c:252
-msgid "sixth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr ""
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
-#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
-#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
-#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
-#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
-msgid "strongly "
-msgstr ""
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
-msgid "Roadbook"
-msgstr ""
-
-#. 020
-#: ../navit/country.c:39
-msgid "Andorra"
-msgstr ""
-
-#. 248
-#: ../navit/country.c:54
-msgid "Aland Islands"
-msgstr ""
-
-#. 652
-#: ../navit/country.c:65
-msgid "Saint Barthelemy"
-msgstr ""
-
-#. 180
-#: ../navit/country.c:78
-msgid "Congo, Democratic Republic of the"
-msgstr ""
-
-#. 662
-#: ../navit/country.c:165
-msgid "Saint Lucia"
-msgstr ""
-
-#. 562
-#: ../navit/country.c:199
-msgid "Niger"
-msgstr ""
-
-#. 666
-#: ../navit/country.c:217
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
-#. 612
-#: ../navit/country.c:218
-msgid "Pitcairn"
-msgstr ""
-
-#. 585
-#: ../navit/country.c:222
-msgid "Palau"
-msgstr ""
-
-#. 638
-#: ../navit/country.c:225
-msgid "Reunion"
-msgstr ""
-
 #. 690
 #: ../navit/country.c:232
 msgid "Seychelles"
@@ -1839,6 +1536,45 @@ msgstr ""
 msgid "Wallis and Futuna"
 msgstr ""
 
+#. 882
+#: ../navit/country.c:279
+msgid "Samoa"
+msgstr "Σαμόα"
+
+#. 887
+#: ../navit/country.c:280
+msgid "Yemen"
+msgstr "Υεμένη"
+
+#. 175
+#: ../navit/country.c:281
+msgid "Mayotte"
+msgstr "Μαγιότ"
+
+#. 710
+#: ../navit/country.c:282
+msgid "South Africa"
+msgstr "Νότιος Αφρική"
+
+#. 894
+#: ../navit/country.c:283
+msgid "Zambia"
+msgstr "Ζάμπια"
+
+#. 716
+#: ../navit/country.c:284
+msgid "Zimbabwe"
+msgstr "Ζιμπάμπουε"
+
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+msgid "Car"
+msgstr "Αυτοκίνητο"
+
 #: ../navit/gui/gtk/destination.c:127
 msgid "Iso2"
 msgstr ""
@@ -1847,16 +1583,143 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
+#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
+#: ../navit/gui/internal/gui_internal.c:2865
+msgid "Country"
+msgstr "Χώρα"
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "Postal"
+msgstr "Ταχυδρομική"
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
+msgid "Town"
+msgstr "Πόλη"
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "District"
+msgstr "Επαρχία"
+
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/gtk/destination.c:446
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
+msgid "Street"
+msgstr "Οδός"
+
+#: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
+msgid "Number"
+msgstr "Αριθμός"
+
+#: ../navit/gui/gtk/destination.c:429
+msgid "Enter Destination"
+msgstr "Εισάγετε προορισμό"
+
+#: ../navit/gui/gtk/destination.c:438
+msgid "Zip Code"
+msgstr "Ταχ. Κώδικας"
+
+#: ../navit/gui/gtk/destination.c:440
+msgid "City"
+msgstr "Πόλη"
+
 #: ../navit/gui/gtk/destination.c:443
 msgid "District/Township"
 msgstr ""
 
+#: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
+msgid "Map"
+msgstr "Χάρτης"
+
+#: ../navit/gui/gtk/destination.c:472
+msgid "Bookmark"
+msgstr "Σελιδοδείκτης"
+
+#: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
+msgid "Destination"
+msgstr "Προορισμός"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
+msgid "Display"
+msgstr "Προβολή"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
+msgid "Route"
+msgstr "Διαδρομή"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:198
+msgid "Former Destinations"
+msgstr "Προγενέστερες διαδρομές"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
+msgid "Bookmarks"
+msgstr "Σελιδοδείκτες"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
+msgid "Layout"
+msgstr "Διάταξη"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:202
+msgid "Projection"
+msgstr "Προβολή :"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
+msgid "Vehicle"
+msgstr "Όχημα"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:204
+msgid "ZoomOut"
+msgstr "Σμίκρυνση"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:205
+msgid "ZoomIn"
+msgstr "Μεγέθυνση"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:206
+msgid "Recalculate"
+msgstr "Επανάληψη υπολογισμού"
+
+#: ../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:213
+msgid "Stop Navigation"
+msgstr "Διακοπή πλοήγησης"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:214
+msgid "Test"
+msgstr "Δοκιμή"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:215
+msgid "_Quit"
+msgstr "_Έξοδος"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:222
+msgid "Cursor"
+msgstr "Δρομέας"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr ""
 
@@ -1864,6 +1727,69 @@ msgstr ""
 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:2941
+msgid "Fullscreen"
+msgstr "Πλήρης Οθόνη"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:238
+msgid "Data"
+msgstr "Δεδομένα"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "N"
+msgstr "Β"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "NE"
+msgstr "ΒΑ"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "E"
+msgstr "Α"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "SE"
+msgstr "ΝΑ"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "S"
+msgstr "Ν"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "SW"
+msgstr "ΝΔ"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "W"
+msgstr "Δ"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "NW"
+msgstr "ΒΔ"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
+msgid "No"
+msgstr "Όχι"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
+#: ../navit/gui/internal/gui_internal.c:2948
+msgid "2D"
+msgstr "2Δ"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
+#: ../navit/gui/internal/gui_internal.c:2954
+msgid "3D"
+msgstr "3Δ"
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:78
 msgid "OT"
 msgstr ""
@@ -1877,44 +1803,150 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1335
+msgid "Back to map"
+msgstr "Πίσω στο χάρτη"
+
+#: ../navit/gui/internal/gui_internal.c:1344
+msgid "Main Menu"
+msgstr "Κύριο Μενού"
+
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr "Σημεία Ενδιαφέροντος"
+
+#: ../navit/gui/internal/gui_internal.c:2082
+msgid "Streets"
+msgstr "Οδοί"
+
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
-msgid "Show Satellite Status"
+#: ../navit/gui/internal/gui_internal.c:2113
+msgid "View Attributes"
+msgstr "Προβολή Ιδιοτήτων"
+
+#: ../navit/gui/internal/gui_internal.c:2148
+msgid "View on map"
+msgstr "Προβολή στο χάρτη"
+
+#: ../navit/gui/internal/gui_internal.c:2261
+#, c-format
+msgid "Bookmark %s"
+msgstr "Σελιδοδείκτης %s"
+
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
 msgstr ""
 
+#: ../navit/gui/internal/gui_internal.c:2936
+msgid "Window Mode"
+msgstr "Λειτουργία παραθύρων"
+
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
+msgid "Actions"
+msgstr "Ενέργειες"
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Map Point"
+msgstr "Σημείο Χάρτη"
+
 #: ../navit/gui/internal/gui_internal.c:3003
+msgid "Vehicle Position"
+msgstr "Θέση Οχήματος"
+
+#: ../navit/gui/internal/gui_internal.c:3012
+msgid "Quit"
+msgstr "Έξοδος"
+
+#: ../navit/gui/internal/gui_internal.c:3018
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr "Διακοπή"
+
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
+msgid "Maps"
+msgstr "Χάρτες"
+
+#: ../navit/gui/internal/gui_internal.c:3078
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
+msgid "Rules"
+msgstr "Κανόνες"
+
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3210
+msgid "Map follows Vehicle"
+msgstr "Ο χάρτης ακολουθεί το Όχημα"
+
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: ../navit/gui/internal/gui_internal.c:3268
+msgid "Main menu"
+msgstr "Κύριο Μενού"
+
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3281
+msgid "Tools"
+msgstr "Εργαλεία"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index 00fd5e3fe..46f4a2071 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-09-25 05:24+0000\n"
-"Last-Translator: Jeff Bailes <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 17:21+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,188 +29,309 @@ msgstr "Running from source directory\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setting '%s' to '%s'\n"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr ""
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr ""
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr ""
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr ""
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr ""
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr ""
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "in %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metres"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "in %d metres"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometre"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "in %d.%d kilometres"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "one kilometre"
 msgstr[1] "%d kilometres"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "in one kilometre"
 msgstr[1] "in %d kilometres"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "exit"
 
+#: ../navit/navigation.c:1268
+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:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sinto the street %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sinto the %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sinto the %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sinto the %s%s%s"
 
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "right"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "left"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "easily "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "strongly "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "unknown "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "When possible, please turn around"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr ""
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Follow the road for the next %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "soon"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "now"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Turn %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "You have reached your destination %s"
 
-#: ../navit/navit.c:1165
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr ""
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Command"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Length"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Time"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Destination Length"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Destination Time"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Roadbook"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Set as position"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Set as destination"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Add as bookmark"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Point 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Screen coord : %d %d"
@@ -1445,6 +1566,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1459,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Country"
 
@@ -1470,9 +1595,9 @@ msgstr "Postal"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Town"
 
@@ -1483,8 +1608,8 @@ msgstr "District"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Street"
 
@@ -1521,12 +1646,13 @@ msgid "Destination"
 msgstr "Destination"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Display"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Route"
 
@@ -1535,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Former Destinations"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Layout"
 
@@ -1551,8 +1677,8 @@ msgid "Projection"
 msgstr "Projection"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Vehicle"
 
@@ -1593,12 +1719,16 @@ msgid "Lock on Road"
 msgstr "Lock on Road"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Northing"
 
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
@@ -1646,146 +1776,17 @@ msgstr "W"
 msgid "NW"
 msgstr "NW"
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
-#, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Route %4.0fkm    %02d:%02d ETA"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
-msgid "Route 0000km  0+00:00 ETA"
-msgstr "Route 0000km  0+00:00 ETA"
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:242
-msgid "first"
-msgstr ""
-
-#: ../navit/navigation.c:244
-msgid "second"
-msgstr ""
-
-#: ../navit/navigation.c:246
-msgid "third"
-msgstr ""
-
-#: ../navit/navigation.c:248
-msgid "fourth"
-msgstr ""
-
-#: ../navit/navigation.c:250
-msgid "fifth"
-msgstr ""
-
-#: ../navit/navigation.c:252
-msgid "sixth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr ""
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1793,128 +1794,159 @@ msgstr ""
 msgid "OT"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
+#, c-format
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr "Route %4.0fkm    %02d:%02d ETA"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
+msgid "Route 0000km  0+00:00 ETA"
+msgstr "Route 0000km  0+00:00 ETA"
+
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/eo.po.in b/po/eo.po.in
index d0fd92db8..580db4671 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -7,113 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-09-24 13:33+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 10:13+0000\n"
 "Last-Translator: OlivierWeb <olivierweb@ifrance.com>\n"
 "Language-Team: Esperanto <eo@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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/navigation.c:322
-#, c-format
-msgid "%d meters"
-msgstr "%d metroj"
-
-#: ../navit/navigation.c:336
-#, c-format
-msgid "one kilometer"
-msgid_plural "%d kilometers"
-msgstr[0] "unu kilometro"
-msgstr[1] "%d kilometroj"
-
-#. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
-msgid "right"
-msgstr "dekstren"
-
-#. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
-msgid "left"
-msgstr "maldekstren"
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
-msgid "easily "
-msgstr "facile "
-
-#: ../navit/navigation.c:1448
-msgid "soon"
-msgstr "baldaŭ"
-
-#: ../navit/navigation.c:1464
-msgid "now"
-msgstr "nun"
-
-#: ../navit/navigation.c:1483
-msgid "error"
-msgstr "eraro"
-
-#: ../navit/navit.c:1165
-msgid "Command"
-msgstr "Komando"
-
-#: ../navit/navit.c:1169
-msgid "Length"
-msgstr "Longo"
-
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
-msgid "km"
-msgstr "km"
-
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
-msgid "m"
-msgstr "m"
-
-#: ../navit/navit.c:1183
-msgid "Time"
-msgstr "Horo"
-
-#. 020
-#: ../navit/country.c:39
-msgid "Andorra"
-msgstr "Andoro"
-
-#. 784
-#: ../navit/country.c:40
-msgid "United Arab Emirates"
-msgstr "Unuiĝintaj Arabaj Emirlandoj"
-
-#. 004
-#: ../navit/country.c:41
-msgid "Afghanistan"
-msgstr "Afganio"
-
-#. 028
-#: ../navit/country.c:42
-msgid "Antigua and Barbuda"
-msgstr "Antigvo-Barbudo"
-
-#. 660
-#: ../navit/country.c:43
-msgid "Anguilla"
-msgstr "Angvilo"
-
-#. 008
-#: ../navit/country.c:44
-msgid "Albania"
-msgstr "Albanio"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
-msgid "Bookmarks"
-msgstr "Legosignoj"
-
 #: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
@@ -124,249 +29,343 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr ""
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr ""
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr ""
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr ""
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:320
+#, c-format
+msgid "%d meters"
+msgstr "%d metroj"
+
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:334
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "unu kilometro"
+msgstr[1] "%d kilometroj"
+
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr ""
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
+#. TRANSLATORS: right, as in 'Turn right'
+#: ../navit/navigation.c:1338
+msgid "right"
+msgstr "dekstren"
+
+#. TRANSLATORS: left, as in 'Turn left'
+#: ../navit/navigation.c:1377
+msgid "left"
+msgstr "maldekstren"
+
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr "facile "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr ""
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
+#: ../navit/navigation.c:1449
+msgid "soon"
+msgstr "baldaŭ"
+
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1465
+msgid "now"
+msgstr "nun"
+
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
+#: ../navit/navigation.c:1484
+msgid "error"
+msgstr "eraro"
+
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1175
+msgid "Command"
+msgstr "Komando"
+
+#: ../navit/navit.c:1179
+msgid "Length"
+msgstr "Longo"
+
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
+msgid "km"
+msgstr "km"
+
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
+msgid "m"
+msgstr "m"
+
+#: ../navit/navit.c:1193
+msgid "Time"
+msgstr "Horo"
+
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
 
+#. 020
+#: ../navit/country.c:39
+msgid "Andorra"
+msgstr "Andoro"
+
+#. 784
+#: ../navit/country.c:40
+msgid "United Arab Emirates"
+msgstr "Unuiĝintaj Arabaj Emirlandoj"
+
+#. 004
+#: ../navit/country.c:41
+msgid "Afghanistan"
+msgstr "Afganio"
+
+#. 028
+#: ../navit/country.c:42
+msgid "Antigua and Barbuda"
+msgstr "Antigvo-Barbudo"
+
+#. 660
+#: ../navit/country.c:43
+msgid "Anguilla"
+msgstr "Angvilo"
+
+#. 008
+#: ../navit/country.c:44
+msgid "Albania"
+msgstr "Albanio"
+
 #. 051
 #: ../navit/country.c:45
 msgid "Armenia"
@@ -1567,6 +1566,10 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1581,7 +1584,7 @@ msgid "Iso3"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr ""
 
@@ -1592,9 +1595,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr ""
 
@@ -1605,8 +1608,8 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr ""
 
@@ -1643,12 +1646,13 @@ msgid "Destination"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr ""
 
@@ -1656,9 +1660,15 @@ msgstr ""
 msgid "Former Destinations"
 msgstr ""
 
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
+msgid "Bookmarks"
+msgstr "Legosignoj"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr ""
 
@@ -1667,8 +1677,8 @@ msgid "Projection"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr ""
 
@@ -1709,7 +1719,7 @@ msgid "Lock on Road"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr ""
 
@@ -1718,7 +1728,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr ""
 
@@ -1771,12 +1781,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1793,128 +1803,150 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/es.po.in b/po/es.po.in
index b14965518..19806b6b9 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-04 11:38+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 17:53+0000\n"
 "Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
 "Language-Team: Chris Eubank <cteubank@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+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,304 +30,309 @@ msgstr "Ejecutando desde el directorio fuente\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "configurando '%s' a '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "zeroth"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "primera"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "segunda"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "tercera"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "cuarta"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "quinta"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sexta"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "salida cero"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "primera salida"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "segunda salida"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "tercera salida"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "cuarta salida"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "quinta salida"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sexta salida"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "en %d metros"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "en %d metros"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilómetro"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "en %d.%d kilómetros"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilómetro"
 msgstr[1] "%d kilómetro"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, 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:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "salir"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
-msgstr "%s en el %s%s%s|male form"
+msgstr "%s en el %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:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
-msgstr "%s en la %s%s%s|female form"
+msgstr "%s en la %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:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
-msgstr "%s en %s%s%s|neutral form"
+msgstr "%s en %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s en la %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "derecha"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "izquierda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
-msgstr "suavemente "
+msgstr "fácilmente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "brúscamente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr "realmente fuerte "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "desconocido "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
-msgstr "Cuando sea posible, por favor de la vuelta"
+msgstr "Dé la vuelta cuando sea posible, por favor"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
-msgstr "Métete pronto en la rotonda"
+msgstr "Métase pronto en la rotonda"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
-msgstr "En %s entra en la rotonda"
+msgstr "En %s entre en la rotonda"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Salga de la rotonda en la %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "después, salga de la rotonda en la %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga el camino hasta la siguiente %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "pronto"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
-msgstr "Toma la %1$s carretera en la %2$s"
+msgstr "Tome la %1$s carretera en la %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "después de %i carreteras"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "ahora"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr "entonces toma la %1$s salida a la %2$s"
+msgstr "entonces tome la %1$s salida a la %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, 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:1516
+#: ../navit/navigation.c:1517
 #, 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"
+msgstr "gire %1$s a la %2$s pasando %3$s salidas hasta %4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ha llegado a su destino %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
-msgstr "ya has llegado al destino"
+msgstr "ya ha llegado al destino"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Posición"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
-msgstr "Comando"
+msgstr "Orden"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Longitud"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tiempo"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
-msgstr "Distancia a Destino"
+msgstr "Distancia a destino"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
-msgstr "Tiempo a Destino"
+msgstr "Tiempo a destino"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Guía"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Fijar una posición"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Definir como destino"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Agregar como favorito"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punto 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordenadas de pantalla : %d %d"
@@ -1562,6 +1567,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabue"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr "* Desconocido, añadir etiquetas está_en a estas ciudades"
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1576,7 +1585,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "País"
 
@@ -1587,9 +1596,9 @@ msgstr "Postal"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Ciudad"
 
@@ -1600,8 +1609,8 @@ msgstr "Distrito"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Calle"
 
@@ -1611,11 +1620,11 @@ msgstr "Número"
 
 #: ../navit/gui/gtk/destination.c:429
 msgid "Enter Destination"
-msgstr "Ingresar Destino"
+msgstr "Introducir destino"
 
 #: ../navit/gui/gtk/destination.c:438
 msgid "Zip Code"
-msgstr "Código Postal"
+msgstr "Código postal"
 
 #: ../navit/gui/gtk/destination.c:440
 msgid "City"
@@ -1638,28 +1647,29 @@ msgid "Destination"
 msgstr "Destino"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Visualizar"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Ruta"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
-msgstr "Anteriores destinos"
+msgstr "Destinos anteriores"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Favoritos"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Diseño"
 
@@ -1668,8 +1678,8 @@ msgid "Projection"
 msgstr "Proyección"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Vehículo"
 
@@ -1691,7 +1701,7 @@ msgstr "Información"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
-msgstr "Detener Navegación"
+msgstr "Detener navegación"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
@@ -1707,21 +1717,21 @@ msgstr "Cursor"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
-msgstr "Bloquear Ruta"
+msgstr "Bloquear ruta"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Norteando"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr "Zoom automático"
+msgstr "Autoampliar"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
-msgstr "Pantalla Completa"
+msgstr "Pantalla completa"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
@@ -1772,12 +1782,12 @@ msgid "No"
 msgstr "No"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1794,70 +1804,79 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Volver al mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
-msgstr "Menú Principal"
+msgstr "Menú principal"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Atrás"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "PDIs"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Calles"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
-msgstr "Ver en el Navegador"
+msgstr "Ver en el navegador"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
-msgstr "Ver Atributos"
+msgstr "Ver atributos"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Ver en el mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Marcador %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
-msgstr "Modo de Ventana"
+msgstr "Modo de ventana"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
-msgstr "Punto en el Mapa"
+msgstr "Punto en el mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
-msgstr "Posición del Vehiculo"
+msgstr "Posición del vehículo"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Cerrar"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1865,54 +1884,54 @@ msgstr ""
 "Parar\n"
 "Navegación"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
-msgstr "Mostrar estado de Satélite"
+msgstr "Mostrar estado de satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Mostar datos NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
-msgstr "Establecer como Activo"
+msgstr "Establecer como activo"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
-msgstr "Mostrar estado de Satélite"
+msgstr "Mostrar estado de satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Mostar datos NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Reglas"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Bloqueado en la calle"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
-msgstr "El mapa sigue al Vehiculo"
+msgstr "El mapa sigue al vehículo"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Menú principal"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1920,6 +1939,19 @@ msgstr ""
 "Mostrar\n"
 "Mapa"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Herramientas"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr "Perfil de altura"
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Descripción"
diff --git a/po/et.po.in b/po/et.po.in
index c4ee83895..ff4417069 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-10-29 16:32+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 15:31+0000\n"
 "Last-Translator: Andres Kaaber <andres.kaaber@gmail.com>\n"
 "Language-Team: Estonian <et@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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,188 +29,309 @@ msgstr "Käivitan lähtekataloogist\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "määran '%s' -i '%s' -ks\n"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr ""
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr ""
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr ""
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr ""
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr ""
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr ""
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "%d m pärast"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d meetrit"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "%d meetri pärast"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilomeeter"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d.%d kilomeetri pärast"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "üks kilomeeter"
 msgstr[1] "%d kilomeetrit"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "ühe kilomeetri pärast"
 msgstr[1] "%d kilomeetri pärast"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "välju"
 
+#: ../navit/navigation.c:1268
+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:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s %s%s%s tänavale"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s %s%s%s tänavale| mees vorm"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s %s%s%s tänavale| nais vorm"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s %s%s%s tänavale| neutraalne vorm"
 
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "paremale"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "vasakule"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "kergesti "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "tugevalt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "teadmata "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Kui võimalik, palun pööra ümber"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr ""
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Mööda teed järgmise %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "varsti"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nüüd"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "viga"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Pööra %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sa oled jõudnud sihtpunkti %s"
 
-#: ../navit/navit.c:1165
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr ""
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Käsk"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Pikkus"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Aeg"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Sihtkoha kaugus"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Kohalejõudmise aeg"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Teekonna raamat"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Määra asukohaks"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Määra sihtpunktiks"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Lisa järjehoidjasse"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Ekraani koordinaadid: %d %d"
@@ -1445,6 +1566,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1459,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Riik"
 
@@ -1470,9 +1595,9 @@ msgstr "Postiindeks"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Linn"
 
@@ -1483,8 +1608,8 @@ msgstr "Linnaosa"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Tänav"
 
@@ -1521,12 +1646,13 @@ msgid "Destination"
 msgstr "Sihtkoht"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Kuva"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Teekond"
 
@@ -1535,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Eelmine sihtkoht"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Järjehoidjad"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Paigutus"
 
@@ -1551,8 +1677,8 @@ msgid "Projection"
 msgstr "Projektsioon"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Liiklusvahend"
 
@@ -1593,12 +1719,16 @@ msgid "Lock on Road"
 msgstr "Lukusta tee peale"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Põhjasuund"
 
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Täisekraan"
 
@@ -1646,146 +1776,17 @@ msgstr "W"
 msgid "NW"
 msgstr "NW"
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
-#, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Teekond %4.0fkm %02d:%02d ETA"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
-msgid "Route 0000km  0+00:00 ETA"
-msgstr "Teekond 0000km 0+00:00 ETA"
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:242
-msgid "first"
-msgstr ""
-
-#: ../navit/navigation.c:244
-msgid "second"
-msgstr ""
-
-#: ../navit/navigation.c:246
-msgid "third"
-msgstr ""
-
-#: ../navit/navigation.c:248
-msgid "fourth"
-msgstr ""
-
-#: ../navit/navigation.c:250
-msgid "fifth"
-msgstr ""
-
-#: ../navit/navigation.c:252
-msgid "sixth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr ""
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1793,128 +1794,159 @@ msgstr ""
 msgid "OT"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
+#, c-format
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr "Teekond %4.0fkm %02d:%02d ETA"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
+msgid "Route 0000km  0+00:00 ETA"
+msgstr "Teekond 0000km 0+00:00 ETA"
+
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/fi.po.in b/po/fi.po.in
index 38b9e2858..ab0931b6f 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-19 09:53+0000\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-07-01 09:52+0000\n"
+"Last-Translator: Timo Jyrinki <timo-jyrinki@ubuntu.com>\n"
 "Language-Team: Ossi Berg <o.berg@mail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,304 +29,309 @@ msgstr "Ajetaan lähdehakemistosta\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "asetetaan '%s' arvoon '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "nollas"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "ensimmäinen"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "toinen"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "kolmas"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "neljäs"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "viides"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "kuudes"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "nollannesta liittymästä"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "ensimmäisestä liittymästä"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "toisesta liittymästä"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "kolmannesta liittymästä"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "neljännestä liittymästä"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "viidennestä liittymästä"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "kuudennesta liittymästä"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "%d m päästä"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metriä"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "%d metrin päästä"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilometri"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d,%d kilometrin päästä"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "yksi kilometri"
 msgstr[1] "%d kilometriä"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "Yhden kilometrin päästä"
 msgstr[1] "%d kilometrin päästä"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "poistumistie"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "rampille"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%skadulle %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%stielle %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "oikealle"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "vasemmalle"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "loivasti "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "jyrkästi "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "tuntematon "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Kun mahdollista, tee u-käännös"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Liity liikenneympyrään pian"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "%s, liity liikenneympyrään"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Poistu liikenneympyrästä %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "poistu sitten liikenneympyrästä %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Seuraa tätä tietä %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "pian"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Valitse %1$s tie suuntaan %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "%i tien jälkeen"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nyt"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "valitse sitten %1$s tie suuntaan %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "virhe"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Käänny %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "käänny sitten %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Olet saavuttanut kohteesi %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "sitten olet perillä."
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Sijainti"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Komento"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Pituus"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Aika"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Kohde"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Kohde"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Ohjeistaja"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Aseta sijainniksi"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Aseta kohteeksi"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Lisää kirjanmerkiksi"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Piste 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Ruutu %d %d"
@@ -1562,6 +1567,10 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1576,7 +1585,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Maa"
 
@@ -1588,9 +1597,9 @@ msgstr "Postinumero"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Paikkakunta"
 
@@ -1602,8 +1611,8 @@ msgstr "Alue"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Katu"
 
@@ -1641,12 +1650,13 @@ msgid "Destination"
 msgstr "Kohde"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Näyttö"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Reitti"
 
@@ -1655,14 +1665,14 @@ msgid "Former Destinations"
 msgstr "Aiemmat kohteet"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Pohja"
 
@@ -1671,8 +1681,8 @@ msgid "Projection"
 msgstr "Projektio"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Kulkuneuvo"
 
@@ -1713,7 +1723,7 @@ msgid "Lock on Road"
 msgstr "Lukitse tiehen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Pohjoinen ylhäällä"
 
@@ -1722,7 +1732,7 @@ msgid "Autozoom"
 msgstr "Autom. suurennus"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Koko ruutu"
 
@@ -1775,15 +1785,19 @@ msgid "No"
 msgstr "Ei"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1793,70 +1807,79 @@ msgstr "Reitti %4.0fkm, arvioitu aika %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Reitti 0000km, arvioitu aika 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Takaisin karttaan"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Päävalikko"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Ohje"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Takaisin"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "POIt"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Kadut"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr "Talojen numerot"
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Näytä selaimessa"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Näytä ominaisuudet"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Näytä kartalla"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Tee kirjanmerkki %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr "Talon numero"
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Ikkunatila"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Toiminnat"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Karttapiste"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Ajoneuvon sijainti"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1864,54 +1887,54 @@ msgstr ""
 "Lopeta\n"
 "Suunnistus"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Kartat"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Näytä satelliittien tila"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Näytä NMEA-tiedot"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Aseta aktiiviseksi"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Näytä satelliittien tila"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Näytä NMEA-tiedot"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Säännöt"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Lukitse tiehen"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Kartta seuraa ajoneuvoa"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Päävalikko"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1919,10 +1942,19 @@ msgstr ""
 "Näytä\n"
 "kartta"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Työkalut"
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr "Viesti"
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr "Korkeusprofiili"
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Kuvaus"
diff --git a/po/fr.po.in b/po/fr.po.in
index ce5c588d0..8641672c9 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-13 15:37+0000\n"
-"Last-Translator: metehyi <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 16:04+0000\n"
+"Last-Translator: KaZeR <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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,309 +30,314 @@ msgstr "Execution depuis le dossier d'origine\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' mis à '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "zéroième"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "première"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "seconde"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "troisième"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "quatrième"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "cinquième"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sixième"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "la zéroème sortie"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "la première sortie"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "la seconde sortie"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "la troisième sortie"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "la quatrième sortie"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "la cinquième sortie"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "la sixième sortie"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "dans %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d mètres"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "dans %d mètres"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilomètre"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "dans %d.%d kilomètres"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilomètre"
 msgstr[1] "%d kilomètres"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "dans un kilomètre"
 msgstr[1] "dans %d kilomètres"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "sortie"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "vers la sortie"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%ssur %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%ssur le %s%s%s|male form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%ssur la %s%s%s|female form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%ssur l'%s%s%s|neutral form"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s vers la %s"
 
 # tournez à droite
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "à droite"
 
 # tournez à gauche
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "à gauche"
 
 # utilisé pour les changements de voie pour les sorties?
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "légèrement "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "fortement "
 
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
 # attention à l'espace à la fin
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "inconnu "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Si possible, faites demi-tour"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Bientôt rejoindre le rond-point"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Aprrès %s, rejoindre le rond-point"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "sortez du rond-point au %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "puis sortez du rond-point au %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Suivez la route sur %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "bientôt"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prenez la %1$s route vers la %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "après %i rues"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "maintenant"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "puis prenez la %1$s route vers la %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "erreur"
 
 # espace important après le 2
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "%3$s, tournez %1$s%2$s %4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "puis tournez %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Vous êtes arrivé à destination : %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "ensuite vous serez à destination"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Commande"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Distance"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Durée"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Distance à parcourir"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Temps de parcours"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Carnet de route"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Définir comme position"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Définir comme destination"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Ajouter aux favoris"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Point 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coord. à l'écran : %d %d"
@@ -1567,6 +1572,10 @@ msgstr "Zambie"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1581,7 +1590,7 @@ msgid "Iso3"
 msgstr "iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Pays"
 
@@ -1592,9 +1601,9 @@ msgstr "Code postal"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Ville"
 
@@ -1605,8 +1614,8 @@ msgstr "Quartier"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Rue"
 
@@ -1643,12 +1652,13 @@ msgid "Destination"
 msgstr "Destination"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "_Affichage"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "_Route"
 
@@ -1657,14 +1667,14 @@ msgid "Former Destinations"
 msgstr "Destinations précédentes"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Signets"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Calques"
 
@@ -1673,8 +1683,8 @@ msgid "Projection"
 msgstr "Projection"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Véhicule"
 
@@ -1715,7 +1725,7 @@ msgid "Lock on Road"
 msgstr "Rester sur la route"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Orientation toujours au Nord"
 
@@ -1724,7 +1734,7 @@ msgid "Autozoom"
 msgstr "Zoom automatique"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Plein écran"
 
@@ -1777,15 +1787,19 @@ msgid "No"
 msgstr "Non"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1795,70 +1809,79 @@ msgstr "Trajet restant %4.0f km    heure d'arrivée estimée %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Trajet 0000 km  temps estimé 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Retourner à la carte"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Menu principal"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Aide"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Retour"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Points d'intérêt"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Rues"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Voir dans le navigateur"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Voir les attributs"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Voir sur la carte"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Ajouter %s aux favoris"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Mode fenêtré"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Actions"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Point sur la carte"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Position du véhicule"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1866,54 +1889,54 @@ msgstr ""
 "Arrêter la\n"
 "navigation"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Cartes"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Afficher les infos satellite"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Afficher les données NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Activer"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Afficher les infos satellite"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Afficher les données NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Règles"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Coller à la route"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "La carte suit le véhicule"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Menu principal"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1921,10 +1944,19 @@ msgstr ""
 "Afficher\n"
 "la carte"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Outils"
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Description"
diff --git a/po/gl.po.in b/po/gl.po.in
new file mode 100644
index 000000000..8ea15c9b8
--- /dev/null
+++ b/po/gl.po.in
@@ -0,0 +1,1952 @@
+# Galician translation for navit
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the navit package.
+# Iván Pérez <ivan.perez@keera.es> 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: navit\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-07-02 09:30+0000\n"
+"Last-Translator: Iván Pérez <ivan.perez@keera.es>\n"
+"Language-Team: Galician <gl@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-07-02 18:08+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 "Executando desde o directorio fonte.\n"
+
+#: ../navit/main.c:263
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr "Establecendo '%s' a '%s'.\n"
+
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr "cero-ésimo"
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr "primeiro"
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr "segundo"
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr "terceiro"
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr "cuarto"
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr "quinto"
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr "sexto"
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr "cero-ésimo"
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr "primeria saída"
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr "segunda saída"
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr "terceria saída"
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr "cuarta saída"
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr "quinta saída"
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr "sexta saída"
+
+#: ../navit/navigation.c:314
+#, c-format
+msgid "%d m"
+msgstr "%d m."
+
+#: ../navit/navigation.c:316
+#, c-format
+msgid "in %d m"
+msgstr "en %d m."
+
+#: ../navit/navigation.c:320
+#, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#: ../navit/navigation.c:322
+#, c-format
+msgid "in %d meters"
+msgstr "en %d metros"
+
+#: ../navit/navigation.c:328
+#, c-format
+msgid "%d.%d kilometer"
+msgstr "quilómetro %d.%d"
+
+#: ../navit/navigation.c:330
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "en %d.%d quilómetros"
+
+#: ../navit/navigation.c:334
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "un quilómetro"
+msgstr[1] "%d quilómetros"
+
+#: ../navit/navigation.c:336
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "nun quilómetro"
+msgstr[1] "en %d quilómetros"
+
+#: ../navit/navigation.c:1266
+msgid "exit"
+msgstr "saída"
+
+#: ../navit/navigation.c:1268
+msgid "into the ramp"
+msgstr "na rampa"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#: ../navit/navigation.c:1298
+#, c-format
+msgid "%sinto the street %s%s%s"
+msgstr "%s na rúa %s%s%s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1302
+#, c-format
+msgid "%sinto the %s%s%s|male form"
+msgstr "%s no %s%s%s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1306
+#, c-format
+msgid "%sinto the %s%s%s|female form"
+msgstr "%s na %s%s%s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1310
+#, c-format
+msgid "%sinto the %s%s%s|neutral form"
+msgstr "%s no %s%s%s"
+
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr "%s na %s"
+
+#. TRANSLATORS: right, as in 'Turn right'
+#: ../navit/navigation.c:1338
+msgid "right"
+msgstr "á dereita"
+
+#. TRANSLATORS: left, as in 'Turn left'
+#: ../navit/navigation.c:1377
+msgid "left"
+msgstr "á esquerda"
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr "suavemente "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1389
+msgid "strongly "
+msgstr "bruscamente "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr "moi bruscamente "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
+msgid "unknown "
+msgstr "descoñecido "
+
+#: ../navit/navigation.c:1403
+msgid "When possible, please turn around"
+msgstr "Cando sexa posible, dea a volta"
+
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr "Métase pronto na rotonda"
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr "En %s, entre na rotonda"
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Saia da rotonda pola %s"
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "logo saia da rotonda pola %s"
+
+#: ../navit/navigation.c:1445
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "Siga a estrada durante os próximos %s"
+
+#: ../navit/navigation.c:1449
+msgid "soon"
+msgstr "cedo"
+
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Tome a estrada %1$s cara o %2$s"
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr "despois de %i estradas"
+
+#: ../navit/navigation.c:1465
+msgid "now"
+msgstr "agora"
+
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "logo tome a estrada %1$s cara %2$s"
+
+#: ../navit/navigation.c:1484
+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:1514
+#, c-format
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Xire %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:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr ""
+
+#: ../navit/navit.c:1175
+msgid "Command"
+msgstr ""
+
+#: ../navit/navit.c:1179
+msgid "Length"
+msgstr ""
+
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
+msgid "km"
+msgstr ""
+
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
+msgid "m"
+msgstr ""
+
+#: ../navit/navit.c:1193
+msgid "Time"
+msgstr ""
+
+#: ../navit/navit.c:1205
+msgid "Destination Length"
+msgstr ""
+
+#: ../navit/navit.c:1218
+msgid "Destination Time"
+msgstr ""
+
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
+msgid "Roadbook"
+msgstr ""
+
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
+msgid "Set as position"
+msgstr ""
+
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
+msgid "Set as destination"
+msgstr ""
+
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
+msgid "Add as bookmark"
+msgstr ""
+
+#: ../navit/popup.c:337
+#, c-format
+msgid "Point 0x%x 0x%x"
+msgstr ""
+
+#: ../navit/popup.c:338
+#, c-format
+msgid "Screen coord : %d %d"
+msgstr ""
+
+#. 020
+#: ../navit/country.c:39
+msgid "Andorra"
+msgstr ""
+
+#. 784
+#: ../navit/country.c:40
+msgid "United Arab Emirates"
+msgstr ""
+
+#. 004
+#: ../navit/country.c:41
+msgid "Afghanistan"
+msgstr ""
+
+#. 028
+#: ../navit/country.c:42
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. 660
+#: ../navit/country.c:43
+msgid "Anguilla"
+msgstr ""
+
+#. 008
+#: ../navit/country.c:44
+msgid "Albania"
+msgstr ""
+
+#. 051
+#: ../navit/country.c:45
+msgid "Armenia"
+msgstr ""
+
+#. 530
+#: ../navit/country.c:46
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. 024
+#: ../navit/country.c:47
+msgid "Angola"
+msgstr ""
+
+#. 010
+#: ../navit/country.c:48
+msgid "Antarctica"
+msgstr ""
+
+#. 032
+#: ../navit/country.c:49
+msgid "Argentina"
+msgstr ""
+
+#. 016
+#: ../navit/country.c:50
+msgid "American Samoa"
+msgstr ""
+
+#. 040
+#: ../navit/country.c:51
+msgid "Austria"
+msgstr ""
+
+#. 036
+#: ../navit/country.c:52
+msgid "Australia"
+msgstr ""
+
+#. 533
+#: ../navit/country.c:53
+msgid "Aruba"
+msgstr ""
+
+#. 248
+#: ../navit/country.c:54
+msgid "Aland Islands"
+msgstr ""
+
+#. 031
+#: ../navit/country.c:55
+msgid "Azerbaijan"
+msgstr ""
+
+#. 070
+#: ../navit/country.c:56
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#. 052
+#: ../navit/country.c:57
+msgid "Barbados"
+msgstr ""
+
+#. 050
+#: ../navit/country.c:58
+msgid "Bangladesh"
+msgstr ""
+
+#. 056
+#: ../navit/country.c:59
+msgid "Belgium"
+msgstr ""
+
+#. 854
+#: ../navit/country.c:60
+msgid "Burkina Faso"
+msgstr ""
+
+#. 100
+#: ../navit/country.c:61
+msgid "Bulgaria"
+msgstr ""
+
+#. 048
+#: ../navit/country.c:62
+msgid "Bahrain"
+msgstr ""
+
+#. 108
+#: ../navit/country.c:63
+msgid "Burundi"
+msgstr ""
+
+#. 204
+#: ../navit/country.c:64
+msgid "Benin"
+msgstr ""
+
+#. 652
+#: ../navit/country.c:65
+msgid "Saint Barthelemy"
+msgstr ""
+
+#. 060
+#: ../navit/country.c:66
+msgid "Bermuda"
+msgstr ""
+
+#. 096
+#: ../navit/country.c:67
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. 068
+#: ../navit/country.c:68
+msgid "Bolivia"
+msgstr ""
+
+#. 076
+#: ../navit/country.c:69
+msgid "Brazil"
+msgstr ""
+
+#. 044
+#: ../navit/country.c:70
+msgid "Bahamas"
+msgstr ""
+
+#. 064
+#: ../navit/country.c:71
+msgid "Bhutan"
+msgstr ""
+
+#. 074
+#: ../navit/country.c:72
+msgid "Bouvet Island"
+msgstr ""
+
+#. 072
+#: ../navit/country.c:73
+msgid "Botswana"
+msgstr ""
+
+#. 112
+#: ../navit/country.c:74
+msgid "Belarus"
+msgstr ""
+
+#. 084
+#: ../navit/country.c:75
+msgid "Belize"
+msgstr ""
+
+#. 124
+#: ../navit/country.c:76
+msgid "Canada"
+msgstr ""
+
+#. 166
+#: ../navit/country.c:77
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. 180
+#: ../navit/country.c:78
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#. 140
+#: ../navit/country.c:79
+msgid "Central African Republic"
+msgstr ""
+
+#. 178
+#: ../navit/country.c:80
+msgid "Congo"
+msgstr ""
+
+#. 756
+#: ../navit/country.c:81
+msgid "Switzerland"
+msgstr ""
+
+#. 384
+#: ../navit/country.c:82
+msgid "Cote d'Ivoire"
+msgstr ""
+
+#. 184
+#: ../navit/country.c:83
+msgid "Cook Islands"
+msgstr ""
+
+#. 152
+#: ../navit/country.c:84
+msgid "Chile"
+msgstr ""
+
+#. 120
+#: ../navit/country.c:85
+msgid "Cameroon"
+msgstr ""
+
+#. 156
+#: ../navit/country.c:86
+msgid "China"
+msgstr ""
+
+#. 170
+#: ../navit/country.c:87
+msgid "Colombia"
+msgstr ""
+
+#. 188
+#: ../navit/country.c:88
+msgid "Costa Rica"
+msgstr ""
+
+#. 192
+#: ../navit/country.c:89
+msgid "Cuba"
+msgstr ""
+
+#. 132
+#: ../navit/country.c:90
+msgid "Cape Verde"
+msgstr ""
+
+#. 162
+#: ../navit/country.c:91
+msgid "Christmas Island"
+msgstr ""
+
+#. 196
+#: ../navit/country.c:92
+msgid "Cyprus"
+msgstr ""
+
+#. 203
+#: ../navit/country.c:93
+msgid "Czech Republic"
+msgstr ""
+
+#. 276
+#: ../navit/country.c:94
+msgid "Germany"
+msgstr ""
+
+#. 262
+#: ../navit/country.c:95
+msgid "Djibouti"
+msgstr ""
+
+#. 208
+#: ../navit/country.c:96
+msgid "Denmark"
+msgstr ""
+
+#. 212
+#: ../navit/country.c:97
+msgid "Dominica"
+msgstr ""
+
+#. 214
+#: ../navit/country.c:98
+msgid "Dominican Republic"
+msgstr ""
+
+#. 012
+#: ../navit/country.c:99
+msgid "Algeria"
+msgstr ""
+
+#. 218
+#: ../navit/country.c:100
+msgid "Ecuador"
+msgstr ""
+
+#. 233
+#: ../navit/country.c:101
+msgid "Estonia"
+msgstr ""
+
+#. 818
+#: ../navit/country.c:102
+msgid "Egypt"
+msgstr ""
+
+#. 732
+#: ../navit/country.c:103
+msgid "Western Sahara"
+msgstr ""
+
+#. 232
+#: ../navit/country.c:104
+msgid "Eritrea"
+msgstr ""
+
+#. 724
+#: ../navit/country.c:105
+msgid "Spain"
+msgstr ""
+
+#. 231
+#: ../navit/country.c:106
+msgid "Ethiopia"
+msgstr ""
+
+#. 246
+#: ../navit/country.c:107
+msgid "Finland"
+msgstr ""
+
+#. 242
+#: ../navit/country.c:108
+msgid "Fiji"
+msgstr ""
+
+#. 238
+#: ../navit/country.c:109
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#. 583
+#: ../navit/country.c:110
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#. 234
+#: ../navit/country.c:111
+msgid "Faroe Islands"
+msgstr ""
+
+#. 250
+#: ../navit/country.c:112
+msgid "France"
+msgstr ""
+
+#. 266
+#: ../navit/country.c:113
+msgid "Gabon"
+msgstr ""
+
+#. 826
+#: ../navit/country.c:114
+msgid "United Kingdom"
+msgstr ""
+
+#. 308
+#: ../navit/country.c:115
+msgid "Grenada"
+msgstr ""
+
+#. 268
+#: ../navit/country.c:116
+msgid "Georgia"
+msgstr ""
+
+#. 254
+#: ../navit/country.c:117
+msgid "French Guiana"
+msgstr ""
+
+#. 831
+#: ../navit/country.c:118
+msgid "Guernsey"
+msgstr ""
+
+#. 288
+#: ../navit/country.c:119
+msgid "Ghana"
+msgstr ""
+
+#. 292
+#: ../navit/country.c:120
+msgid "Gibraltar"
+msgstr ""
+
+#. 304
+#: ../navit/country.c:121
+msgid "Greenland"
+msgstr ""
+
+#. 270
+#: ../navit/country.c:122
+msgid "Gambia"
+msgstr ""
+
+#. 324
+#: ../navit/country.c:123
+msgid "Guinea"
+msgstr ""
+
+#. 312
+#: ../navit/country.c:124
+msgid "Guadeloupe"
+msgstr ""
+
+#. 226
+#: ../navit/country.c:125
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. 300
+#: ../navit/country.c:126
+msgid "Greece"
+msgstr ""
+
+#. 239
+#: ../navit/country.c:127
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. 320
+#: ../navit/country.c:128
+msgid "Guatemala"
+msgstr ""
+
+#. 316
+#: ../navit/country.c:129
+msgid "Guam"
+msgstr ""
+
+#. 624
+#: ../navit/country.c:130
+msgid "Guinea-Bissau"
+msgstr ""
+
+#. 328
+#: ../navit/country.c:131
+msgid "Guyana"
+msgstr ""
+
+#. 344
+#: ../navit/country.c:132
+msgid "Hong Kong"
+msgstr ""
+
+#. 334
+#: ../navit/country.c:133
+msgid "Heard Island and McDonald Islands"
+msgstr ""
+
+#. 340
+#: ../navit/country.c:134
+msgid "Honduras"
+msgstr ""
+
+#. 191
+#: ../navit/country.c:135
+msgid "Croatia"
+msgstr ""
+
+#. 332
+#: ../navit/country.c:136
+msgid "Haiti"
+msgstr ""
+
+#. 348
+#: ../navit/country.c:137
+msgid "Hungary"
+msgstr ""
+
+#. 360
+#: ../navit/country.c:138
+msgid "Indonesia"
+msgstr ""
+
+#. 372
+#: ../navit/country.c:139
+msgid "Ireland"
+msgstr ""
+
+#. 376
+#: ../navit/country.c:140
+msgid "Israel"
+msgstr ""
+
+#. 833
+#: ../navit/country.c:141
+msgid "Isle of Man"
+msgstr ""
+
+#. 356
+#: ../navit/country.c:142
+msgid "India"
+msgstr ""
+
+#. 086
+#: ../navit/country.c:143
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. 368
+#: ../navit/country.c:144
+msgid "Iraq"
+msgstr ""
+
+#. 364
+#: ../navit/country.c:145
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+#. 352
+#: ../navit/country.c:146
+msgid "Iceland"
+msgstr ""
+
+#. 380
+#: ../navit/country.c:147
+msgid "Italy"
+msgstr ""
+
+#. 832
+#: ../navit/country.c:148
+msgid "Jersey"
+msgstr ""
+
+#. 388
+#: ../navit/country.c:149
+msgid "Jamaica"
+msgstr ""
+
+#. 400
+#: ../navit/country.c:150
+msgid "Jordan"
+msgstr ""
+
+#. 392
+#: ../navit/country.c:151
+msgid "Japan"
+msgstr ""
+
+#. 404
+#: ../navit/country.c:152
+msgid "Kenya"
+msgstr ""
+
+#. 417
+#: ../navit/country.c:153
+msgid "Kyrgyzstan"
+msgstr ""
+
+#. 116
+#: ../navit/country.c:154
+msgid "Cambodia"
+msgstr ""
+
+#. 296
+#: ../navit/country.c:155
+msgid "Kiribati"
+msgstr ""
+
+#. 174
+#: ../navit/country.c:156
+msgid "Comoros"
+msgstr ""
+
+#. 659
+#: ../navit/country.c:157
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
+#. 408
+#: ../navit/country.c:158
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#. 410
+#: ../navit/country.c:159
+msgid "Korea, Republic of"
+msgstr ""
+
+#. 414
+#: ../navit/country.c:160
+msgid "Kuwait"
+msgstr ""
+
+#. 136
+#: ../navit/country.c:161
+msgid "Cayman Islands"
+msgstr ""
+
+#. 398
+#: ../navit/country.c:162
+msgid "Kazakhstan"
+msgstr ""
+
+#. 418
+#: ../navit/country.c:163
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#. 422
+#: ../navit/country.c:164
+msgid "Lebanon"
+msgstr ""
+
+#. 662
+#: ../navit/country.c:165
+msgid "Saint Lucia"
+msgstr ""
+
+#. 438
+#: ../navit/country.c:166
+msgid "Liechtenstein"
+msgstr ""
+
+#. 144
+#: ../navit/country.c:167
+msgid "Sri Lanka"
+msgstr ""
+
+#. 430
+#: ../navit/country.c:168
+msgid "Liberia"
+msgstr ""
+
+#. 426
+#: ../navit/country.c:169
+msgid "Lesotho"
+msgstr ""
+
+#. 440
+#: ../navit/country.c:170
+msgid "Lithuania"
+msgstr ""
+
+#. 442
+#: ../navit/country.c:171
+msgid "Luxembourg"
+msgstr ""
+
+#. 428
+#: ../navit/country.c:172
+msgid "Latvia"
+msgstr ""
+
+#. 434
+#: ../navit/country.c:173
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#. 504
+#: ../navit/country.c:174
+msgid "Morocco"
+msgstr ""
+
+#. 492
+#: ../navit/country.c:175
+msgid "Monaco"
+msgstr ""
+
+#. 498
+#: ../navit/country.c:176
+msgid "Moldova, Republic of"
+msgstr ""
+
+#. 499
+#: ../navit/country.c:177
+msgid "Montenegro"
+msgstr ""
+
+#. 663
+#: ../navit/country.c:178
+msgid "Saint Martin (French part)"
+msgstr ""
+
+#. 450
+#: ../navit/country.c:179
+msgid "Madagascar"
+msgstr ""
+
+#. 584
+#: ../navit/country.c:180
+msgid "Marshall Islands"
+msgstr ""
+
+#. 807
+#: ../navit/country.c:181
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
+#. 466
+#: ../navit/country.c:182
+msgid "Mali"
+msgstr ""
+
+#. 104
+#: ../navit/country.c:183
+msgid "Myanmar"
+msgstr ""
+
+#. 496
+#: ../navit/country.c:184
+msgid "Mongolia"
+msgstr ""
+
+#. 446
+#: ../navit/country.c:185
+msgid "Macao"
+msgstr ""
+
+#. 580
+#: ../navit/country.c:186
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. 474
+#: ../navit/country.c:187
+msgid "Martinique"
+msgstr ""
+
+#. 478
+#: ../navit/country.c:188
+msgid "Mauritania"
+msgstr ""
+
+#. 500
+#: ../navit/country.c:189
+msgid "Montserrat"
+msgstr ""
+
+#. 470
+#: ../navit/country.c:190
+msgid "Malta"
+msgstr ""
+
+#. 480
+#: ../navit/country.c:191
+msgid "Mauritius"
+msgstr ""
+
+#. 462
+#: ../navit/country.c:192
+msgid "Maldives"
+msgstr ""
+
+#. 454
+#: ../navit/country.c:193
+msgid "Malawi"
+msgstr ""
+
+#. 484
+#: ../navit/country.c:194
+msgid "Mexico"
+msgstr ""
+
+#. 458
+#: ../navit/country.c:195
+msgid "Malaysia"
+msgstr ""
+
+#. 508
+#: ../navit/country.c:196
+msgid "Mozambique"
+msgstr ""
+
+#. 516
+#: ../navit/country.c:197
+msgid "Namibia"
+msgstr ""
+
+#. 540
+#: ../navit/country.c:198
+msgid "New Caledonia"
+msgstr ""
+
+#. 562
+#: ../navit/country.c:199
+msgid "Niger"
+msgstr ""
+
+#. 574
+#: ../navit/country.c:200
+msgid "Norfolk Island"
+msgstr ""
+
+#. 566
+#: ../navit/country.c:201
+msgid "Nigeria"
+msgstr ""
+
+#. 558
+#: ../navit/country.c:202
+msgid "Nicaragua"
+msgstr ""
+
+#. 528
+#: ../navit/country.c:203
+msgid "Netherlands"
+msgstr ""
+
+#. 578
+#: ../navit/country.c:204
+msgid "Norway"
+msgstr ""
+
+#. 524
+#: ../navit/country.c:205
+msgid "Nepal"
+msgstr ""
+
+#. 520
+#: ../navit/country.c:206
+msgid "Nauru"
+msgstr ""
+
+#. 570
+#: ../navit/country.c:207
+msgid "Niue"
+msgstr ""
+
+#. 554
+#: ../navit/country.c:208
+msgid "New Zealand"
+msgstr ""
+
+#. 512
+#: ../navit/country.c:209
+msgid "Oman"
+msgstr ""
+
+#. 591
+#: ../navit/country.c:210
+msgid "Panama"
+msgstr ""
+
+#. 604
+#: ../navit/country.c:211
+msgid "Peru"
+msgstr ""
+
+#. 258
+#: ../navit/country.c:212
+msgid "French Polynesia"
+msgstr ""
+
+#. 598
+#: ../navit/country.c:213
+msgid "Papua New Guinea"
+msgstr ""
+
+#. 608
+#: ../navit/country.c:214
+msgid "Philippines"
+msgstr ""
+
+#. 586
+#: ../navit/country.c:215
+msgid "Pakistan"
+msgstr ""
+
+#. 616
+#: ../navit/country.c:216
+msgid "Poland"
+msgstr ""
+
+#. 666
+#: ../navit/country.c:217
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. 612
+#: ../navit/country.c:218
+msgid "Pitcairn"
+msgstr ""
+
+#. 630
+#: ../navit/country.c:219
+msgid "Puerto Rico"
+msgstr ""
+
+#. 275
+#: ../navit/country.c:220
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#. 620
+#: ../navit/country.c:221
+msgid "Portugal"
+msgstr ""
+
+#. 585
+#: ../navit/country.c:222
+msgid "Palau"
+msgstr ""
+
+#. 600
+#: ../navit/country.c:223
+msgid "Paraguay"
+msgstr ""
+
+#. 634
+#: ../navit/country.c:224
+msgid "Qatar"
+msgstr ""
+
+#. 638
+#: ../navit/country.c:225
+msgid "Reunion"
+msgstr ""
+
+#. 642
+#: ../navit/country.c:226
+msgid "Romania"
+msgstr ""
+
+#. 688
+#: ../navit/country.c:227
+msgid "Serbia"
+msgstr ""
+
+#. 643
+#: ../navit/country.c:228
+msgid "Russian Federation"
+msgstr ""
+
+#. 646
+#: ../navit/country.c:229
+msgid "Rwanda"
+msgstr ""
+
+#. 682
+#: ../navit/country.c:230
+msgid "Saudi Arabia"
+msgstr ""
+
+#. 090
+#: ../navit/country.c:231
+msgid "Solomon Islands"
+msgstr ""
+
+#. 690
+#: ../navit/country.c:232
+msgid "Seychelles"
+msgstr ""
+
+#. 736
+#: ../navit/country.c:233
+msgid "Sudan"
+msgstr ""
+
+#. 752
+#: ../navit/country.c:234
+msgid "Sweden"
+msgstr ""
+
+#. 702
+#: ../navit/country.c:235
+msgid "Singapore"
+msgstr ""
+
+#. 654
+#: ../navit/country.c:236
+msgid "Saint Helena"
+msgstr ""
+
+#. 705
+#: ../navit/country.c:237
+msgid "Slovenia"
+msgstr ""
+
+#. 744
+#: ../navit/country.c:238
+msgid "Svalbard and Jan Mayen"
+msgstr ""
+
+#. 703
+#: ../navit/country.c:239
+msgid "Slovakia"
+msgstr ""
+
+#. 694
+#: ../navit/country.c:240
+msgid "Sierra Leone"
+msgstr ""
+
+#. 674
+#: ../navit/country.c:241
+msgid "San Marino"
+msgstr ""
+
+#. 686
+#: ../navit/country.c:242
+msgid "Senegal"
+msgstr ""
+
+#. 706
+#: ../navit/country.c:243
+msgid "Somalia"
+msgstr ""
+
+#. 740
+#: ../navit/country.c:244
+msgid "Suriname"
+msgstr ""
+
+#. 678
+#: ../navit/country.c:245
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#. 222
+#: ../navit/country.c:246
+msgid "El Salvador"
+msgstr ""
+
+#. 760
+#: ../navit/country.c:247
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#. 748
+#: ../navit/country.c:248
+msgid "Swaziland"
+msgstr ""
+
+#. 796
+#: ../navit/country.c:249
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. 148
+#: ../navit/country.c:250
+msgid "Chad"
+msgstr ""
+
+#. 260
+#: ../navit/country.c:251
+msgid "French Southern Territories"
+msgstr ""
+
+#. 768
+#: ../navit/country.c:252
+msgid "Togo"
+msgstr ""
+
+#. 764
+#: ../navit/country.c:253
+msgid "Thailand"
+msgstr ""
+
+#. 762
+#: ../navit/country.c:254
+msgid "Tajikistan"
+msgstr ""
+
+#. 772
+#: ../navit/country.c:255
+msgid "Tokelau"
+msgstr ""
+
+#. 626
+#: ../navit/country.c:256
+msgid "Timor-Leste"
+msgstr ""
+
+#. 795
+#: ../navit/country.c:257
+msgid "Turkmenistan"
+msgstr ""
+
+#. 788
+#: ../navit/country.c:258
+msgid "Tunisia"
+msgstr ""
+
+#. 776
+#: ../navit/country.c:259
+msgid "Tonga"
+msgstr ""
+
+#. 792
+#: ../navit/country.c:260
+msgid "Turkey"
+msgstr ""
+
+#. 780
+#: ../navit/country.c:261
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. 798
+#: ../navit/country.c:262
+msgid "Tuvalu"
+msgstr ""
+
+#. 158
+#: ../navit/country.c:263
+msgid "Taiwan, Province of China"
+msgstr ""
+
+#. 834
+#: ../navit/country.c:264
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#. 804
+#: ../navit/country.c:265
+msgid "Ukraine"
+msgstr ""
+
+#. 800
+#: ../navit/country.c:266
+msgid "Uganda"
+msgstr ""
+
+#. 581
+#: ../navit/country.c:267
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#. 840
+#: ../navit/country.c:268
+msgid "United States"
+msgstr ""
+
+#. 858
+#: ../navit/country.c:269
+msgid "Uruguay"
+msgstr ""
+
+#. 860
+#: ../navit/country.c:270
+msgid "Uzbekistan"
+msgstr ""
+
+#. 336
+#: ../navit/country.c:271
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. 670
+#: ../navit/country.c:272
+msgid "Saint Vincent and the Grenadines"
+msgstr ""
+
+#. 862
+#: ../navit/country.c:273
+msgid "Venezuela"
+msgstr ""
+
+#. 092
+#: ../navit/country.c:274
+msgid "Virgin Islands, British"
+msgstr ""
+
+#. 850
+#: ../navit/country.c:275
+msgid "Virgin Islands, U.S."
+msgstr ""
+
+#. 704
+#: ../navit/country.c:276
+msgid "Viet Nam"
+msgstr ""
+
+#. 548
+#: ../navit/country.c:277
+msgid "Vanuatu"
+msgstr ""
+
+#. 876
+#: ../navit/country.c:278
+msgid "Wallis and Futuna"
+msgstr ""
+
+#. 882
+#: ../navit/country.c:279
+msgid "Samoa"
+msgstr ""
+
+#. 887
+#: ../navit/country.c:280
+msgid "Yemen"
+msgstr ""
+
+#. 175
+#: ../navit/country.c:281
+msgid "Mayotte"
+msgstr ""
+
+#. 710
+#: ../navit/country.c:282
+msgid "South Africa"
+msgstr ""
+
+#. 894
+#: ../navit/country.c:283
+msgid "Zambia"
+msgstr ""
+
+#. 716
+#: ../navit/country.c:284
+msgid "Zimbabwe"
+msgstr ""
+
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+msgid "Car"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso2"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso3"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
+#: ../navit/gui/internal/gui_internal.c:2865
+msgid "Country"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "Postal"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
+msgid "Town"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "District"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/gtk/destination.c:446
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
+msgid "Street"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
+msgid "Number"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:429
+msgid "Enter Destination"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:438
+msgid "Zip Code"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:440
+msgid "City"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:443
+msgid "District/Township"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
+msgid "Map"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:472
+msgid "Bookmark"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
+msgid "Destination"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
+msgid "Display"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
+msgid "Route"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:198
+msgid "Former Destinations"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
+msgid "Bookmarks"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
+msgid "Layout"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:202
+msgid "Projection"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
+msgid "Vehicle"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:204
+msgid "ZoomOut"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:205
+msgid "ZoomIn"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:206
+msgid "Recalculate"
+msgstr ""
+
+#: ../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:213
+msgid "Stop Navigation"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:214
+msgid "Test"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:215
+msgid "_Quit"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:222
+msgid "Cursor"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:223
+msgid "Lock on Road"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr ""
+
+#: ../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:2941
+msgid "Fullscreen"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:238
+msgid "Data"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "N"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "NE"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "E"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "SE"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "S"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "SW"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "W"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:58
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:97
+msgid "NW"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
+msgid "No"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
+#: ../navit/gui/internal/gui_internal.c:2948
+msgid "2D"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
+#: ../navit/gui/internal/gui_internal.c:2954
+msgid "3D"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
+#, c-format
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
+msgid "Route 0000km  0+00:00 ETA"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1335
+msgid "Back to map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1344
+msgid "Main Menu"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1461
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1611
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2082
+msgid "Streets"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
+msgid "View in Browser"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2113
+msgid "View Attributes"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2148
+msgid "View on map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2261
+#, c-format
+msgid "Bookmark %s"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
+msgid "Window Mode"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
+msgid "Actions"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Map Point"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3003
+msgid "Vehicle Position"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3012
+msgid "Quit"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3018
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
+msgid "Maps"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3078
+msgid "Show Satellite Status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3112
+msgid "Show NMEA Data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3136
+msgid "Set as active"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3142
+msgid "Show Satellite status"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3148
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
+msgid "Rules"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3198
+msgid "Lock on road"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3210
+msgid "Map follows Vehicle"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
+msgid "Settings"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3268
+msgid "Main menu"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3274
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3281
+msgid "Tools"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/he.po.in b/po/he.po.in
index 91802b747..dff7bd2d2 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-02-11 15:34+0000\n"
-"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-07-02 15:07+0000\n"
+"Last-Translator: Nadav <Unknown>\n"
 "Language-Team: Hebrew <he@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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,266 +29,309 @@ msgstr "מופעל מתיקיית המקור\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "הגדרת '%s' ל־'%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "במקום ה־0"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "ראשון"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "שני"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "שלישי"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "רביעי"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "חמישי"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "שישי"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr "היציאה ה-0"
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr "היציאה הראשונה"
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr "היציאה השנייה"
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr "היציאה השלישית"
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr "היציאה הרביעית"
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr "היציאה החמישית"
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr "היציאה השישית"
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d מ'"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "בעוד %d מ'"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d מטרים"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "בעוד %d מטרים"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d קילומטר"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "בעוד  %d.%d קילומטרים"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "קילומטר אחד"
 msgstr[1] "%d קילומטרים"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "בעוד קילומטר אחד"
 msgstr[1] "בעוד %d קילומטרים"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "יציאה"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s אל רחוב %s %s %s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sאל תוך ה%s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "ימינה"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "שמאלה"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "מעט "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "בצורה חדה "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "לא ידוע "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "כשיתאפשר לך, פנה חזרה"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "הכנס לכיכר הקרובה"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "ב%s, הכנס לכיכר"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "אחר כך צא מהכיכר ב%s"
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "המשך בדרך זו למשך %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "בקרוב"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "קח את הכביש ה%1$s אל %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "לאחר %i כבישים"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "כעת"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "ואז קח את הכביש ה%1$s אל ה%2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "פנה %1$s %2$s %4$s %3$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "ואז פנה %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "הגעת ליעדך %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "ואז הגעת ליעד."
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "מיקום"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "פקודה"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "אורך"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "ק\"מ"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "מ'"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "זמן"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "מרחק ליעד"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "זמן ליעד"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "הוראות נסיעה"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "קבע כמיקום נוכחי"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "קבע כיעד"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "צור סימניה למקום זה"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "נקודה 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "קואורדינטת מסך: %d %d"
@@ -1523,6 +1566,10 @@ msgstr "זמביה"
 msgid "Zimbabwe"
 msgstr "זימבבואה"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1537,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "ארץ"
 
@@ -1548,9 +1595,9 @@ msgstr "דואר"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "עיירה"
 
@@ -1561,8 +1608,8 @@ msgstr "מחוז"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "רחוב"
 
@@ -1599,12 +1646,13 @@ msgid "Destination"
 msgstr "יעד"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "תצוגה"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "מסלול"
 
@@ -1613,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "יעדים קודמים"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "סימניות"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "מערך"
 
@@ -1629,8 +1677,8 @@ msgid "Projection"
 msgstr "תכנון"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "רכב (ׂGPS)"
 
@@ -1671,12 +1719,16 @@ msgid "Lock on Road"
 msgstr "הנעל על הדרך"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "הצפנה"
 
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "מסך מלא"
 
@@ -1729,12 +1781,12 @@ msgid "No"
 msgstr "לא"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "דו-מימד"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "תלת מימד"
 
@@ -1751,70 +1803,79 @@ msgstr "נשארו עוד %4.0f ק\"מ, זמן הגעה משוער %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "מסלול 0000ק\"מ 0+00:00 זמן הגעה משוער"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "חזור למפה"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "תפריט ראשי"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "עזרה"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "חזרה"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "נ\"צ"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "רחובות"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr "מספרי בתים"
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "צפה בדפדפן אינטרנט"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "צפה בתכונות"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "צפה במפה"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "סימנייה %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr "מספר בית"
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "מצב חלון"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "פעולות"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "נקודה במפה"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "מיקום רכב"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1822,54 +1883,54 @@ msgstr ""
 "עצור\n"
 "ניווט"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "מפות"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "הצגת מצב הלוויינים"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "הצגת נתוני NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "הגדרה כפעיל"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "הצגת מצב הלוויינים"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "הצגת נתוני NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "כללים"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "נעול על הדרך"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "מפה עוקבת אחר הרכב"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "תפריט ראשי"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1877,48 +1938,19 @@ msgstr ""
 "הצגת\n"
 "מפה"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "כלים"
 
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr "הודעה"
 
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
 
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "תיאור"
diff --git a/po/hu.po.in b/po/hu.po.in
index 464f12c27..4d682684f 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-05-08 18:21+0000\n"
-"Last-Translator: kalmarzs <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 07:43+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Hungarian <hu@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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,188 +29,309 @@ msgstr "Futtatás a forráskönyvtárból\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "%s %s beállítása\n"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr "nulladik"
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr "első"
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr "második"
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr "harmadik"
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr "negyedik"
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr "ötödik"
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr "hatodik"
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr "nulladik kijárat"
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr "első kijárat"
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr "második kijárat"
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr "harmadik kijárat"
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr "negyedik kijárat"
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr "ötödik kijárat"
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr "hatodik kijárat"
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "%d m múlva"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d méter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "%d méter múlva"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilométer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d.%d kilométer múlva"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "egy kilométer"
 msgstr[1] "%d kilométer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "egy kilométer múlva"
 msgstr[1] "%d kilométer múlva"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "kijárat"
 
+#: ../navit/navigation.c:1268
+msgid "into the ramp"
+msgstr "a felhajtóra"
+
 #. 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:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s a(z) %s%s%s utcába"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s a(z) %s%s%s utcába"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s a(z) %s%s%s utcába"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s a(z) %s%s%s utcába"
 
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr "%s hajts rá a következő útra: %s"
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "jobbra"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "balra"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "enyhén "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "erősen "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "ismeretlen "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Ha lehet, fordujon meg"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr "Hajts be a körforgalomba hamarosan."
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr "%s múlva hajts be a körforgalomba."
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Hagy el a körforgalmat a %s"
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "majd hagyd el a körforgalmat a %s"
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Haladjon az úton a következő %sig"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "hamarosan"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "most"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "hiba"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Fordulj %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Érkezés a célhoz %s"
 
-#: ../navit/navit.c:1165
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr ""
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Parancs"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Hossz"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Idő"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Távolság a céltól"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Menetidő"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Útvonalak"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Pozicionálás"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Uticél megjelölése"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Könyvjelző hozzáadása"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Pont 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Koordináták: %d %d"
@@ -1445,6 +1566,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1459,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Ország"
 
@@ -1470,9 +1595,9 @@ msgstr "Ir. szám"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Település"
 
@@ -1483,8 +1608,8 @@ msgstr "Kerület"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Utca"
 
@@ -1521,12 +1646,13 @@ msgid "Destination"
 msgstr "Cél"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Mutat"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Útvonal"
 
@@ -1535,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Előzmények"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Könyvjelzők"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Elrendezés"
 
@@ -1551,8 +1677,8 @@ msgid "Projection"
 msgstr "Vetület"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Jármű"
 
@@ -1592,8 +1718,17 @@ msgstr "Mutató"
 msgid "Lock on Road"
 msgstr "Rögzítés az úton"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr "Északi"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Ráközelítés"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
@@ -1641,151 +1776,17 @@ msgstr "Ny"
 msgid "NW"
 msgstr "ÉNy"
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
-#, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Út hossza %4.0fkm Becsült menetidő %02d:%02d"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
-msgid "Route 0000km  0+00:00 ETA"
-msgstr "Út hossza 0000km Becsült menetidő 0+00:00"
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr "nulladik"
-
-#: ../navit/navigation.c:242
-msgid "first"
-msgstr "első"
-
-#: ../navit/navigation.c:244
-msgid "second"
-msgstr "második"
-
-#: ../navit/navigation.c:246
-msgid "third"
-msgstr "harmadik"
-
-#: ../navit/navigation.c:248
-msgid "fourth"
-msgstr "negyedik"
-
-#: ../navit/navigation.c:250
-msgid "fifth"
-msgstr "ötödik"
-
-#: ../navit/navigation.c:252
-msgid "sixth"
-msgstr "hatodik"
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr "nulladik kijárat"
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr "első kijárat"
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr "második kijárat"
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr "harmadik kijárat"
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr "negyedik kijárat"
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr "ötödik kijárat"
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr "hatodik kijárat"
-
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr "a felhajtóra"
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr "%s hajts rá a következő útra: %s"
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr "Hajts be a körforgalomba hamarosan."
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr "%s múlva hajts be a körforgalomba."
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "Hagy el a körforgalmat a %s"
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "majd hagyd el a körforgalmat a %s"
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
-msgid "Northing"
-msgstr "Északi"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr "Ráközelítés"
-
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1793,128 +1794,159 @@ msgstr "3D"
 msgid "OT"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
+#, c-format
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr "Út hossza %4.0fkm Becsült menetidő %02d:%02d"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
+msgid "Route 0000km  0+00:00 ETA"
+msgstr "Út hossza 0000km Becsült menetidő 0+00:00"
+
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Vissza a térképhez"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Főmenü"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Súgó"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Vissza"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "POI-k"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Utcák"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Megtekintés böngészőben"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Megtekintés térképen"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Jármű helyzete"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Térképek"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Műhold státusz"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Műhold státusz"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Rögzítés az úton"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Beállítások"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Főmenü"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Eszközök"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/id.po.in b/po/id.po.in
index b25e81bc5..4bf887102 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -7,68 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-30 14:01+0000\n"
-"Last-Translator: M Bambang I <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 08:21+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/navigation.c:1268
-msgid "exit"
-msgstr "keluar"
-
-#. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
-msgid "right"
-msgstr "kanan"
-
-#. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
-msgid "left"
-msgstr "Kiri"
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
-msgid "easily "
-msgstr "dengan mudah "
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
-msgid "unknown "
-msgstr "tidak diketahui "
-
-#: ../navit/navigation.c:1402
-msgid "When possible, please turn around"
-msgstr "bila memungkinkan, balik arah"
-
-#: ../navit/navigation.c:1444
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
-
-#: ../navit/navigation.c:1448
-msgid "soon"
-msgstr "segera"
-
-#: ../navit/navigation.c:1464
-msgid "now"
-msgstr "saat ini"
-
-#: ../navit/navigation.c:1483
-msgid "error"
-msgstr "kesalahan"
-
-#: ../navit/navigation.c:1521
-#, c-format
-msgid "You have reached your destination %s"
-msgstr "anda telah sampai pada tujuan %s"
-
 #: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
@@ -79,254 +29,309 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "kelima"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr ""
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr ""
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr ""
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr ""
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr ""
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "in %d.%d kilometer"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1266
+msgid "exit"
+msgstr "keluar"
+
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s menuju jalan %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:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
+#. TRANSLATORS: right, as in 'Turn right'
+#: ../navit/navigation.c:1338
+msgid "right"
+msgstr "kanan"
+
+#. TRANSLATORS: left, as in 'Turn left'
+#: ../navit/navigation.c:1377
+msgid "left"
+msgstr "Kiri"
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr "dengan mudah "
+
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr ""
 
-#: ../navit/navigation.c:1412
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
+msgid "unknown "
+msgstr "tidak diketahui "
+
+#: ../navit/navigation.c:1403
+msgid "When possible, please turn around"
+msgstr "bila memungkinkan, balik arah"
+
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr ""
 
+#: ../navit/navigation.c:1445
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr "ikuti jalan untuk ke tujuan berikutnya %s"
+
+#: ../navit/navigation.c:1449
+msgid "soon"
+msgstr "segera"
+
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1465
+msgid "now"
+msgstr "saat ini"
+
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
+#: ../navit/navigation.c:1484
+msgid "error"
+msgstr "kesalahan"
+
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1522
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "anda telah sampai pada tujuan %s"
+
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "kemudian anda telah sampai pada tujuan"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Posisi"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Perintah"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr ""
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1561,6 +1566,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1575,7 +1584,7 @@ msgid "Iso3"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Negara"
 
@@ -1586,9 +1595,9 @@ msgstr "Pos"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Kota"
 
@@ -1599,8 +1608,8 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Jalan"
 
@@ -1637,12 +1646,13 @@ msgid "Destination"
 msgstr "Tujuan"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Tampilan"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Rute"
 
@@ -1651,14 +1661,14 @@ msgid "Former Destinations"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr ""
 
@@ -1667,8 +1677,8 @@ msgid "Projection"
 msgstr "Proyeksi"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Kendaraan"
 
@@ -1709,7 +1719,7 @@ msgid "Lock on Road"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr ""
 
@@ -1718,7 +1728,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr ""
 
@@ -1771,12 +1781,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1793,70 +1803,79 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Kembali ke Peta"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Menu Utama"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Kembali"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "jalan"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Posisi kendaraan"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1864,54 +1883,54 @@ msgstr ""
 "Navigasi\n"
 "Berhenti"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Peta - peta"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Status Satelit"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Data NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Status Satelit"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Data NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Aturan - aturan"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Menu Utama"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1919,6 +1938,19 @@ msgstr ""
 "Tampilan\n"
 "Map"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/it.po.in b/po/it.po.in
index dfdee4fe5..3b5033c5a 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-07 17:57+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 13:04+0000\n"
 "Last-Translator: Francesco de Virgilio <fradeve11@gmail.com>\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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,304 +30,309 @@ msgstr "Esecuzione dalla cartella di compilazione\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "impostazione di '%s' a '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "zeresimo"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "primo"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "secondo"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "terzo"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "quarto"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "quinto"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sesto"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "Uscita zeroth"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "prima uscita"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "seconda uscita"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "terza uscita"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "quarta uscita"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "quinta uscita"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sesta uscita"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "fra %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metri"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "fra %d metri"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d chilometri"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "fra %d,%d chilometri"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un chilometro"
 msgstr[1] "%d chilometri"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "fra un chilometro"
 msgstr[1] "fra %d chilometri"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "esci"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sin %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "destra"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "sinistra"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "leggermente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "decisamente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "facendo quasi inversione "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Appena possibile, invertire il senso di marcia"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Entrare in rotatoria"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Tra %s entrare nella rotonda"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Alla rotonda prendere l'uscita %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "e alla rotonda prendere l'uscita %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Seguire la strada per i prossimi %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "tra poco"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Prendere la %1$s strada a %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "tra %i roads"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "adesso"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, 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:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Svoltare %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, 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:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Destinazione raggiunta %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "poi sarete arrivati a destinazione"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Posizione"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Indicazione"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Distanza"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tempo"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Distanza all'arrivo"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Tempo all'arrivo"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Quaderno di viaggio"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Imposta come posizione"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Imposta come destinazione"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Aggiungi come segnalibro"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punto 0x%x, 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordinate schermo: %d, %d"
@@ -1562,6 +1567,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1576,7 +1585,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Stato"
 
@@ -1587,9 +1596,9 @@ msgstr "Postale"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Centro abitato"
 
@@ -1600,8 +1609,8 @@ msgstr "Regione"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Via"
 
@@ -1638,12 +1647,13 @@ msgid "Destination"
 msgstr "Destinazione"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Visualizza"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Percorso"
 
@@ -1652,14 +1662,14 @@ msgid "Former Destinations"
 msgstr "Destinazioni precedenti"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Layout"
 
@@ -1668,8 +1678,8 @@ msgid "Projection"
 msgstr "Proiezione"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Veicolo"
 
@@ -1710,7 +1720,7 @@ msgid "Lock on Road"
 msgstr "Prosegui su questa strada"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Visione verso nord"
 
@@ -1719,7 +1729,7 @@ msgid "Autozoom"
 msgstr "Zoom automatico"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
@@ -1772,12 +1782,12 @@ msgid "No"
 msgstr "No"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1794,123 +1804,132 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Torna alla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Menù principale"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Indietro"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Punti d'interesse"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Strade"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Visualizza nel browser"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Visualizza attributi"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Visualizza sulla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Segnalibro %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Modalità finestre"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Punto sulla mappa"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Posizione del veicolo"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Esci"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr "Stop"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Mappe"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Mostra stato satellite"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Mostra dati NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Imposta come attivo"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Mostra stato satellite"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Mostra dati NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regole"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Blocca sulla strada"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "La mappa segue il veicolo"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Menù principale"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1918,6 +1937,19 @@ msgstr ""
 "Mostra\n"
 "Mappa"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Strumenti"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/ja.po.in b/po/ja.po.in
index 4748f5b14..ed5a324ca 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -7,78 +7,335 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-09-12 05:04+0000\n"
-"Last-Translator: MontBlanc <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 10:48+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/navigation.c:316
+#: ../navit/main.c:231
+#, c-format
+msgid "Running from source directory\n"
+msgstr ""
+
+#: ../navit/main.c:263
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr ""
+
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr ""
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr ""
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr ""
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr ""
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr ""
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr ""
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:316
+#, c-format
+msgid "in %d m"
+msgstr ""
+
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d メートル"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:322
+#, c-format
+msgid "in %d meters"
+msgstr ""
+
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d キロメートル"
 
+#: ../navit/navigation.c:330
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr ""
+
+#: ../navit/navigation.c:334
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../navit/navigation.c:336
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../navit/navigation.c:1266
+msgid "exit"
+msgstr ""
+
+#: ../navit/navigation.c:1268
+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:1298
+#, 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:1302
+#, 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:1306
+#, 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:1310
+#, 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:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "右"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "左"
 
-#: ../navit/navigation.c:1448
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1389
+msgid "strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
+msgid "unknown "
+msgstr ""
+
+#: ../navit/navigation.c:1403
+msgid "When possible, please turn around"
+msgstr ""
+
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr ""
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
+#, c-format
+msgid "Follow the road for the next %s"
+msgstr ""
+
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "まもなく"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "今"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1484
+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:1514
+#, c-format
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "目的地の%sにつきました"
 
-#: ../navit/navit.c:1165
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr ""
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "コマンド"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1179
+msgid "Length"
+msgstr ""
+
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/navit.c:1193
+msgid "Time"
+msgstr ""
+
+#: ../navit/navit.c:1205
+msgid "Destination Length"
+msgstr ""
+
+#: ../navit/navit.c:1218
+msgid "Destination Time"
+msgstr ""
+
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
+msgid "Roadbook"
+msgstr ""
+
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "現在地として設定"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "目的地として設定"
 
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
+msgid "Add as bookmark"
+msgstr ""
+
+#: ../navit/popup.c:337
+#, c-format
+msgid "Point 0x%x 0x%x"
+msgstr ""
+
+#: ../navit/popup.c:338
+#, c-format
+msgid "Screen coord : %d %d"
+msgstr ""
+
 #. 020
 #: ../navit/country.c:39
 msgid "Andorra"
@@ -209,6 +466,11 @@ msgstr "ブルンジ"
 msgid "Benin"
 msgstr "ベナン"
 
+#. 652
+#: ../navit/country.c:65
+msgid "Saint Barthelemy"
+msgstr ""
+
 #. 060
 #: ../navit/country.c:66
 msgid "Bermuda"
@@ -664,6 +926,11 @@ msgstr "キリバス共和国"
 msgid "Comoros"
 msgstr "コモロ"
 
+#. 659
+#: ../navit/country.c:157
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
 #. 408
 #: ../navit/country.c:158
 msgid "Korea, Democratic People's Republic of"
@@ -739,6 +1006,11 @@ msgstr "ルクセンブルク"
 msgid "Latvia"
 msgstr "ラトビア"
 
+#. 434
+#: ../navit/country.c:173
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
 #. 504
 #: ../navit/country.c:174
 msgid "Morocco"
@@ -759,6 +1031,11 @@ msgstr "モルドバ共和国"
 msgid "Montenegro"
 msgstr "モンテネグロ"
 
+#. 663
+#: ../navit/country.c:178
+msgid "Saint Martin (French part)"
+msgstr ""
+
 #. 450
 #: ../navit/country.c:179
 msgid "Madagascar"
@@ -769,6 +1046,11 @@ msgstr "マダガスカル"
 msgid "Marshall Islands"
 msgstr "マーシャル諸島"
 
+#. 807
+#: ../navit/country.c:181
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
 #. 466
 #: ../navit/country.c:182
 msgid "Mali"
@@ -1049,6 +1331,11 @@ msgstr "セントヘレナ"
 msgid "Slovenia"
 msgstr "スロベニア"
 
+#. 744
+#: ../navit/country.c:238
+msgid "Svalbard and Jan Mayen"
+msgstr ""
+
 #. 703
 #: ../navit/country.c:239
 msgid "Slovakia"
@@ -1169,6 +1456,11 @@ msgstr "トリニダード・トバゴ"
 msgid "Tuvalu"
 msgstr "ツバル"
 
+#. 158
+#: ../navit/country.c:263
+msgid "Taiwan, Province of China"
+msgstr ""
+
 #. 834
 #: ../navit/country.c:264
 msgid "Tanzania, United Republic of"
@@ -1204,6 +1496,16 @@ msgstr "ウルグアイ"
 msgid "Uzbekistan"
 msgstr "ウズベキスタン"
 
+#. 336
+#: ../navit/country.c:271
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. 670
+#: ../navit/country.c:272
+msgid "Saint Vincent and the Grenadines"
+msgstr ""
+
 #. 862
 #: ../navit/country.c:273
 msgid "Venezuela"
@@ -1229,6 +1531,11 @@ msgstr "ベトナム"
 msgid "Vanuatu"
 msgstr "バヌアツ"
 
+#. 876
+#: ../navit/country.c:278
+msgid "Wallis and Futuna"
+msgstr ""
+
 #. 882
 #: ../navit/country.c:279
 msgid "Samoa"
@@ -1239,6 +1546,11 @@ msgstr "サモア"
 msgid "Yemen"
 msgstr "イエメン"
 
+#. 175
+#: ../navit/country.c:281
+msgid "Mayotte"
+msgstr ""
+
 #. 710
 #: ../navit/country.c:282
 msgid "South Africa"
@@ -1254,11 +1566,57 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+msgid "Car"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso2"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso3"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "国"
 
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "Postal"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
+msgid "Town"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "District"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/gtk/destination.c:446
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
+msgid "Street"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
+msgid "Number"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:429
 msgid "Enter Destination"
 msgstr "目的地を入力"
@@ -1267,6 +1625,14 @@ msgstr "目的地を入力"
 msgid "Zip Code"
 msgstr "郵便番号"
 
+#: ../navit/gui/gtk/destination.c:440
+msgid "City"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:443
+msgid "District/Township"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "地図"
@@ -1279,7 +1645,14 @@ msgstr "ブックマーク"
 msgid "Destination"
 msgstr "目的地"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:196
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
+msgid "Display"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "ルート"
 
@@ -1288,11 +1661,27 @@ msgid "Former Destinations"
 msgstr "前の目的地"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
+msgid "Layout"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:202
+msgid "Projection"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
+msgid "Vehicle"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr "ズームアウト"
@@ -1305,6 +1694,10 @@ msgstr "ズームイン"
 msgid "Recalculate"
 msgstr "再計算"
 
+#: ../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:213
 msgid "Stop Navigation"
 msgstr "案内中止"
@@ -1313,11 +1706,36 @@ msgstr "案内中止"
 msgid "Test"
 msgstr "テスト"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:215
+msgid "_Quit"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:222
+msgid "Cursor"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:223
+msgid "Lock on Road"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr ""
+
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "全画面表示"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:238
+msgid "Data"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "N"
@@ -1358,425 +1776,17 @@ msgstr "西"
 msgid "NW"
 msgstr "北西"
 
-#: ../navit/main.c:231
-#, c-format
-msgid "Running from source directory\n"
-msgstr ""
-
-#: ../navit/main.c:263
-#, c-format
-msgid "setting '%s' to '%s'\n"
-msgstr ""
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:242
-msgid "first"
-msgstr ""
-
-#: ../navit/navigation.c:244
-msgid "second"
-msgstr ""
-
-#: ../navit/navigation.c:246
-msgid "third"
-msgstr ""
-
-#: ../navit/navigation.c:248
-msgid "fourth"
-msgstr ""
-
-#: ../navit/navigation.c:250
-msgid "fifth"
-msgstr ""
-
-#: ../navit/navigation.c:252
-msgid "sixth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr ""
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:318
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#: ../navit/navigation.c:324
-#, c-format
-msgid "in %d meters"
-msgstr ""
-
-#: ../navit/navigation.c:332
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr ""
-
-#: ../navit/navigation.c:336
-#, c-format
-msgid "one kilometer"
-msgid_plural "%d kilometers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../navit/navigation.c:338
-#, c-format
-msgid "in one kilometer"
-msgid_plural "in %d kilometers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../navit/navigation.c:1268
-msgid "exit"
-msgstr ""
-
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
-#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
-#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
-#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
-#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
-msgid "easily "
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
-msgid "strongly "
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
-msgid "unknown "
-msgstr ""
-
-#: ../navit/navigation.c:1402
-msgid "When possible, please turn around"
-msgstr ""
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1444
-#, c-format
-msgid "Follow the road for the next %s"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1483
-msgid "error"
-msgstr ""
-
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
-#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr ""
-
-#: ../navit/navit.c:1169
-msgid "Length"
-msgstr ""
-
-#: ../navit/navit.c:1183
-msgid "Time"
-msgstr ""
-
-#: ../navit/navit.c:1195
-msgid "Destination Length"
-msgstr ""
-
-#: ../navit/navit.c:1208
-msgid "Destination Time"
-msgstr ""
-
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
-msgid "Roadbook"
-msgstr ""
-
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
-msgid "Add as bookmark"
-msgstr ""
-
-#: ../navit/popup.c:282
-#, c-format
-msgid "Point 0x%x 0x%x"
-msgstr ""
-
-#: ../navit/popup.c:283
-#, c-format
-msgid "Screen coord : %d %d"
-msgstr ""
-
-#. 652
-#: ../navit/country.c:65
-msgid "Saint Barthelemy"
-msgstr ""
-
-#. 659
-#: ../navit/country.c:157
-msgid "Saint Kitts and Nevis"
-msgstr ""
-
-#. 434
-#: ../navit/country.c:173
-msgid "Libyan Arab Jamahiriya"
-msgstr ""
-
-#. 663
-#: ../navit/country.c:178
-msgid "Saint Martin (French part)"
-msgstr ""
-
-#. 807
-#: ../navit/country.c:181
-msgid "Macedonia, the former Yugoslav Republic of"
-msgstr ""
-
-#. 744
-#: ../navit/country.c:238
-msgid "Svalbard and Jan Mayen"
-msgstr ""
-
-#. 158
-#: ../navit/country.c:263
-msgid "Taiwan, Province of China"
-msgstr ""
-
-#. 336
-#: ../navit/country.c:271
-msgid "Holy See (Vatican City State)"
-msgstr ""
-
-#. 670
-#: ../navit/country.c:272
-msgid "Saint Vincent and the Grenadines"
-msgstr ""
-
-#. 876
-#: ../navit/country.c:278
-msgid "Wallis and Futuna"
-msgstr ""
-
-#. 175
-#: ../navit/country.c:281
-msgid "Mayotte"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
-#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
-msgid "Car"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127
-msgid "Iso2"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127
-msgid "Iso3"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-msgid "Postal"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
-msgid "Town"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-msgid "District"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
-msgid "Street"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
-msgid "Number"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:440
-msgid "City"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:443
-msgid "District/Township"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
-msgid "Display"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
-msgid "Layout"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:202
-msgid "Projection"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
-msgid "Vehicle"
-msgstr ""
-
-#: ../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:215
-msgid "_Quit"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:222
-msgid "Cursor"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:223
-msgid "Lock on Road"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
-msgid "Northing"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:238
-msgid "Data"
-msgstr ""
-
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1793,128 +1803,150 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/nb.po.in b/po/nb.po.in
index 725dfc3d5..a9e76a4d9 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -8,227 +8,334 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-24 01:01+0000\n"
-"Last-Translator: Kenneth Langdalen <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-07-02 17:16+0000\n"
+"Last-Translator: Thor H. Johansen <thj@thj.no>\n"
 "Language-Team: Bendik Brenne <bendik@xplore.nu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+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 "Kjører fra kildemappa\n"
+msgstr "Kjører fra kildemappen\n"
 
 #: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "setter '%s' til '%s'\n"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr "nullte"
+
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "første"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "andre"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "tredje"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "fjerde"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "femte"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sjette"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr "nullte avkjørsel"
+
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "første avkjøring"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "andre avkjøring"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "tredje avkjøring"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "fjerde avkjøring"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "femte avkjøring"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sjette avkjøring"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "om %d meter"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "om %d meter"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "om %d,%d kilometer"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "én kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om én kilometer"
 msgstr[1] "om %d kilometer"
 
+#: ../navit/navigation.c:1266
+msgid "exit"
+msgstr "avkjørsel"
+
+#: ../navit/navigation.c:1268
+msgid "into the ramp"
+msgstr "ut på akselerasjonsfeltet"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
+#: ../navit/navigation.c:1298
+#, c-format
+msgid "%sinto the street %s%s%s"
+msgstr "%sinn på gaten %s%s%s"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1302
+#, c-format
+msgid "%sinto the %s%s%s|male form"
+msgstr "%sinn på %s%s%sen"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1306
+#, c-format
+msgid "%sinto the %s%s%s|female form"
+msgstr "%sinn på %s%s%sa"
+
+#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
+#: ../navit/navigation.c:1310
+#, c-format
+msgid "%sinto the %s%s%s|neutral form"
+msgstr "%sin på %s%s%set"
+
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr "%sinn på %s"
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "høyre"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "venstre"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "slakt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "skarpt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr "veldig skarpt "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "ukjent "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
-msgstr "Snu, om det er mulig"
+msgstr "Snu når det er mulig"
+
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr "Kjør inn i rundkjøringen snart"
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr "Om %s, kjør inn i rundkjøringen"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Forlat rundkjøringen ut %s"
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "forlat så rundkjøringen ut %s"
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Følg veien de neste %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "snart"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Ta den %1$s veien mot %2$s"
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr "etter %i avkjøringer"
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nå"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "ta deretter %1$s til %2$s"
+
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "feil"
 
-#: ../navit/navigation.c:1521
+#. 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:1514
+#, c-format
+msgid "Turn %1$s%2$s %3$s%4$s"
+msgstr "Sving %1$s til %2$s om %3$s %4$s"
+
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr "sving så %1$s%2$s %3$s%4$s"
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du har nådd ditt reisemål %s"
 
-#: ../navit/navit.c:1165
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr "så har du nådd ditt reisemål."
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr "Posisjon"
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Instruks"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Avstand"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tid"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Avstand til målet"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Tid til målet"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Kjørebok"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Sett som posisjon"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
-msgstr "Sett som destinasjon"
+msgstr "Sett som reisemål"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Legg til som bokmerke"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
-msgstr "Skjerm koord: %d %d"
+msgstr "Skjermkoordinat: %d %d"
 
 #. 020
 #: ../navit/country.c:39
@@ -383,7 +490,7 @@ msgstr "Bolivia"
 #. 076
 #: ../navit/country.c:69
 msgid "Brazil"
-msgstr "Brazil"
+msgstr "Brasil"
 
 #. 044
 #: ../navit/country.c:70
@@ -408,7 +515,7 @@ msgstr "Botswana"
 #. 112
 #: ../navit/country.c:74
 msgid "Belarus"
-msgstr "Hvite-Russland"
+msgstr "Hviterussland"
 
 #. 084
 #: ../navit/country.c:75
@@ -418,7 +525,7 @@ msgstr "Belize"
 #. 124
 #: ../navit/country.c:76
 msgid "Canada"
-msgstr "Kanada"
+msgstr "Canada"
 
 #. 166
 #: ../navit/country.c:77
@@ -533,7 +640,7 @@ msgstr "Den dominikanske republikk"
 #. 012
 #: ../navit/country.c:99
 msgid "Algeria"
-msgstr "Algeria"
+msgstr "Algerie"
 
 #. 218
 #: ../navit/country.c:100
@@ -573,7 +680,7 @@ msgstr "Etiopia"
 #. 246
 #: ../navit/country.c:107
 msgid "Finland"
-msgstr "Finnland"
+msgstr "Finland"
 
 #. 242
 #: ../navit/country.c:108
@@ -583,7 +690,7 @@ msgstr "Fiji"
 #. 238
 #: ../navit/country.c:109
 msgid "Falkland Islands (Malvinas)"
-msgstr "Falklandsøyene"
+msgstr "Falklandsøyene (Malvinas)"
 
 #. 583
 #: ../navit/country.c:110
@@ -868,7 +975,7 @@ msgstr "Saint Lucia"
 #. 438
 #: ../navit/country.c:166
 msgid "Liechtenstein"
-msgstr "Lichtenstein"
+msgstr "Liechtenstein"
 
 #. 144
 #: ../navit/country.c:167
@@ -933,7 +1040,7 @@ msgstr "Saint Martin (Fransk del)"
 #. 450
 #: ../navit/country.c:179
 msgid "Madagascar"
-msgstr "Madagascar"
+msgstr "Madagaskar"
 
 #. 584
 #: ../navit/country.c:180
@@ -978,7 +1085,7 @@ msgstr "Martinique"
 #. 478
 #: ../navit/country.c:188
 msgid "Mauritania"
-msgstr "Mauritania"
+msgstr "Mauretania"
 
 #. 500
 #: ../navit/country.c:189
@@ -1138,7 +1245,7 @@ msgstr "Puerto Rico"
 #. 275
 #: ../navit/country.c:220
 msgid "Palestinian Territory, Occupied"
-msgstr "Palestinia"
+msgstr "Palestina"
 
 #. 620
 #: ../navit/country.c:221
@@ -1263,7 +1370,7 @@ msgstr "Surinam"
 #. 678
 #: ../navit/country.c:245
 msgid "Sao Tome and Principe"
-msgstr "Sao Tome and Principe"
+msgstr "São Tomé og Príncipe"
 
 #. 222
 #: ../navit/country.c:246
@@ -1308,7 +1415,7 @@ msgstr "Thailand"
 #. 762
 #: ../navit/country.c:254
 msgid "Tajikistan"
-msgstr "Tajikistan"
+msgstr "Tadsjikistan"
 
 #. 772
 #: ../navit/country.c:255
@@ -1353,12 +1460,12 @@ msgstr "Tuvalu"
 #. 158
 #: ../navit/country.c:263
 msgid "Taiwan, Province of China"
-msgstr "Taiwan, Provins av Kina"
+msgstr "Taiwan"
 
 #. 834
 #: ../navit/country.c:264
 msgid "Tanzania, United Republic of"
-msgstr "Tanzania, Den forente republikken"
+msgstr "Tanzania"
 
 #. 804
 #: ../navit/country.c:265
@@ -1373,12 +1480,12 @@ msgstr "Uganda"
 #. 581
 #: ../navit/country.c:267
 msgid "United States Minor Outlying Islands"
-msgstr "De forente staters små fjerntliggende øyer"
+msgstr "USAs ytre småøyer"
 
 #. 840
 #: ../navit/country.c:268
 msgid "United States"
-msgstr "Amerikas forente stater"
+msgstr "USA"
 
 #. 858
 #: ../navit/country.c:269
@@ -1408,12 +1515,12 @@ msgstr "Venezuela"
 #. 092
 #: ../navit/country.c:274
 msgid "Virgin Islands, British"
-msgstr "Jomfruøyene, De britiske"
+msgstr "Jomfruøyene (Storbritannia)"
 
 #. 850
 #: ../navit/country.c:275
 msgid "Virgin Islands, U.S."
-msgstr "Jomfruøyene, De amerikanske"
+msgstr "Jomfruøyene (USA)"
 
 #. 704
 #: ../navit/country.c:276
@@ -1460,6 +1567,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr "Ukjent, legg is_in-tagger til de byene."
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1474,7 +1585,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Land"
 
@@ -1485,11 +1596,11 @@ msgstr "Post"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
-msgstr "By"
+msgstr "Sted"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
@@ -1498,8 +1609,8 @@ msgstr "Distrikt/Kommune"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Gate"
 
@@ -1517,7 +1628,7 @@ msgstr "Postnummer"
 
 #: ../navit/gui/gtk/destination.c:440
 msgid "City"
-msgstr "By"
+msgstr "Sted"
 
 #: ../navit/gui/gtk/destination.c:443
 msgid "District/Township"
@@ -1533,15 +1644,16 @@ msgstr "Bokmerke"
 
 #: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
-msgstr "Destinasjon"
+msgstr "Reisemål"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
-msgstr "Display"
+msgstr "Visning"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Rute"
 
@@ -1550,53 +1662,74 @@ msgid "Former Destinations"
 msgstr "Tidligere reisemål"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
-msgstr "Layout"
+msgstr "Utseende"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "Projeksjon"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Kjøretøy"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
-msgstr "ZoomUt"
+msgstr "Zoom ut"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
-msgstr "ZoomInn"
+msgstr "Zoom inn"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:206
+msgid "Recalculate"
+msgstr "Omberegn"
 
 #: ../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:213
+msgid "Stop Navigation"
+msgstr "Stopp navigasjon"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
 msgstr "Test"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
-msgstr "Avslutt"
+msgstr "_Avslutt"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
 msgstr "Markør"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:223
+msgid "Lock on Road"
+msgstr "Lås til vei"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr "Hold nord oppover"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Auto-zoom"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
@@ -1649,275 +1782,176 @@ msgid "No"
 msgstr "Nei"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr "OT"
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Rute %4.0fkm    %02d:%02d ETA"
+msgstr "Rute %4.0fkm %02d:%02d estimert tid"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:164
 msgid "Route 0000km  0+00:00 ETA"
-msgstr "Rute 0000km  0+00:00 ETA"
-
-#: ../navit/gui/internal/gui_internal.c:1452
-msgid "Help"
-msgstr "Hjelp"
-
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
-msgid "Maps"
-msgstr "Kart"
-
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
-msgid "Rules"
-msgstr "Regler"
-
-#: ../navit/gui/internal/gui_internal.c:3159
-msgid "Main menu"
-msgstr "Hovedmeny"
-
-#: ../navit/gui/internal/gui_internal.c:3165
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Vis\n"
-"Kart"
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:1268
-msgid "exit"
-msgstr ""
+msgstr "Rute 0000km 0+00:00 estimert tid"
 
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
-#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
-#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
-#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
-#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
-#, c-format
-msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:206
-msgid "Recalculate"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:213
-msgid "Stop Navigation"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:223
-msgid "Lock on Road"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
-msgid "Northing"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
-msgstr ""
+msgstr "Tilbake til kart"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
-msgstr ""
+msgstr "Hovedmeny"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1461
+msgid "Help"
+msgstr "Hjelp"
+
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
-msgstr ""
+msgstr "Tilbake"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
-msgstr ""
+msgstr "Landemerker"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
-msgstr ""
+msgstr "Gater"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr "Husnummer"
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
-msgstr ""
+msgstr "Vis i browser"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
-msgstr ""
+msgstr "Vis attributter"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
-msgstr ""
+msgstr "Vis på kart"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
-msgstr ""
+msgstr "Bokmerk %s"
+
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr "Husnummer"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
-msgstr ""
+msgstr "Vindusmodus"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
-msgstr ""
+msgstr "Handlinger"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
-msgstr ""
+msgstr "Kartpunkt"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
-msgstr ""
+msgstr "Kjøretøysposisjon"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
-msgstr ""
+msgstr "Avslutt"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
+"Stopp\n"
+"navigasjon"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
+msgid "Maps"
+msgstr "Kart"
+
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
-msgstr ""
+msgstr "Vis satelittstatus"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
-msgstr ""
+msgstr "Vis NMEA-data"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
-msgstr ""
+msgstr "Sett som aktiv"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
-msgstr ""
+msgstr "Vis satelittstatus"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
-msgstr ""
+msgstr "Vis NMEA-data"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
+msgid "Rules"
+msgstr "Regler"
+
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
-msgstr ""
+msgstr "Lås til vei"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
-msgstr ""
+msgstr "Kart følger kjøretøy"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
+msgstr "Innstillinger"
+
+#: ../navit/gui/internal/gui_internal.c:3268
+msgid "Main menu"
+msgstr "Hovedmeny"
+
+#: ../navit/gui/internal/gui_internal.c:3274
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Vis\n"
+"kart"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
-msgstr ""
+msgstr "Verktøy"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr "Melding"
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr "Høydeprofil"
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Beskrivelse"
diff --git a/po/nds.po.in b/po/nds.po.in
index 1af0503ce..5bc531e9a 100644
--- a/po/nds.po.in
+++ b/po/nds.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-06 10:31+0000\n"
-"Last-Translator: Roschkor <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:38+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: German, Low <nds@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../navit/main.c:231
@@ -28,298 +28,298 @@ msgstr "Aus dem Quellverzeichins starten\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "%s zu %s setzen\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "diese"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "erste"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "zweite"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "dritte"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "vierte"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "fünfte"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sechste"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "diese Ausfahrt"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "erste Ausfahrt"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "zweite Ausfahrt"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "dritte Ausfahrt"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "vierte Ausfahrt"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "fünfte Ausfahrt"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sechste Ausfahrt"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "in %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "in %d Metern"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d %d Kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "in %d %d Kilometern"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ein Kilometer"
 msgstr[1] "%d Kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, 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:1266
 msgid "exit"
 msgstr "Ausfahrt"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "auf die Auffahrt"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s in die Straße %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s in den %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s in die %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s in das %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s in die %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "Rechts"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "Links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "einfach "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "dringend "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "unbekannt "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Wenn möglich, bitte wenden"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "In Kürze in den Kreisverkehr einfahren"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "In %s, in den Kreisverkehr einfahren"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Den Kreisverkehr an der %s verlassen"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "dann den Kreisverkehr an der %s verlassen"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Der Straße %s folgen"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "in Kürze"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Die %1$s Straße zur %2$s nehmen"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "nach %i Straßen"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "jetzt"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "Dann die %1$s Straße zur %2$s nehmen"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "Fehler"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "In %3$s %1$s%2$s %4$s abbiegen"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Sie haben Ihr Ziel erreicht %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "Dann haben Sie Ihr Ziel erreicht"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Kommando"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Länge"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Zeit"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Fahrstrecke"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Fahrzeit"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Straßenatlas"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Als Position setzen"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Als Ziel setzen"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Als Lesezeichen hinzufügen"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Koordinaten der Anzeige: %d %d"
@@ -1568,7 +1568,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Land"
 
@@ -1579,9 +1579,9 @@ msgstr "Postanschrift"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Stadt"
 
@@ -1592,8 +1592,8 @@ msgstr "Bezirk"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Straße"
 
@@ -1630,12 +1630,13 @@ msgid "Destination"
 msgstr "Reiseziel"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Anzeige"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Route"
 
@@ -1644,14 +1645,14 @@ msgid "Former Destinations"
 msgstr "Vorherige Ziele"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Erscheinungsbild"
 
@@ -1660,8 +1661,8 @@ msgid "Projection"
 msgstr "Darstellung"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Fahrzeug"
 
@@ -1702,7 +1703,7 @@ msgid "Lock on Road"
 msgstr "Auf Straße zeigen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Einnorden"
 
@@ -1711,7 +1712,7 @@ msgid "Autozoom"
 msgstr "automatischer Zoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Vollbild"
 
@@ -1764,12 +1765,12 @@ msgid "No"
 msgstr "Nein"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1786,70 +1787,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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Zurück zur Karte"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Zurück"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "POI"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Straßen"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Im Browser anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Attribute anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Auf der Karte zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Lesezeichen %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Aktionen"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Kartenpunkt"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Fahrzeugposition"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1857,54 +1858,54 @@ msgstr ""
 "Navigation\n"
 "beenden"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Karten"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "zeige NMEA Daten"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Als Aktiv setzen"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Satellitenstatus anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "NMEA Daten anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regeln"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Auf Straße zeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Karte folgt Fahrzeug"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Hauptmenü"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1912,12 +1913,43 @@ msgstr ""
 "Karte\n"
 "anzeigen"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Werkzeuge"
 
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
+
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/nl.po.in b/po/nl.po.in
index 717425393..ad772a5f6 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -5,17 +5,17 @@
 # Ed Kapitein <Unknown>
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.2.0\n"
+"Project-Id-Version: navit 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-05-25 10:56+0000\n"
-"Last-Translator: Ed Kapitein <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-05-30 08:54+0000\n"
+"Last-Translator: KaZeR <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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,301 +29,310 @@ msgstr "Gestart vanuit de bron directory\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "setting '%s' naar '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "nulde"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "eerste"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "tweede"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "derde"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "vierde"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "vijfde"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "zesde"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr "nulde afrit"
+
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "eerste afslag"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "eerste afslag"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "derde afslag"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "vierde afslag"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "vijfde afslag"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "zesde afslag"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d Meter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "na %d meter"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d,%d kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "na %d,%d kilometer"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "een kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "na één kilometer"
 msgstr[1] "in %d kilometer"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "afslag"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%snaar de %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "rechts"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "links"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "flauw "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "scherp "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "niet bekend "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Indien mogelijk omkeren"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "U rijdt zodadelijk de rotonde op"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Neem de rotonde over %s"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "verlaat de rotonde bij de %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "daarna de rotonde verlaten bij de %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Weg volgen voor %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "binnenkort"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Neem de %1$s straat naar %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "na %i wegen"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, 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:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, 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:1516
+#: ../navit/navigation.c:1517
 #, 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:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s bestemming bereikt"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "daarna bent u op uw besteming"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Positie"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Opdracht"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Lengte"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tijd"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Afstand"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Aankomsttijd"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Route"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Zet als positie"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Zet als bestemming"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Opnemen als bladwijzer"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Scherm %d %d"
@@ -1559,6 +1568,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1573,7 +1586,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Land"
 
@@ -1585,9 +1598,9 @@ msgstr "Postcode"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Plaats"
 
@@ -1599,8 +1612,8 @@ msgstr "District"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Straat"
 
@@ -1638,12 +1651,13 @@ msgid "Destination"
 msgstr "Bestemming"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Tonen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Route"
 
@@ -1652,14 +1666,14 @@ msgid "Former Destinations"
 msgstr "Vorige bestemmingen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Opmaak"
 
@@ -1668,8 +1682,8 @@ msgid "Projection"
 msgstr "Projectie"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Voertuig"
 
@@ -1710,7 +1724,7 @@ msgid "Lock on Road"
 msgstr "houd de weg aan"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Kaart richting"
 
@@ -1719,7 +1733,7 @@ msgid "Autozoom"
 msgstr "automatisch vergroten/verkleinen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Beeldvullend"
 
@@ -1772,12 +1786,12 @@ msgid "No"
 msgstr "Nee"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1794,66 +1808,79 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Terug naar de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Hoofdmenu"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Hulp"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1611
+msgid "Back"
+msgstr "terug"
+
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "bezienswaardigheden"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "straten"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "bekijk in browser"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "bekijk eigenschappen"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "bekijk op de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "favoriet %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Venstermodus"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Acties"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "punt op de kaart"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "voertuig positie"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1861,69 +1888,74 @@ msgstr ""
 "stop\n"
 "navigatie"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Kaarten"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3078
+msgid "Show Satellite Status"
+msgstr "Toon satelliet status"
+
+#: ../navit/gui/internal/gui_internal.c:3112
+msgid "Show NMEA Data"
+msgstr "NMEA data weergeven"
+
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "activeren"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3142
+msgid "Show Satellite status"
+msgstr "satelliet status weergeven"
+
+#: ../navit/gui/internal/gui_internal.c:3148
+msgid "Show NMEA data"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regels"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "volg de weg"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "kaart volgt voertuig"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Hoofdmenu"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3274
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Kaart\n"
+"Weergeven"
+
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Gereedschappen"
 
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr "nulde afrit"
-
-#: ../navit/gui/internal/gui_internal.c:1602
-msgid "Back"
-msgstr "terug"
-
-#: ../navit/gui/internal/gui_internal.c:2969
-msgid "Show Satellite Status"
-msgstr "Toon satelliet status"
-
-#: ../navit/gui/internal/gui_internal.c:3003
-msgid "Show NMEA Data"
-msgstr "NMEA data weergeven"
-
-#: ../navit/gui/internal/gui_internal.c:3033
-msgid "Show Satellite status"
-msgstr "satelliet status weergeven"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
-msgid "Show NMEA data"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
-msgid ""
-"Show\n"
-"Map"
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
 msgstr ""
-"Kaart\n"
-"Weergeven"
diff --git a/po/pl.po.in b/po/pl.po.in
index 8cde1da37..4867cb02f 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-06 20:51+0000\n"
-"Last-Translator: skrzat <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:38+0000\n"
+"Last-Translator: KaZeR <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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
@@ -32,65 +32,93 @@ msgstr "Uruchamiam z katalogu źródłowego\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ustawiam '%s' na '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "zerowy"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "pierwszy"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "drugi"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "trzeci"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "czwarty"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "piąty"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "szósty"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr "zerowym wyjeździe"
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr "pierwszym wyjeździe"
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr "drugim wyjeździe"
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr "trzecim wyjeździe"
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr "czwartym wyjeździe"
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr "piątym wyjeździe"
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr "szóstym wyjeździe"
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
-msgstr "%d metrów"
+msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
-msgstr "za %d metrów"
+msgstr "za %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metrów"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
-msgstr "za %d metrów"
+msgstr "za %d m"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometra"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "za %d.%d kilometrów"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -98,7 +126,7 @@ msgstr[0] "jeden kilometr"
 msgstr[1] "%d kilometr"
 msgstr[2] "%d kilometr"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -106,194 +134,209 @@ msgstr[0] "za kilometr"
 msgstr[1] "%d kilometr"
 msgstr[2] "%d kilometr"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "zjazd"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s w ulicę %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s na / w %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "w prawo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "w lewo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "lekko "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "silnie "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "nieznane "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Zawróc, gdy będzie to możliwe"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Wjazd na rondo wkrótce"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Wjedź na rondo za %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "Zjedź z ronda na %s"
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "następnie zjedź z ronda na %s"
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Jedź tą drogą %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "wkrótce"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Jedź %1$s drogą w %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "%i skrzyżowanie"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "teraz"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, 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:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, 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:1516
+#: ../navit/navigation.c:1517
 #, 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:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dotarłeś do celu %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "następnie dojechałeś do celu."
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Położenie"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Polecenie"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Odległość"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Czas"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Odległość do celu"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Czas do celu"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Szczegóły trasy"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Ustaw jako pozycję"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Ustaw jako cel"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Dodaj jako zakładkę"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Współrzędne ekranu: %d %d"
@@ -1528,6 +1571,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1542,7 +1589,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Państwo"
 
@@ -1553,9 +1600,9 @@ msgstr "Kod Pocztowy"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Miasto"
 
@@ -1566,8 +1613,8 @@ msgstr "Dzielnica/Okręg miejski"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Ulica"
 
@@ -1604,12 +1651,13 @@ msgid "Destination"
 msgstr "Cel"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Pokaż"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Trasa"
 
@@ -1618,14 +1666,14 @@ msgid "Former Destinations"
 msgstr "Poprzednie cele"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Zakładki"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Układ kolorów"
 
@@ -1634,8 +1682,8 @@ msgid "Projection"
 msgstr "Odwzorowanie"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Pojazd"
 
@@ -1676,12 +1724,16 @@ msgid "Lock on Road"
 msgstr "Trzymaj się drogi"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Północ zawsze na górze"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Automatyczne przybliżenie"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
@@ -1734,12 +1786,12 @@ msgid "No"
 msgstr "Nie"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2W"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3W"
 
@@ -1756,70 +1808,79 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Wróć do mapy"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Menu główne"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Wróć"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Użyteczne miejsca"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Zobacz w przeglądarce"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Zobacz właściwości"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Zobacz na mapie"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Zakładka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Tryb Widoku"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Akcje"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Punkt na mapie"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Pozycja pojazdu"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1827,54 +1888,54 @@ msgstr ""
 "Przerwij\n"
 "nawigację"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Pokaż status satelitów"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Pokaż dane NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Ustaw jako aktywny"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Pokaż status satelitów"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Pokaż dane NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Reguły"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Trzymaj się drogi"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Wyśrodkuj mapę"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Menu główne"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1882,48 +1943,19 @@ msgstr ""
 "Pokaż\n"
 "mapę"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Narzędzia"
 
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
 msgstr ""
 
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
 
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Opis"
diff --git a/po/pt.po.in b/po/pt.po.in
index 944c480d5..a131390a9 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -7,297 +7,331 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-29 22:55+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:39+0000\n"
 "Last-Translator: Diogo Lavareda <diogolavareda9@hotmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+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 ""
+
 #: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "ajuste '%s' to '%s'\n"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "primeiro"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "segundo"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "terceiro"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "quarto"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "quinta"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sexto"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "primeira saida"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "segunda saida"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "terceira saida"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "quarta saida"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "quinta saida"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sexta saida"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "em %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "em %d metros"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d quilómetros"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "em %d.%d quilómetros"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "um quilḿetro"
 msgstr[1] "%d quilómetros"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, 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:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "sair"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "na subida"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "direita"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "esquerda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "facilmente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "veementemente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "desconhecido "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Quando for possível"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr ""
+
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Deixe a rotunda na %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "depois deixe a rotunda na %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga a estrada para a próxima %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "logo"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Apanhe a %1$s estrada para %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "depois de %i estradas"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "agora"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "depois apanhe a %1$s estrada para %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, 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:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "depois vire á %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Você chegou ao seu destino %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "depois chegou ao seu destino"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Posição"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Executar comandos"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Duração"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tempo"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Duração Destino"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Tempo Destino"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Roadbook"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Definir como posição"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Definir como destino"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Adicionar como marcador"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Ponto 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordenada da tela: %d %d"
@@ -1532,6 +1566,10 @@ msgstr "Zâmbia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1546,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "País"
 
@@ -1557,9 +1595,9 @@ msgstr "Postal"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Cidade"
 
@@ -1570,8 +1608,8 @@ msgstr "Distrito"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Rua"
 
@@ -1608,12 +1646,13 @@ msgid "Destination"
 msgstr "Destino"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Exibir"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Rota"
 
@@ -1622,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Anteriores Destinos"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Marcadores"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Esquema"
 
@@ -1638,8 +1677,8 @@ msgid "Projection"
 msgstr "Projecção"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Veículo"
 
@@ -1680,7 +1719,7 @@ msgid "Lock on Road"
 msgstr "Bloqueio na estrada"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Norte"
 
@@ -1689,7 +1728,7 @@ msgid "Autozoom"
 msgstr "Zoom Automático"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Ecrã Inteiro"
 
@@ -1742,15 +1781,19 @@ msgid "No"
 msgstr "Não"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1760,57 +1803,79 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Voltar ao mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Menu Principal"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Voltar"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Ruas"
 
 #: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
+msgid "View in Browser"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Ver Atributos"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Marcador %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Modo de Janela"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Acções"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Map Point"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Posição do Veículo"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Sair"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1818,46 +1883,54 @@ msgstr ""
 "Parar\n"
 "Navegação"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Mostrar Estado do Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Mostrar Dados NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Definir como activo"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Mostrar estado do Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Mostrar dados NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regras"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3198
+msgid "Lock on road"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3210
+msgid "Map follows Vehicle"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Definições"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Menu Principal"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1865,60 +1938,19 @@ msgstr ""
 "Mostrar\n"
 "Mapa"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Ferramentas"
 
-#: ../navit/main.c:231
-#, c-format
-msgid "Running from source directory\n"
-msgstr ""
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
 msgstr ""
 
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
 
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
-msgid "POIs"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:2084
-msgid "View in Browser"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:2884
-msgid "Map Point"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:3089
-msgid "Lock on road"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:3101
-msgid "Map follows Vehicle"
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
 msgstr ""
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index c0b31d445..fb83557bb 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-21 23:46+0200\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
 "PO-Revision-Date: 2009-06-23 20:52+0000\n"
 "Last-Translator: Luzemário <luzemario@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-06-25 21:48+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,249 +29,249 @@ msgstr "Rodando do diretório de origem\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "ajustando '%s' para '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "zero"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "primeira"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "segunda"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "terceira"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "quarta"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "quinta"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sexta"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "saída zero"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "primeira saída"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "segunda saída"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "terceira saída"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "quarta saída"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "quinta saída"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sexta saída"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "em %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metros"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "em %d metros"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometros"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "em %d.%d kilometros"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "um kilometro"
 msgstr[1] "%d kilometros"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "em um kilometro"
 msgstr[1] "em %d kilometros"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "saída"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "na rampa"
 
 #. 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:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sna 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:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sno %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:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sem %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%sna %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "direita"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "esquerda"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "levemente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "fortemente "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1394
+#: ../navit/navigation.c:1392
 msgid "really strongly "
 msgstr "com força "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1398
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "desconhecido "
 
-#: ../navit/navigation.c:1405
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "retorne assim que possivel"
 
-#: ../navit/navigation.c:1415
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "em breve entre na rotatória"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1419
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Em %s, entre na rotatória"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Deixe a rotatória na %s"
 
-#: ../navit/navigation.c:1437
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "então deixe a rotatória na %s"
 
-#: ../navit/navigation.c:1447
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Siga a estrada pelo próximo %s"
 
-#: ../navit/navigation.c:1451
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "em breve"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1461
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Pegue a %1$s estrada para o %2$s"
 
-#: ../navit/navigation.c:1464 ../navit/navigation.c:1478
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "após %i estradas"
 
-#: ../navit/navigation.c:1467
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "agora"
 
-#: ../navit/navigation.c:1475
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "então pegue a %1$s estrada para o %2$s"
 
-#: ../navit/navigation.c:1486
+#: ../navit/navigation.c:1484
 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:1516
+#: ../navit/navigation.c:1514
 #, 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:1519
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "então vire %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1524
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Você chegou ao destino %s"
 
-#: ../navit/navigation.c:1526
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "então você chegou ao seu destino."
 
@@ -312,17 +312,17 @@ msgid "Roadbook"
 msgstr "Guia de estrada"
 
 #: ../navit/popup.c:278 ../navit/popup.c:347
-#: ../navit/gui/internal/gui_internal.c:2124
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Marcar como posição"
 
 #: ../navit/popup.c:279 ../navit/popup.c:348
-#: ../navit/gui/internal/gui_internal.c:2120
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Marcar como destino"
 
 #: ../navit/popup.c:280 ../navit/popup.c:349
-#: ../navit/gui/internal/gui_internal.c:2128
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Adicionar como marcador"
 
@@ -1584,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "País"
 
@@ -1595,9 +1595,9 @@ msgstr "Postal"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2854
-#: ../navit/gui/internal/gui_internal.c:2883
-#: ../navit/gui/internal/gui_internal.c:3018
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Cidade"
 
@@ -1608,8 +1608,8 @@ msgstr "Distrito"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2835
-#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Rua"
 
@@ -1646,13 +1646,13 @@ msgid "Destination"
 msgstr "Destino"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2939
-#: ../navit/gui/internal/gui_internal.c:3232
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Display"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
-#: ../navit/gui/internal/gui_internal.c:4592
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Rota"
 
@@ -1661,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Destinos anteriores"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2224
-#: ../navit/gui/internal/gui_internal.c:2994
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Marcadores"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2894
-#: ../navit/gui/internal/gui_internal.c:2941
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Layout"
 
@@ -1677,8 +1677,8 @@ msgid "Projection"
 msgstr "Projeção"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3175
-#: ../navit/gui/internal/gui_internal.c:3240
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Veículo"
 
@@ -1719,7 +1719,7 @@ msgid "Lock on Road"
 msgstr "Prender na Estrada"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3214
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Ao Norte"
 
@@ -1728,7 +1728,7 @@ msgid "Autozoom"
 msgstr "Zoom Automático"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2951
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Tela Inteira"
 
@@ -1781,12 +1781,12 @@ msgid "No"
 msgstr "Não"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2958
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2964
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1803,79 +1803,79 @@ msgstr "Rota %4.0fkm    TEC %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rota 0000km  TEC 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1334
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Volta ao mapa"
 
-#: ../navit/gui/internal/gui_internal.c:1343
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Menu Principal"
 
-#: ../navit/gui/internal/gui_internal.c:1460
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../navit/gui/internal/gui_internal.c:1610
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Voltar"
 
-#: ../navit/gui/internal/gui_internal.c:1916
-#: ../navit/gui/internal/gui_internal.c:2133
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "POIs"
 
-#: ../navit/gui/internal/gui_internal.c:2081
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Ruas"
 
-#: ../navit/gui/internal/gui_internal.c:2089
+#: ../navit/gui/internal/gui_internal.c:2090
 msgid "House numbers"
 msgstr "Números das casas"
 
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Ver no Navegador"
 
-#: ../navit/gui/internal/gui_internal.c:2112
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Ver Atributos"
 
-#: ../navit/gui/internal/gui_internal.c:2147
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Ver no mapa"
 
-#: ../navit/gui/internal/gui_internal.c:2260
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Anotar %s"
 
-#: ../navit/gui/internal/gui_internal.c:2819
-#: ../navit/gui/internal/gui_internal.c:2828
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
 msgid "House number"
 msgstr "Número da casa"
 
-#: ../navit/gui/internal/gui_internal.c:2946
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Modo de Janela"
 
-#: ../navit/gui/internal/gui_internal.c:2992
-#: ../navit/gui/internal/gui_internal.c:3280
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Ações"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Ponto no mapa"
 
-#: ../navit/gui/internal/gui_internal.c:3013
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Posição do Veículo"
 
-#: ../navit/gui/internal/gui_internal.c:3022
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Sair"
 
-#: ../navit/gui/internal/gui_internal.c:3028
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1883,54 +1883,54 @@ msgstr ""
 "Parar\n"
 "Navegação"
 
-#: ../navit/gui/internal/gui_internal.c:3044
-#: ../navit/gui/internal/gui_internal.c:3236
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Mapas"
 
-#: ../navit/gui/internal/gui_internal.c:3088
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Mostrar Status Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3122
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Mostrar Dados NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3146
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Marcar como ativo"
 
-#: ../navit/gui/internal/gui_internal.c:3152
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Mostrar Status do Satélite"
 
-#: ../navit/gui/internal/gui_internal.c:3158
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Mostrar dados NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3200
-#: ../navit/gui/internal/gui_internal.c:3244
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regras"
 
-#: ../navit/gui/internal/gui_internal.c:3208
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Prender na estrada"
 
-#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Mapa segue veículo"
 
-#: ../navit/gui/internal/gui_internal.c:3230
-#: ../navit/gui/internal/gui_internal.c:3288
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Ajustes"
 
-#: ../navit/gui/internal/gui_internal.c:3278
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Menu Principal"
 
-#: ../navit/gui/internal/gui_internal.c:3284
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1938,15 +1938,19 @@ msgstr ""
 "Mostrar\n"
 "Mapa"
 
-#: ../navit/gui/internal/gui_internal.c:3291
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Ferramentas"
 
-#: ../navit/gui/internal/gui_internal.c:4449
-#: ../navit/gui/internal/gui_internal.c:4597
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
 msgid "Height Profile"
 msgstr "Perfil de Altitude"
 
-#: ../navit/gui/internal/gui_internal.c:4594
+#: ../navit/gui/internal/gui_internal.c:4656
 msgid "Description"
 msgstr "Descrição"
diff --git a/po/ro.po.in b/po/ro.po.in
index bcf67edae..02b281757 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-22 04:55+0000\n"
-"Last-Translator: Daniel Ursache Dogariu <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:39+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,93 +30,93 @@ msgstr "Rulează din directorul sursă\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "se setează „%s” ca „%s”\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "zero"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "prima"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "a doua"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "a treia"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "a patra"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "a cincea"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "a șasea"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "ieșirea zero"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "prima ieșire"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "a doua ieșire"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "a treia ieșire"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "a patra ieșire"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "a cincea ieșire"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "a șasea ieșire"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "în %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metri"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "în %d metri"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "kilometrul %d.%d"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "în %d.%d kilometri"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -124,7 +124,7 @@ msgstr[0] "un kilometru"
 msgstr[1] "%d kilometri"
 msgstr[2] "%d de kilometri"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -132,204 +132,209 @@ msgstr[0] "într-un kilometru"
 msgstr[1] "în %d kilometri"
 msgstr[2] "în %d de kilometri"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "ieșire"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "pe rampă"
 
 #. 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:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s pe strada %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:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s pe %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:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s pe %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:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s pe %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s spre %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "la dreapta"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "la stânga"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "uşor "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "strâns "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "necunoscut "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Când este posibil, întoarceţi"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Intrați în curând în giratoriu"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "În %s, intrați în sensul giratoriu"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Ieșiți din giratoriu la %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "apoi ieșiți din giratoriu la %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Urmați drumul pentru încă %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "curând"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Virați %2s pe %1s stradă"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "după %i străzi"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "acum"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "apoi faceți %2s pe %1s stradă"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "eroare"
 
 #. 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:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Virați %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "apoi virați %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Ați ajuns la destinație %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "apoi ajungeți la destinație."
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Poziție"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Comandă"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Lungime"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Timp"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Lungimea până la destinaţie"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Timpul până la destinaţie"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Drum blocat"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Configurează ca poziție"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Configurează ca destinație"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Adaugă la semnele de carte"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punctul 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordonate ecran : %d %d"
@@ -1564,6 +1569,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1578,7 +1587,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Ţară"
 
@@ -1589,9 +1598,9 @@ msgstr "Poştal"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Oraş"
 
@@ -1602,8 +1611,8 @@ msgstr "Cartier"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Stradă"
 
@@ -1640,12 +1649,13 @@ msgid "Destination"
 msgstr "Destinaţie"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Ecran"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Traseu"
 
@@ -1654,14 +1664,14 @@ msgid "Former Destinations"
 msgstr "Destinații anterioare"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Semne de carte"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Dispunere"
 
@@ -1670,8 +1680,8 @@ msgid "Projection"
 msgstr "Proiecție"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Vehicul"
 
@@ -1712,7 +1722,7 @@ msgid "Lock on Road"
 msgstr "Fixează strada"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Nimic"
 
@@ -1721,7 +1731,7 @@ msgid "Autozoom"
 msgstr "Autozoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Pe tot ecranul"
 
@@ -1774,12 +1784,12 @@ msgid "No"
 msgstr "Nu"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1796,70 +1806,79 @@ msgstr "Rută %4.0f km sosire estimată %02d:%02d"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rută 0000 km sosire estimată 0+00:00"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Înapoi la hartă"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Meniu principal"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Ajutor"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Înapoi"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Puncte de interes"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Străzi"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Arată în navigator"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Arată atributele"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Arată pe hartă"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "%s ca semn de carte"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Mod „fereastră”"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Acțiuni"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Locație pe hartă"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Poziția vehiculului"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Ieși"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1867,54 +1886,54 @@ msgstr ""
 "Oprește\n"
 "navigația"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Hărți"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Arată starea sateliților"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Arată datele NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Activează"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Arată starea sateliților"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Arată datele NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Reguli"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Fixează strada"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Harta urmează vehiculul"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Configurații"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Meniu principal"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1922,6 +1941,19 @@ msgstr ""
 "Afișează\n"
 "hartă"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Unelte"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/ru.po.in b/po/ru.po.in
index e89ac54aa..3aa34e530 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-05-05 12:27+0000\n"
-"Last-Translator: Artiom <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:39+0000\n"
+"Last-Translator: KaZeR <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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,93 +30,93 @@ msgstr "Запуск в исходном каталоге\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "установка '%s' в '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "нулевой"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "первый"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "второй"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "третий"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "четвертый"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "пятый"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "шестой"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "нулевой выезд"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "первый  выезд"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "второй  выезд"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "третий  выезд"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "четвертый  выезд"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "пятый  выезд"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "шестой  выезд"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d м"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "через %d м"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d метров"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "через %d метров"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d километр"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "через %d.%d километр(а,ов"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -124,7 +124,7 @@ msgstr[0] "%d километр"
 msgstr[1] "%d километра"
 msgstr[2] "%d километров"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -132,148 +132,209 @@ msgstr[0] "через %d километр"
 msgstr[1] "%d километра"
 msgstr[2] "%d километров"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "съезд"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1298
+#, c-format
+msgid "%sinto the street %s%s%s"
+msgstr "%s на улицу %s%s%s"
+
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s на %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s на %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s на %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s на %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "направо"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "налево"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "слегка "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "сильно "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "неизвестно "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Развернитесь, пожалуйста, если это возможно"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr "Скоро круговое движение"
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr "Круговое движение через %s"
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Двигайтесь по дороге следующие %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "скоро"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "Выезжайте на %1$s дорогу в направлении %2$s"
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr "после %i дорог"
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "сейчас"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "после чего выезайте на %1$s дорогу в направлении %2$s"
+
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Поверните %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr "после чего поверните на %1$s%2$s %3$s%4$s"
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Вы прибыли в пункт назначения %s"
 
-#: ../navit/navit.c:1165
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr "после чего вы на месте."
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr "Позиция"
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Команда"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Длина"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "км"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "м"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Время"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Дистанция до пункта назначения"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Время до пункта назначения"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Дорожный справочник"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Установить как пункт отправления"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Установить как пункт назначения"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Добавить в закладки"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Точка 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Экран %d %d"
@@ -1508,6 +1569,10 @@ msgstr "Замбия"
 msgid "Zimbabwe"
 msgstr "Зимбабвэ"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1522,7 +1587,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Страна"
 
@@ -1533,9 +1598,9 @@ msgstr "Индекс"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Город"
 
@@ -1546,8 +1611,8 @@ msgstr "Район"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Улица"
 
@@ -1584,12 +1649,13 @@ msgid "Destination"
 msgstr "Пункт назначения"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Дисплей"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Маршрут"
 
@@ -1598,14 +1664,14 @@ msgid "Former Destinations"
 msgstr "Прошлые пункты назначения"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Закладки"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Схема"
 
@@ -1614,8 +1680,8 @@ msgid "Projection"
 msgstr "Проекция"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Т/с"
 
@@ -1651,8 +1717,21 @@ msgstr "_Выход"
 msgid "Cursor"
 msgstr "Курсор"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:223
+msgid "Lock on Road"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr ""
+
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Во весь экран"
 
@@ -1700,6 +1779,24 @@ msgstr "З"
 msgid "NW"
 msgstr "СЗ"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
+msgid "No"
+msgstr "Нет"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
+#: ../navit/gui/internal/gui_internal.c:2948
+msgid "2D"
+msgstr "2D"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
+#: ../navit/gui/internal/gui_internal.c:2954
+msgid "3D"
+msgstr "3D"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1709,40 +1806,79 @@ msgstr "Маршрут %4.0fкм    %02d:%02d РВП"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Маршрут 0000км  0+00:00 РВП"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1335
+msgid "Back to map"
+msgstr "Назад к карте"
+
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Главное меню"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Справка"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Назад"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr "POIs"
+
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Улицы"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
+msgid "View in Browser"
+msgstr "Просмотреть в браузере"
+
+#: ../navit/gui/internal/gui_internal.c:2113
+msgid "View Attributes"
+msgstr "Просмотреть Атрибуты"
+
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Показать на карте"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2261
+#, c-format
+msgid "Bookmark %s"
+msgstr "Закладка %s"
+
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
+msgid "Window Mode"
+msgstr "Режим окна"
+
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Команды"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Map Point"
+msgstr "Точка на карте"
+
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Местоположение автомобиля"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Выход"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1750,171 +1886,54 @@ msgstr ""
 "Прекращение\n"
 "навигации"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Карты"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
-msgid "Rules"
-msgstr "Правила"
-
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
-msgid "Settings"
-msgstr "Настройки"
-
-#: ../navit/gui/internal/gui_internal.c:3159
-msgid "Main menu"
-msgstr "Главное меню"
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
-#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr "%s на улицу %s%s%s"
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr "Скоро круговое движение"
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr "Круговое движение через %s"
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr "Выезжайте на %1$s дорогу в направлении %2$s"
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr "после %i дорог"
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "после чего выезайте на %1$s дорогу в направлении %2$s"
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "после чего поверните на %1$s%2$s %3$s%4$s"
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr "после чего вы на месте."
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr "Позиция"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:223
-msgid "Lock on Road"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
-msgid "Northing"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr "Автомасштабирование"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
-msgid "No"
-msgstr "Нет"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
-msgid "2D"
-msgstr "2D"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
-msgid "3D"
-msgstr "3D"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:1323
-msgid "Back to map"
-msgstr "Назад к карте"
-
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
-msgid "POIs"
-msgstr "POIs"
-
-#: ../navit/gui/internal/gui_internal.c:2084
-msgid "View in Browser"
-msgstr "Просмотреть в браузере"
-
-#: ../navit/gui/internal/gui_internal.c:2090
-msgid "View Attributes"
-msgstr "Просмотреть Атрибуты"
-
-#: ../navit/gui/internal/gui_internal.c:2238
-#, c-format
-msgid "Bookmark %s"
-msgstr "Закладка %s"
-
-#: ../navit/gui/internal/gui_internal.c:2827
-msgid "Window Mode"
-msgstr "Режим окна"
-
-#: ../navit/gui/internal/gui_internal.c:2884
-msgid "Map Point"
-msgstr "Точка на карте"
-
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Показать Состояние Спутников"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Показать Данные NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Сделать активным"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Показать состояние Спутников"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Показать данные NMEA"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
+msgid "Rules"
+msgstr "Правила"
+
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Карта следует за машиной"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
+msgid "Settings"
+msgstr "Настройки"
+
+#: ../navit/gui/internal/gui_internal.c:3268
+msgid "Main menu"
+msgstr "Главное меню"
+
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1922,6 +1941,19 @@ msgstr ""
 "Показать\n"
 "Карту"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Инструменты"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/sk.po.in b/po/sk.po.in
index 15897ddba..4633998cc 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-03-30 08:40+0000\n"
-"Last-Translator: helix84 <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:40+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Slovenčina\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,93 +29,93 @@ msgstr "Beží zo zdrojového adresára\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavuje sa „%s“ na „%s“\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "nultý"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "prvý"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "druhý"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "tretí"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "štvrtý"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "piaty"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "šiesty"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "nultý výjazd"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "prvý výjazd"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "druhý výjazd"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "tretí výjazd"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "štvrtý výjazd"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "piaty výjazd"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "šiesty výjazd"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "o %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "o %d metrov"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometra"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "o %d.%d kilometrov"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -123,7 +123,7 @@ msgstr[0] "%d kilometrov"
 msgstr[1] "jeden kilometer"
 msgstr[2] "%d kilometre"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -131,200 +131,209 @@ msgstr[0] "o %d kilometrov"
 msgstr[1] "o jeden kilometer"
 msgstr[2] "o %d kilometre"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "výjazd"
 
+#: ../navit/navigation.c:1268
+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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr "%s na %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "vpravo"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "vľavo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "mierne "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "prudko "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "neznámy "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Ak to bude možné, prosím, otočte sa"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Vstúpte do kruhového objazdu onedlho"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "O %s vstúpte do kruhového objazdu"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Opustite kruhový objazd na %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "potom opustite kruhový objazd na %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Pokračujte naďalej po ceste %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "onedlho"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Choďte %1$s cestou na %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "po %i cestách"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "teraz"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr "potom nasledujte cestu %1$s do %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Odbočte %1s%2s%3s%4s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, 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:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Dorazili ste do svojho cieľa %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "potom dosiahnete svoj cieľ cesty"
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Pozícia"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Príkaz"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Cieľová vzdialenosť"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Čas k cieľu"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Plán trasy"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Nastaviť ako pozíciu"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Nastaviť ako cieľ"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Pridať ako záložku"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Bod 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Súradnice obrazovky: %d %d"
@@ -1559,6 +1568,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1573,7 +1586,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Krajina"
 
@@ -1584,9 +1597,9 @@ msgstr "PSČ"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Mesto"
 
@@ -1597,8 +1610,8 @@ msgstr "Kraj"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Ulica"
 
@@ -1635,12 +1648,13 @@ msgid "Destination"
 msgstr "Cieľ"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Displej"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Trasa"
 
@@ -1649,14 +1663,14 @@ msgid "Former Destinations"
 msgstr "Predošlé cieľe"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Záložky"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Značenie"
 
@@ -1665,8 +1679,8 @@ msgid "Projection"
 msgstr "Projekcia"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Vozidlo"
 
@@ -1707,7 +1721,7 @@ msgid "Lock on Road"
 msgstr "Uzamknúť na cesty"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Sever vždy hore"
 
@@ -1716,7 +1730,7 @@ msgid "Autozoom"
 msgstr "Automatické zväčšenie"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
@@ -1769,15 +1783,19 @@ msgid "No"
 msgstr "Nie"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1787,70 +1805,79 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Späť na mapu"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Hlavné menu"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Späť"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "POI"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Ulice"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Zobraziť v prehliadači"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Zobraziť atribúty"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Zobraziť na mape"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Záložka %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "V okne"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Akcie"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Bod na mape"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Pozícia vozidla"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1858,54 +1885,54 @@ msgstr ""
 "Zastaviť\n"
 "navigáciu"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Mapy"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Zobraziť stav satelitov"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Zobraziť NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Nastaviť ako aktívny"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Zobraziť stav satelitov"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Zobraziť NMEA data"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Pravidlá"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Prichytiť k ceste"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Mapa sleduje vozidlo"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Hlavné menu"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1913,14 +1940,19 @@ msgstr ""
 "Zobraziť\n"
 "mapu"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Nástroje"
 
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
 msgstr ""
diff --git a/po/sl.po.in b/po/sl.po.in
index c5ea48b30..ade3fd9f7 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-01-14 16:08+0000\n"
-"Last-Translator: Štefan Baebler <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:40+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -30,65 +30,93 @@ msgstr "Zagon iz mape z izvorno kodo\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "nastavljam '%s' na '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "ničt"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "prv"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "drug"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "tretj"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "četrt"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "pet"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "šest"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "Čez %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metrov"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "Čez %d metrov"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometrov"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "Čez %d.%d kilometov"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -97,7 +125,7 @@ msgstr[1] "%d kilometer"
 msgstr[2] "%d kilometra"
 msgstr[3] "%d kilometri"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
@@ -106,184 +134,209 @@ msgstr[1] "Čez %d kilometer"
 msgstr[2] "Čez %d kilometra"
 msgstr[3] "Čez %d kilometre"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "odcep"
 
+#: ../navit/navigation.c:1268
+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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "desno"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "levo"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "rahlo "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "ostro "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "neznano "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Obrnite čim bo to mogoče"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Kmalu zapeljite v krožišče"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr "Čez %s zapeljite v krožišče"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Ostanite na tej cesti naslednjih %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "kmalu"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr "Zavijte na %2$s v %1$so cesto"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "čez %i cest"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "sedaj"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, 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:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, 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:1516
+#: ../navit/navigation.c:1517
 #, 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:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "%s ste na cilju"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "in ste na cilju."
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Položaj"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Navodilo"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Razdalja"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Čas"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Razdalja do cilja"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Čas do cilja"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Načrt poti"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Nastavi kot položaj"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Nastavi kot cilj"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Dodaj zaznamek"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Točka 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Koordinate zaslona: %d %d"
@@ -1518,6 +1571,10 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1532,7 +1589,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Država"
 
@@ -1543,9 +1600,9 @@ msgstr "Pošta"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Mesto"
 
@@ -1556,8 +1613,8 @@ msgstr "Regija"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Ulica"
 
@@ -1594,12 +1651,13 @@ msgid "Destination"
 msgstr "Cilj"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Prikaz"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Načrt poti"
 
@@ -1608,14 +1666,14 @@ msgid "Former Destinations"
 msgstr "Prejšnji cilji"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Zaznamki"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Razporeditev"
 
@@ -1624,8 +1682,8 @@ msgid "Projection"
 msgstr "Projekcija"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Vozilo"
 
@@ -1666,12 +1724,16 @@ msgid "Lock on Road"
 msgstr "Ostani na cesti"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Sever zgoraj"
 
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
@@ -1724,15 +1786,19 @@ msgid "No"
 msgstr "Ne"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1742,184 +1808,150 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Nazaj na zemljevid"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Glavni meni"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:1461
+msgid "Help"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1611
+msgid "Back"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Ceste"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Prikaz v brskalniku"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Prikaz lastnosti"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Prikaz na zemljevidu"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Zaznamuj %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Okenski način"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Dejanja"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:2993
+msgid "Map Point"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Položaj vozila"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Izhod"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
-msgid "Maps"
-msgstr "Zemljevidi"
-
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
-msgid "Rules"
-msgstr "Pravila"
-
-#: ../navit/gui/internal/gui_internal.c:3089
-msgid "Lock on road"
-msgstr "Prikleni na cesto"
-
-#: ../navit/gui/internal/gui_internal.c:3101
-msgid "Map follows Vehicle"
-msgstr "Zemljevid sledi vozilu"
-
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
-msgid "Settings"
-msgstr "Nastavitve"
-
-#: ../navit/gui/internal/gui_internal.c:3159
-msgid "Main menu"
-msgstr "Glavni meni"
-
-#: ../navit/gui/internal/gui_internal.c:3172
-msgid "Tools"
-msgstr "Orodja"
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr ""
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
+#: ../navit/gui/internal/gui_internal.c:3018
+msgid ""
+"Stop\n"
+"Navigation"
 msgstr ""
 
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
+msgid "Maps"
+msgstr "Zemljevidi"
 
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
+#: ../navit/gui/internal/gui_internal.c:3078
+msgid "Show Satellite Status"
 msgstr ""
 
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
+#: ../navit/gui/internal/gui_internal.c:3112
+msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
+#: ../navit/gui/internal/gui_internal.c:3136
+msgid "Set as active"
 msgstr ""
 
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
+#: ../navit/gui/internal/gui_internal.c:3142
+msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
+#: ../navit/gui/internal/gui_internal.c:3148
+msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
+msgid "Rules"
+msgstr "Pravila"
 
-#: ../navit/gui/internal/gui_internal.c:1452
-msgid "Help"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3198
+msgid "Lock on road"
+msgstr "Prikleni na cesto"
 
-#: ../navit/gui/internal/gui_internal.c:1602
-msgid "Back"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3210
+msgid "Map follows Vehicle"
+msgstr "Zemljevid sledi vozilu"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
-msgid "POIs"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
+msgid "Settings"
+msgstr "Nastavitve"
 
-#: ../navit/gui/internal/gui_internal.c:2884
-msgid "Map Point"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3268
+msgid "Main menu"
+msgstr "Glavni meni"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:2969
-msgid "Show Satellite Status"
-msgstr ""
-
-#: ../navit/gui/internal/gui_internal.c:3003
-msgid "Show NMEA Data"
+"Show\n"
+"Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
-msgid "Set as active"
-msgstr ""
+#: ../navit/gui/internal/gui_internal.c:3281
+msgid "Tools"
+msgstr "Orodja"
 
-#: ../navit/gui/internal/gui_internal.c:3033
-msgid "Show Satellite status"
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
-msgid "Show NMEA data"
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
-msgid ""
-"Show\n"
-"Map"
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
 msgstr ""
diff --git a/po/sv.po.in b/po/sv.po.in
index 5d00e9ac4..ff7465214 100644
--- a/po/sv.po.in
+++ b/po/sv.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-04-29 17:43+0000\n"
-"Last-Translator: Squall Leonhart <webmaster@square-one.se>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-29 21:55+0000\n"
+"Last-Translator: Erik Lundin <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,304 +29,309 @@ msgstr "Körs från källkodsbiblioteket\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "sätter '%s' till '%s'\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "nollte"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "första"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "andra"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "tredje"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "fjärde"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "femte"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "sjätte"
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr "ingen avfart"
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr "första avfarten"
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr "andra  avfarten"
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr "tredje avfarten"
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr "fjärde avfarten"
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr "femte avfarten"
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr "sjätte avfarten"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
-msgstr "i %d m"
+msgstr "om %d m"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d meter"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
-msgstr "i %d meter"
+msgstr "om %d meter"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
-msgstr "%d.%d kilometer"
+msgstr "%d,%d kilometer"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
-msgstr "i %d.%d kilometer"
+msgstr "om %d,%d kilometer"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "en kilometer"
 msgstr[1] "%d kilometer"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om en kilometer"
 msgstr[1] "om %d kilometer"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "avfart"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "ut på påfarten"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sin på gatan %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%sin på %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
-msgstr "%sav på %s"
+msgstr "%sut på %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "höger"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "vänster"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "lätt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
-msgstr "brant "
+msgstr "tvärt "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr "mycket tvärt "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "okänd "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Vänd när det går"
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr "Kör snart in i rondellen"
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
-msgstr "På %s, kör in i rondellen"
+msgstr "Om %s, kör in i rondellen"
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr "Kör ut ur rondellen mot %s"
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr "kör sedan ut ur rondellen mot %s"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr "Följ vägen till nästa %s"
+msgstr "Följ vägen i %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "snart"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
-msgstr "Ta %1$s vägen till %2$s"
+msgstr "Ta %1$s vägen mot %2$s"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "efter %i vägar"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "nu"
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr "ta sedan %1$s vägen till %2$s"
+msgstr "ta sedan %1$s vägen mot %2$s"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "fel"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Sväng %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "sväng sedan %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Du har nått din destination %s"
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr "sedan har du nått din destination."
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Position"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Kommando"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
-msgstr "Längd"
+msgstr "Sträcka"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Tid"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Sträcka kvar"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Restid"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Vägbok"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Ange som position"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Ange som destination"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Lägg till som bokmärke"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skärm koordinat : %d %d"
@@ -1109,7 +1114,7 @@ msgstr "Malawi"
 #. 484
 #: ../navit/country.c:194
 msgid "Mexico"
-msgstr "Mexico"
+msgstr "Mexiko"
 
 #. 458
 #: ../navit/country.c:195
@@ -1319,7 +1324,7 @@ msgstr "Singapore"
 #. 654
 #: ../navit/country.c:236
 msgid "Saint Helena"
-msgstr "Saint Helena"
+msgstr "Sankta Helena"
 
 #. 705
 #: ../navit/country.c:237
@@ -1561,6 +1566,10 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr "* Okänt, lägg till is_in-taggar till dessa städer"
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1575,7 +1584,7 @@ msgid "Iso3"
 msgstr "Iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Land"
 
@@ -1586,9 +1595,9 @@ msgstr "Post"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Stad"
 
@@ -1599,8 +1608,8 @@ msgstr "Distrikt"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Gata"
 
@@ -1637,12 +1646,13 @@ msgid "Destination"
 msgstr "Destination"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Visa"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Rutt"
 
@@ -1651,14 +1661,14 @@ msgid "Former Destinations"
 msgstr "Tidigare destinationer"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Layout"
 
@@ -1667,8 +1677,8 @@ msgid "Projection"
 msgstr "Projektion"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Fordon"
 
@@ -1709,16 +1719,16 @@ msgid "Lock on Road"
 msgstr "Lås till vägen"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
-msgstr "Norrvärde"
+msgstr "Håll norr uppåt"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
 msgstr "Autozoom"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Helskärm"
 
@@ -1771,12 +1781,12 @@ msgid "No"
 msgstr "Nej"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3D"
 
@@ -1793,70 +1803,79 @@ msgstr "Rutt %4.0fkm    %02d:%02d Ankomsttid"
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rutt 0000km  0+00:00 Ankomsttid"
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Tillbaka till kartan"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Huvudmeny"
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr "Tillbaka"
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr "Intressepunkter"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Gator"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr "Husnummer"
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Visa i webbläsare"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Visa attribut"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Visa på karta"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Bokmärk %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr "Husnummer"
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Fönsterläge"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Kartpunkt"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Fordonsposition"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1864,54 +1883,54 @@ msgstr ""
 "Stoppa\n"
 "Navigering"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Kartor"
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Visa satellitstatus"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "Visa NMEA-data"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Sätt som aktiv"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Visa satellitstatus"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "Visa NMEA-data"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Regler"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
-msgstr "Lås på väg"
+msgstr "Lås till väg"
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr "Kartan följer fordonet"
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr "Huvudmeny"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
@@ -1919,6 +1938,19 @@ msgstr ""
 "Visa\n"
 "Karta"
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr "Verktyg"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr "Meddelande"
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr "Höjdprofil"
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Beskrivning"
diff --git a/po/te.po.in b/po/te.po.in
index e0977191b..fb0b894cb 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -7,729 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-09-06 13:58+0000\n"
-"Last-Translator: వీవెన్ (Veeven) <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:41+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Telugu <te@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-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/navigation.c:322
-#, c-format
-msgid "%d meters"
-msgstr "%d మీటర్లు"
-
-#: ../navit/navigation.c:336
-#, c-format
-msgid "one kilometer"
-msgid_plural "%d kilometers"
-msgstr[0] "ఒక కిలోమీటరు"
-msgstr[1] "%d కిలోమీటర్లు"
-
-#. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
-msgid "right"
-msgstr "కుడి"
-
-#. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
-msgid "left"
-msgstr "ఎడమ"
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
-msgid "easily "
-msgstr "తేలికగా "
-
-#: ../navit/navigation.c:1448
-msgid "soon"
-msgstr "త్వరలో"
-
-#: ../navit/navigation.c:1464
-msgid "now"
-msgstr "ఇప్పుడు"
-
-#: ../navit/navigation.c:1483
-msgid "error"
-msgstr "పొరపాటు"
-
-#: ../navit/navigation.c:1521
-#, c-format
-msgid "You have reached your destination %s"
-msgstr "మీరు మీ గమ్యస్థానం %s చేరారు"
-
-#: ../navit/navit.c:1165
-msgid "Command"
-msgstr "ఆదేశం"
-
-#: ../navit/navit.c:1169
-msgid "Length"
-msgstr "పొడవు"
-
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
-msgid "km"
-msgstr "కిమీ"
-
-#: ../navit/navit.c:1183
-msgid "Time"
-msgstr "సమయం"
-
-#. 020
-#: ../navit/country.c:39
-msgid "Andorra"
-msgstr "అండోరా"
-
-#. 784
-#: ../navit/country.c:40
-msgid "United Arab Emirates"
-msgstr "యునైటెడ్ అరబ్ ఎమిరేట్స్"
-
-#. 004
-#: ../navit/country.c:41
-msgid "Afghanistan"
-msgstr "ఆఫ్ఘనిస్తాన్"
-
-#. 008
-#: ../navit/country.c:44
-msgid "Albania"
-msgstr "అల్బేనియా"
-
-#. 051
-#: ../navit/country.c:45
-msgid "Armenia"
-msgstr "అర్మేనియా"
-
-#. 024
-#: ../navit/country.c:47
-msgid "Angola"
-msgstr "అంగోలా"
-
-#. 010
-#: ../navit/country.c:48
-msgid "Antarctica"
-msgstr "అంటార్కిటికా"
-
-#. 032
-#: ../navit/country.c:49
-msgid "Argentina"
-msgstr "అర్జెంటీనా"
-
-#. 050
-#: ../navit/country.c:58
-msgid "Bangladesh"
-msgstr "బంగ్లాదేశ్"
-
-#. 056
-#: ../navit/country.c:59
-msgid "Belgium"
-msgstr "బెల్జియం"
-
-#. 100
-#: ../navit/country.c:61
-msgid "Bulgaria"
-msgstr "బల్గేరియా"
-
-#. 060
-#: ../navit/country.c:66
-msgid "Bermuda"
-msgstr "బెర్ముడా"
-
-#. 068
-#: ../navit/country.c:68
-msgid "Bolivia"
-msgstr "బొలీవియా"
-
-#. 076
-#: ../navit/country.c:69
-msgid "Brazil"
-msgstr "బ్రెజిల్"
-
-#. 044
-#: ../navit/country.c:70
-msgid "Bahamas"
-msgstr "బహమాస్"
-
-#. 064
-#: ../navit/country.c:71
-msgid "Bhutan"
-msgstr "భూటాన్"
-
-#. 112
-#: ../navit/country.c:74
-msgid "Belarus"
-msgstr "బెలారస్"
-
-#. 124
-#: ../navit/country.c:76
-msgid "Canada"
-msgstr "కెనడా"
-
-#. 140
-#: ../navit/country.c:79
-msgid "Central African Republic"
-msgstr "మధ్య ఆఫ్రికన్ రిపబ్లిక్"
-
-#. 178
-#: ../navit/country.c:80
-msgid "Congo"
-msgstr "కాంగో"
-
-#. 756
-#: ../navit/country.c:81
-msgid "Switzerland"
-msgstr "స్విట్జర్లాండ్"
-
-#. 152
-#: ../navit/country.c:84
-msgid "Chile"
-msgstr "చిలీ"
-
-#. 120
-#: ../navit/country.c:85
-msgid "Cameroon"
-msgstr "కామెరూన్"
-
-#. 156
-#: ../navit/country.c:86
-msgid "China"
-msgstr "చైనా"
-
-#. 170
-#: ../navit/country.c:87
-msgid "Colombia"
-msgstr "కొలంబియా"
-
-#. 188
-#: ../navit/country.c:88
-msgid "Costa Rica"
-msgstr "కోస్టారికా"
-
-#. 192
-#: ../navit/country.c:89
-msgid "Cuba"
-msgstr "క్యూబా"
-
-#. 196
-#: ../navit/country.c:92
-msgid "Cyprus"
-msgstr "సైప్రస్"
-
-#. 276
-#: ../navit/country.c:94
-msgid "Germany"
-msgstr "జర్మనీ"
-
-#. 208
-#: ../navit/country.c:96
-msgid "Denmark"
-msgstr "డెన్మార్క్"
-
-#. 212
-#: ../navit/country.c:97
-msgid "Dominica"
-msgstr "డొమినికా"
-
-#. 214
-#: ../navit/country.c:98
-msgid "Dominican Republic"
-msgstr "డొమినికన్ రిపబ్లిక్"
-
-#. 012
-#: ../navit/country.c:99
-msgid "Algeria"
-msgstr "అల్జీరియా"
-
-#. 218
-#: ../navit/country.c:100
-msgid "Ecuador"
-msgstr "ఈక్విడార్"
-
-#. 233
-#: ../navit/country.c:101
-msgid "Estonia"
-msgstr "ఎస్టోనియా"
-
-#. 818
-#: ../navit/country.c:102
-msgid "Egypt"
-msgstr "ఈజిప్ట్"
-
-#. 732
-#: ../navit/country.c:103
-msgid "Western Sahara"
-msgstr "పశ్చిమ సహారా"
-
-#. 724
-#: ../navit/country.c:105
-msgid "Spain"
-msgstr "స్పెయిన్"
-
-#. 231
-#: ../navit/country.c:106
-msgid "Ethiopia"
-msgstr "ఇథియోపియా"
-
-#. 246
-#: ../navit/country.c:107
-msgid "Finland"
-msgstr "ఫిన్లాండ్"
-
-#. 242
-#: ../navit/country.c:108
-msgid "Fiji"
-msgstr "ఫిజీ"
-
-#. 250
-#: ../navit/country.c:112
-msgid "France"
-msgstr "ఫ్రాన్స్"
-
-#. 268
-#: ../navit/country.c:116
-msgid "Georgia"
-msgstr "జార్జియా"
-
-#. 254
-#: ../navit/country.c:117
-msgid "French Guiana"
-msgstr "ఫ్రెంచ్   గయానా"
-
-#. 288
-#: ../navit/country.c:119
-msgid "Ghana"
-msgstr "ఘనా"
-
-#. 304
-#: ../navit/country.c:121
-msgid "Greenland"
-msgstr "గ్రీన్‌లాండ్"
-
-#. 270
-#: ../navit/country.c:122
-msgid "Gambia"
-msgstr "జాంబియా"
-
-#. 300
-#: ../navit/country.c:126
-msgid "Greece"
-msgstr "గ్రీస్"
-
-#. 328
-#: ../navit/country.c:131
-msgid "Guyana"
-msgstr "గయానా"
-
-#. 344
-#: ../navit/country.c:132
-msgid "Hong Kong"
-msgstr "హాంకాంగ్"
-
-#. 191
-#: ../navit/country.c:135
-msgid "Croatia"
-msgstr "క్రోయేషియా"
-
-#. 348
-#: ../navit/country.c:137
-msgid "Hungary"
-msgstr "హంగరీ"
-
-#. 360
-#: ../navit/country.c:138
-msgid "Indonesia"
-msgstr "ఇండోనేషియా"
-
-#. 372
-#: ../navit/country.c:139
-msgid "Ireland"
-msgstr "ఐర్లాండ్"
-
-#. 356
-#: ../navit/country.c:142
-msgid "India"
-msgstr "భారతదేశం"
-
-#. 368
-#: ../navit/country.c:144
-msgid "Iraq"
-msgstr "ఇరాక్"
-
-#. 380
-#: ../navit/country.c:147
-msgid "Italy"
-msgstr "ఇటలీ"
-
-#. 388
-#: ../navit/country.c:149
-msgid "Jamaica"
-msgstr "జమైకా"
-
-#. 400
-#: ../navit/country.c:150
-msgid "Jordan"
-msgstr "జోర్డాన్"
-
-#. 392
-#: ../navit/country.c:151
-msgid "Japan"
-msgstr "జపాన్"
-
-#. 404
-#: ../navit/country.c:152
-msgid "Kenya"
-msgstr "కెన్యా"
-
-#. 116
-#: ../navit/country.c:154
-msgid "Cambodia"
-msgstr "కాంబోడియా"
-
-#. 414
-#: ../navit/country.c:160
-msgid "Kuwait"
-msgstr "కువైట్"
-
-#. 136
-#: ../navit/country.c:161
-msgid "Cayman Islands"
-msgstr "కేమన్ దీవులు"
-
-#. 398
-#: ../navit/country.c:162
-msgid "Kazakhstan"
-msgstr "కజకిస్తాన్"
-
-#. 422
-#: ../navit/country.c:164
-msgid "Lebanon"
-msgstr "లెబనాన్"
-
-#. 144
-#: ../navit/country.c:167
-msgid "Sri Lanka"
-msgstr "శ్రీలంక"
-
-#. 428
-#: ../navit/country.c:172
-msgid "Latvia"
-msgstr "లాత్వియా"
-
-#. 504
-#: ../navit/country.c:174
-msgid "Morocco"
-msgstr "మొరాకో"
-
-#. 492
-#: ../navit/country.c:175
-msgid "Monaco"
-msgstr "మొనాకో"
-
-#. 450
-#: ../navit/country.c:179
-msgid "Madagascar"
-msgstr "మడగాస్కర్"
-
-#. 104
-#: ../navit/country.c:183
-msgid "Myanmar"
-msgstr "మియన్మార్"
-
-#. 496
-#: ../navit/country.c:184
-msgid "Mongolia"
-msgstr "మంగోలియా"
-
-#. 470
-#: ../navit/country.c:190
-msgid "Malta"
-msgstr "మాల్టా"
-
-#. 480
-#: ../navit/country.c:191
-msgid "Mauritius"
-msgstr "మారిషస్"
-
-#. 462
-#: ../navit/country.c:192
-msgid "Maldives"
-msgstr "మాల్దీవులు"
-
-#. 484
-#: ../navit/country.c:194
-msgid "Mexico"
-msgstr "మెక్సికో"
-
-#. 458
-#: ../navit/country.c:195
-msgid "Malaysia"
-msgstr "మలేషియా"
-
-#. 516
-#: ../navit/country.c:197
-msgid "Namibia"
-msgstr "నమీబియా"
-
-#. 566
-#: ../navit/country.c:201
-msgid "Nigeria"
-msgstr "నైజీరియా"
-
-#. 578
-#: ../navit/country.c:204
-msgid "Norway"
-msgstr "నార్వే"
-
-#. 524
-#: ../navit/country.c:205
-msgid "Nepal"
-msgstr "నేపాల్"
-
-#. 554
-#: ../navit/country.c:208
-msgid "New Zealand"
-msgstr "న్యూజిలాండ్"
-
-#. 591
-#: ../navit/country.c:210
-msgid "Panama"
-msgstr "పనామా"
-
-#. 604
-#: ../navit/country.c:211
-msgid "Peru"
-msgstr "పెరూ"
-
-#. 608
-#: ../navit/country.c:214
-msgid "Philippines"
-msgstr "ఫిలిప్ఫీన్స్"
-
-#. 586
-#: ../navit/country.c:215
-msgid "Pakistan"
-msgstr "పాకిస్తాన్"
-
-#. 616
-#: ../navit/country.c:216
-msgid "Poland"
-msgstr "పోలాండ్"
-
-#. 620
-#: ../navit/country.c:221
-msgid "Portugal"
-msgstr "పోర్చుగల్"
-
-#. 600
-#: ../navit/country.c:223
-msgid "Paraguay"
-msgstr "పరాగ్వే"
-
-#. 634
-#: ../navit/country.c:224
-msgid "Qatar"
-msgstr "ఖతార్"
-
-#. 642
-#: ../navit/country.c:226
-msgid "Romania"
-msgstr "రొమేనియా"
-
-#. 688
-#: ../navit/country.c:227
-msgid "Serbia"
-msgstr "సెర్బియా"
-
-#. 646
-#: ../navit/country.c:229
-msgid "Rwanda"
-msgstr "రువాండా"
-
-#. 682
-#: ../navit/country.c:230
-msgid "Saudi Arabia"
-msgstr "సౌది అరేబియా"
-
-#. 736
-#: ../navit/country.c:233
-msgid "Sudan"
-msgstr "సూడాన్"
-
-#. 752
-#: ../navit/country.c:234
-msgid "Sweden"
-msgstr "స్వీడన్"
-
-#. 702
-#: ../navit/country.c:235
-msgid "Singapore"
-msgstr "సింగపూర్"
-
-#. 703
-#: ../navit/country.c:239
-msgid "Slovakia"
-msgstr "స్లొవేకియా"
-
-#. 706
-#: ../navit/country.c:243
-msgid "Somalia"
-msgstr "సోమాలియా"
-
-#. 748
-#: ../navit/country.c:248
-msgid "Swaziland"
-msgstr "స్వాజిలాండ్"
-
-#. 768
-#: ../navit/country.c:252
-msgid "Togo"
-msgstr "టోగో"
-
-#. 764
-#: ../navit/country.c:253
-msgid "Thailand"
-msgstr "థాయిలాండ్"
-
-#. 762
-#: ../navit/country.c:254
-msgid "Tajikistan"
-msgstr "తజకిస్తాన్"
-
-#. 804
-#: ../navit/country.c:265
-msgid "Ukraine"
-msgstr "ఉక్రేయిన్"
-
-#. 800
-#: ../navit/country.c:266
-msgid "Uganda"
-msgstr "ఉగాండా"
-
-#. 840
-#: ../navit/country.c:268
-msgid "United States"
-msgstr "యునైటెడ్ స్టేట్స్ ఆఫ్ అమెరికా"
-
-#. 858
-#: ../navit/country.c:269
-msgid "Uruguay"
-msgstr "ఉరూగ్వే"
-
-#. 860
-#: ../navit/country.c:270
-msgid "Uzbekistan"
-msgstr "ఉజ్బెకిస్తాన్"
-
-#. 862
-#: ../navit/country.c:273
-msgid "Venezuela"
-msgstr "వెనిజులా"
-
-#. 704
-#: ../navit/country.c:276
-msgid "Viet Nam"
-msgstr "వియత్నాం"
-
-#. 710
-#: ../navit/country.c:282
-msgid "South Africa"
-msgstr "దక్షిణ ఆఫ్రికా"
-
-#. 894
-#: ../navit/country.c:283
-msgid "Zambia"
-msgstr "జాంబియా"
-
-#. 716
-#: ../navit/country.c:284
-msgid "Zimbabwe"
-msgstr "జింబాబ్వే"
-
-#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
-msgid "Country"
-msgstr "దేశం"
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-msgid "Postal"
-msgstr "తపాలా"
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
-msgid "Town"
-msgstr "పట్టణం"
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-msgid "District"
-msgstr "జిల్లా"
-
-#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
-msgid "Street"
-msgstr "వీధి"
-
-#: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
-msgid "Number"
-msgstr "సంఖ్య"
-
-#: ../navit/gui/gtk/destination.c:440
-msgid "City"
-msgstr "నగరం"
-
-#: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
-msgid "Map"
-msgstr "పటం"
-
-#: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
-msgid "Destination"
-msgstr "గమ్యం"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
-msgid "Bookmarks"
-msgstr "పేజీకలు"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
-msgid "Layout"
-msgstr "కూర్పు"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
-msgid "Vehicle"
-msgstr "వాహనం"
-
-#: ../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:214
-msgid "Test"
-msgstr "పరీక్ష"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
-msgid "Fullscreen"
-msgstr "నిండు తెర"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:238
-msgid "Data"
-msgstr "దత్తాంశం"
-
 #: ../navit/main.c:231
 #, c-format
 msgid "Running from source directory\n"
@@ -740,248 +29,328 @@ msgstr ""
 msgid "setting '%s' to '%s'\n"
 msgstr ""
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr ""
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr ""
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr ""
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr ""
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr ""
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr ""
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:320
+#, c-format
+msgid "%d meters"
+msgstr "%d మీటర్లు"
+
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr ""
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr ""
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr ""
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:334
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "ఒక కిలోమీటరు"
+msgstr[1] "%d కిలోమీటర్లు"
+
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr ""
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
+#. TRANSLATORS: right, as in 'Turn right'
+#: ../navit/navigation.c:1338
+msgid "right"
+msgstr "కుడి"
+
+#. TRANSLATORS: left, as in 'Turn left'
+#: ../navit/navigation.c:1377
+msgid "left"
+msgstr "ఎడమ"
+
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr "తేలికగా "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr ""
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr ""
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
+#: ../navit/navigation.c:1449
+msgid "soon"
+msgstr "త్వరలో"
+
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1465
+msgid "now"
+msgstr "ఇప్పుడు"
+
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
+#: ../navit/navigation.c:1484
+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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1522
+#, c-format
+msgid "You have reached your destination %s"
+msgstr "మీరు మీ గమ్యస్థానం %s చేరారు"
+
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1175
+msgid "Command"
+msgstr "ఆదేశం"
+
+#: ../navit/navit.c:1179
+msgid "Length"
+msgstr "పొడవు"
+
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
+msgid "km"
+msgstr "కిమీ"
+
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr ""
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1193
+msgid "Time"
+msgstr "సమయం"
+
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
 
+#. 020
+#: ../navit/country.c:39
+msgid "Andorra"
+msgstr "అండోరా"
+
+#. 784
+#: ../navit/country.c:40
+msgid "United Arab Emirates"
+msgstr "యునైటెడ్ అరబ్ ఎమిరేట్స్"
+
+#. 004
+#: ../navit/country.c:41
+msgid "Afghanistan"
+msgstr "ఆఫ్ఘనిస్తాన్"
+
 #. 028
 #: ../navit/country.c:42
 msgid "Antigua and Barbuda"
@@ -992,11 +361,36 @@ msgstr ""
 msgid "Anguilla"
 msgstr ""
 
+#. 008
+#: ../navit/country.c:44
+msgid "Albania"
+msgstr "అల్బేనియా"
+
+#. 051
+#: ../navit/country.c:45
+msgid "Armenia"
+msgstr "అర్మేనియా"
+
 #. 530
 #: ../navit/country.c:46
 msgid "Netherlands Antilles"
 msgstr ""
 
+#. 024
+#: ../navit/country.c:47
+msgid "Angola"
+msgstr "అంగోలా"
+
+#. 010
+#: ../navit/country.c:48
+msgid "Antarctica"
+msgstr "అంటార్కిటికా"
+
+#. 032
+#: ../navit/country.c:49
+msgid "Argentina"
+msgstr "అర్జెంటీనా"
+
 #. 016
 #: ../navit/country.c:50
 msgid "American Samoa"
@@ -1037,11 +431,26 @@ msgstr ""
 msgid "Barbados"
 msgstr ""
 
+#. 050
+#: ../navit/country.c:58
+msgid "Bangladesh"
+msgstr "బంగ్లాదేశ్"
+
+#. 056
+#: ../navit/country.c:59
+msgid "Belgium"
+msgstr "బెల్జియం"
+
 #. 854
 #: ../navit/country.c:60
 msgid "Burkina Faso"
 msgstr ""
 
+#. 100
+#: ../navit/country.c:61
+msgid "Bulgaria"
+msgstr "బల్గేరియా"
+
 #. 048
 #: ../navit/country.c:62
 msgid "Bahrain"
@@ -1062,11 +471,36 @@ msgstr ""
 msgid "Saint Barthelemy"
 msgstr ""
 
+#. 060
+#: ../navit/country.c:66
+msgid "Bermuda"
+msgstr "బెర్ముడా"
+
 #. 096
 #: ../navit/country.c:67
 msgid "Brunei Darussalam"
 msgstr ""
 
+#. 068
+#: ../navit/country.c:68
+msgid "Bolivia"
+msgstr "బొలీవియా"
+
+#. 076
+#: ../navit/country.c:69
+msgid "Brazil"
+msgstr "బ్రెజిల్"
+
+#. 044
+#: ../navit/country.c:70
+msgid "Bahamas"
+msgstr "బహమాస్"
+
+#. 064
+#: ../navit/country.c:71
+msgid "Bhutan"
+msgstr "భూటాన్"
+
 #. 074
 #: ../navit/country.c:72
 msgid "Bouvet Island"
@@ -1077,11 +511,21 @@ msgstr ""
 msgid "Botswana"
 msgstr ""
 
+#. 112
+#: ../navit/country.c:74
+msgid "Belarus"
+msgstr "బెలారస్"
+
 #. 084
 #: ../navit/country.c:75
 msgid "Belize"
 msgstr ""
 
+#. 124
+#: ../navit/country.c:76
+msgid "Canada"
+msgstr "కెనడా"
+
 #. 166
 #: ../navit/country.c:77
 msgid "Cocos (Keeling) Islands"
@@ -1092,6 +536,21 @@ msgstr ""
 msgid "Congo, Democratic Republic of the"
 msgstr ""
 
+#. 140
+#: ../navit/country.c:79
+msgid "Central African Republic"
+msgstr "మధ్య ఆఫ్రికన్ రిపబ్లిక్"
+
+#. 178
+#: ../navit/country.c:80
+msgid "Congo"
+msgstr "కాంగో"
+
+#. 756
+#: ../navit/country.c:81
+msgid "Switzerland"
+msgstr "స్విట్జర్లాండ్"
+
 #. 384
 #: ../navit/country.c:82
 msgid "Cote d'Ivoire"
@@ -1102,6 +561,36 @@ msgstr ""
 msgid "Cook Islands"
 msgstr ""
 
+#. 152
+#: ../navit/country.c:84
+msgid "Chile"
+msgstr "చిలీ"
+
+#. 120
+#: ../navit/country.c:85
+msgid "Cameroon"
+msgstr "కామెరూన్"
+
+#. 156
+#: ../navit/country.c:86
+msgid "China"
+msgstr "చైనా"
+
+#. 170
+#: ../navit/country.c:87
+msgid "Colombia"
+msgstr "కొలంబియా"
+
+#. 188
+#: ../navit/country.c:88
+msgid "Costa Rica"
+msgstr "కోస్టారికా"
+
+#. 192
+#: ../navit/country.c:89
+msgid "Cuba"
+msgstr "క్యూబా"
+
 #. 132
 #: ../navit/country.c:90
 msgid "Cape Verde"
@@ -1112,21 +601,91 @@ msgstr ""
 msgid "Christmas Island"
 msgstr ""
 
+#. 196
+#: ../navit/country.c:92
+msgid "Cyprus"
+msgstr "సైప్రస్"
+
 #. 203
 #: ../navit/country.c:93
 msgid "Czech Republic"
 msgstr ""
 
+#. 276
+#: ../navit/country.c:94
+msgid "Germany"
+msgstr "జర్మనీ"
+
 #. 262
 #: ../navit/country.c:95
 msgid "Djibouti"
 msgstr ""
 
+#. 208
+#: ../navit/country.c:96
+msgid "Denmark"
+msgstr "డెన్మార్క్"
+
+#. 212
+#: ../navit/country.c:97
+msgid "Dominica"
+msgstr "డొమినికా"
+
+#. 214
+#: ../navit/country.c:98
+msgid "Dominican Republic"
+msgstr "డొమినికన్ రిపబ్లిక్"
+
+#. 012
+#: ../navit/country.c:99
+msgid "Algeria"
+msgstr "అల్జీరియా"
+
+#. 218
+#: ../navit/country.c:100
+msgid "Ecuador"
+msgstr "ఈక్విడార్"
+
+#. 233
+#: ../navit/country.c:101
+msgid "Estonia"
+msgstr "ఎస్టోనియా"
+
+#. 818
+#: ../navit/country.c:102
+msgid "Egypt"
+msgstr "ఈజిప్ట్"
+
+#. 732
+#: ../navit/country.c:103
+msgid "Western Sahara"
+msgstr "పశ్చిమ సహారా"
+
 #. 232
 #: ../navit/country.c:104
 msgid "Eritrea"
 msgstr ""
 
+#. 724
+#: ../navit/country.c:105
+msgid "Spain"
+msgstr "స్పెయిన్"
+
+#. 231
+#: ../navit/country.c:106
+msgid "Ethiopia"
+msgstr "ఇథియోపియా"
+
+#. 246
+#: ../navit/country.c:107
+msgid "Finland"
+msgstr "ఫిన్లాండ్"
+
+#. 242
+#: ../navit/country.c:108
+msgid "Fiji"
+msgstr "ఫిజీ"
+
 #. 238
 #: ../navit/country.c:109
 msgid "Falkland Islands (Malvinas)"
@@ -1142,6 +701,11 @@ msgstr ""
 msgid "Faroe Islands"
 msgstr ""
 
+#. 250
+#: ../navit/country.c:112
+msgid "France"
+msgstr "ఫ్రాన్స్"
+
 #. 266
 #: ../navit/country.c:113
 msgid "Gabon"
@@ -1157,16 +721,41 @@ msgstr ""
 msgid "Grenada"
 msgstr ""
 
+#. 268
+#: ../navit/country.c:116
+msgid "Georgia"
+msgstr "జార్జియా"
+
+#. 254
+#: ../navit/country.c:117
+msgid "French Guiana"
+msgstr "ఫ్రెంచ్   గయానా"
+
 #. 831
 #: ../navit/country.c:118
 msgid "Guernsey"
 msgstr ""
 
+#. 288
+#: ../navit/country.c:119
+msgid "Ghana"
+msgstr "ఘనా"
+
 #. 292
 #: ../navit/country.c:120
 msgid "Gibraltar"
 msgstr ""
 
+#. 304
+#: ../navit/country.c:121
+msgid "Greenland"
+msgstr "గ్రీన్‌లాండ్"
+
+#. 270
+#: ../navit/country.c:122
+msgid "Gambia"
+msgstr "జాంబియా"
+
 #. 324
 #: ../navit/country.c:123
 msgid "Guinea"
@@ -1182,6 +771,11 @@ msgstr ""
 msgid "Equatorial Guinea"
 msgstr ""
 
+#. 300
+#: ../navit/country.c:126
+msgid "Greece"
+msgstr "గ్రీస్"
+
 #. 239
 #: ../navit/country.c:127
 msgid "South Georgia and the South Sandwich Islands"
@@ -1202,6 +796,16 @@ msgstr ""
 msgid "Guinea-Bissau"
 msgstr ""
 
+#. 328
+#: ../navit/country.c:131
+msgid "Guyana"
+msgstr "గయానా"
+
+#. 344
+#: ../navit/country.c:132
+msgid "Hong Kong"
+msgstr "హాంకాంగ్"
+
 #. 334
 #: ../navit/country.c:133
 msgid "Heard Island and McDonald Islands"
@@ -1212,11 +816,31 @@ msgstr ""
 msgid "Honduras"
 msgstr ""
 
+#. 191
+#: ../navit/country.c:135
+msgid "Croatia"
+msgstr "క్రోయేషియా"
+
 #. 332
 #: ../navit/country.c:136
 msgid "Haiti"
 msgstr ""
 
+#. 348
+#: ../navit/country.c:137
+msgid "Hungary"
+msgstr "హంగరీ"
+
+#. 360
+#: ../navit/country.c:138
+msgid "Indonesia"
+msgstr "ఇండోనేషియా"
+
+#. 372
+#: ../navit/country.c:139
+msgid "Ireland"
+msgstr "ఐర్లాండ్"
+
 #. 376
 #: ../navit/country.c:140
 msgid "Israel"
@@ -1227,11 +851,21 @@ msgstr ""
 msgid "Isle of Man"
 msgstr ""
 
+#. 356
+#: ../navit/country.c:142
+msgid "India"
+msgstr "భారతదేశం"
+
 #. 086
 #: ../navit/country.c:143
 msgid "British Indian Ocean Territory"
 msgstr ""
 
+#. 368
+#: ../navit/country.c:144
+msgid "Iraq"
+msgstr "ఇరాక్"
+
 #. 364
 #: ../navit/country.c:145
 msgid "Iran, Islamic Republic of"
@@ -1242,16 +876,46 @@ msgstr ""
 msgid "Iceland"
 msgstr ""
 
+#. 380
+#: ../navit/country.c:147
+msgid "Italy"
+msgstr "ఇటలీ"
+
 #. 832
 #: ../navit/country.c:148
 msgid "Jersey"
 msgstr ""
 
+#. 388
+#: ../navit/country.c:149
+msgid "Jamaica"
+msgstr "జమైకా"
+
+#. 400
+#: ../navit/country.c:150
+msgid "Jordan"
+msgstr "జోర్డాన్"
+
+#. 392
+#: ../navit/country.c:151
+msgid "Japan"
+msgstr "జపాన్"
+
+#. 404
+#: ../navit/country.c:152
+msgid "Kenya"
+msgstr "కెన్యా"
+
 #. 417
 #: ../navit/country.c:153
 msgid "Kyrgyzstan"
 msgstr ""
 
+#. 116
+#: ../navit/country.c:154
+msgid "Cambodia"
+msgstr "కాంబోడియా"
+
 #. 296
 #: ../navit/country.c:155
 msgid "Kiribati"
@@ -1277,11 +941,31 @@ msgstr ""
 msgid "Korea, Republic of"
 msgstr ""
 
+#. 414
+#: ../navit/country.c:160
+msgid "Kuwait"
+msgstr "కువైట్"
+
+#. 136
+#: ../navit/country.c:161
+msgid "Cayman Islands"
+msgstr "కేమన్ దీవులు"
+
+#. 398
+#: ../navit/country.c:162
+msgid "Kazakhstan"
+msgstr "కజకిస్తాన్"
+
 #. 418
 #: ../navit/country.c:163
 msgid "Lao People's Democratic Republic"
 msgstr ""
 
+#. 422
+#: ../navit/country.c:164
+msgid "Lebanon"
+msgstr "లెబనాన్"
+
 #. 662
 #: ../navit/country.c:165
 msgid "Saint Lucia"
@@ -1292,6 +976,11 @@ msgstr ""
 msgid "Liechtenstein"
 msgstr ""
 
+#. 144
+#: ../navit/country.c:167
+msgid "Sri Lanka"
+msgstr "శ్రీలంక"
+
 #. 430
 #: ../navit/country.c:168
 msgid "Liberia"
@@ -1312,11 +1001,26 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
+#. 428
+#: ../navit/country.c:172
+msgid "Latvia"
+msgstr "లాత్వియా"
+
 #. 434
 #: ../navit/country.c:173
 msgid "Libyan Arab Jamahiriya"
 msgstr ""
 
+#. 504
+#: ../navit/country.c:174
+msgid "Morocco"
+msgstr "మొరాకో"
+
+#. 492
+#: ../navit/country.c:175
+msgid "Monaco"
+msgstr "మొనాకో"
+
 #. 498
 #: ../navit/country.c:176
 msgid "Moldova, Republic of"
@@ -1332,6 +1036,11 @@ msgstr ""
 msgid "Saint Martin (French part)"
 msgstr ""
 
+#. 450
+#: ../navit/country.c:179
+msgid "Madagascar"
+msgstr "మడగాస్కర్"
+
 #. 584
 #: ../navit/country.c:180
 msgid "Marshall Islands"
@@ -1347,6 +1056,16 @@ msgstr ""
 msgid "Mali"
 msgstr ""
 
+#. 104
+#: ../navit/country.c:183
+msgid "Myanmar"
+msgstr "మియన్మార్"
+
+#. 496
+#: ../navit/country.c:184
+msgid "Mongolia"
+msgstr "మంగోలియా"
+
 #. 446
 #: ../navit/country.c:185
 msgid "Macao"
@@ -1372,16 +1091,46 @@ msgstr ""
 msgid "Montserrat"
 msgstr ""
 
+#. 470
+#: ../navit/country.c:190
+msgid "Malta"
+msgstr "మాల్టా"
+
+#. 480
+#: ../navit/country.c:191
+msgid "Mauritius"
+msgstr "మారిషస్"
+
+#. 462
+#: ../navit/country.c:192
+msgid "Maldives"
+msgstr "మాల్దీవులు"
+
 #. 454
 #: ../navit/country.c:193
 msgid "Malawi"
 msgstr ""
 
+#. 484
+#: ../navit/country.c:194
+msgid "Mexico"
+msgstr "మెక్సికో"
+
+#. 458
+#: ../navit/country.c:195
+msgid "Malaysia"
+msgstr "మలేషియా"
+
 #. 508
 #: ../navit/country.c:196
 msgid "Mozambique"
 msgstr ""
 
+#. 516
+#: ../navit/country.c:197
+msgid "Namibia"
+msgstr "నమీబియా"
+
 #. 540
 #: ../navit/country.c:198
 msgid "New Caledonia"
@@ -1397,6 +1146,11 @@ msgstr ""
 msgid "Norfolk Island"
 msgstr ""
 
+#. 566
+#: ../navit/country.c:201
+msgid "Nigeria"
+msgstr "నైజీరియా"
+
 #. 558
 #: ../navit/country.c:202
 msgid "Nicaragua"
@@ -1407,6 +1161,16 @@ msgstr ""
 msgid "Netherlands"
 msgstr ""
 
+#. 578
+#: ../navit/country.c:204
+msgid "Norway"
+msgstr "నార్వే"
+
+#. 524
+#: ../navit/country.c:205
+msgid "Nepal"
+msgstr "నేపాల్"
+
 #. 520
 #: ../navit/country.c:206
 msgid "Nauru"
@@ -1417,11 +1181,26 @@ msgstr ""
 msgid "Niue"
 msgstr ""
 
+#. 554
+#: ../navit/country.c:208
+msgid "New Zealand"
+msgstr "న్యూజిలాండ్"
+
 #. 512
 #: ../navit/country.c:209
 msgid "Oman"
 msgstr ""
 
+#. 591
+#: ../navit/country.c:210
+msgid "Panama"
+msgstr "పనామా"
+
+#. 604
+#: ../navit/country.c:211
+msgid "Peru"
+msgstr "పెరూ"
+
 #. 258
 #: ../navit/country.c:212
 msgid "French Polynesia"
@@ -1432,6 +1211,21 @@ msgstr ""
 msgid "Papua New Guinea"
 msgstr ""
 
+#. 608
+#: ../navit/country.c:214
+msgid "Philippines"
+msgstr "ఫిలిప్ఫీన్స్"
+
+#. 586
+#: ../navit/country.c:215
+msgid "Pakistan"
+msgstr "పాకిస్తాన్"
+
+#. 616
+#: ../navit/country.c:216
+msgid "Poland"
+msgstr "పోలాండ్"
+
 #. 666
 #: ../navit/country.c:217
 msgid "Saint Pierre and Miquelon"
@@ -1452,21 +1246,56 @@ msgstr ""
 msgid "Palestinian Territory, Occupied"
 msgstr ""
 
+#. 620
+#: ../navit/country.c:221
+msgid "Portugal"
+msgstr "పోర్చుగల్"
+
 #. 585
 #: ../navit/country.c:222
 msgid "Palau"
 msgstr ""
 
+#. 600
+#: ../navit/country.c:223
+msgid "Paraguay"
+msgstr "పరాగ్వే"
+
+#. 634
+#: ../navit/country.c:224
+msgid "Qatar"
+msgstr "ఖతార్"
+
 #. 638
 #: ../navit/country.c:225
 msgid "Reunion"
 msgstr ""
 
+#. 642
+#: ../navit/country.c:226
+msgid "Romania"
+msgstr "రొమేనియా"
+
+#. 688
+#: ../navit/country.c:227
+msgid "Serbia"
+msgstr "సెర్బియా"
+
 #. 643
 #: ../navit/country.c:228
 msgid "Russian Federation"
 msgstr ""
 
+#. 646
+#: ../navit/country.c:229
+msgid "Rwanda"
+msgstr "రువాండా"
+
+#. 682
+#: ../navit/country.c:230
+msgid "Saudi Arabia"
+msgstr "సౌది అరేబియా"
+
 #. 090
 #: ../navit/country.c:231
 msgid "Solomon Islands"
@@ -1477,6 +1306,21 @@ msgstr ""
 msgid "Seychelles"
 msgstr ""
 
+#. 736
+#: ../navit/country.c:233
+msgid "Sudan"
+msgstr "సూడాన్"
+
+#. 752
+#: ../navit/country.c:234
+msgid "Sweden"
+msgstr "స్వీడన్"
+
+#. 702
+#: ../navit/country.c:235
+msgid "Singapore"
+msgstr "సింగపూర్"
+
 #. 654
 #: ../navit/country.c:236
 msgid "Saint Helena"
@@ -1492,6 +1336,11 @@ msgstr ""
 msgid "Svalbard and Jan Mayen"
 msgstr ""
 
+#. 703
+#: ../navit/country.c:239
+msgid "Slovakia"
+msgstr "స్లొవేకియా"
+
 #. 694
 #: ../navit/country.c:240
 msgid "Sierra Leone"
@@ -1507,6 +1356,11 @@ msgstr ""
 msgid "Senegal"
 msgstr ""
 
+#. 706
+#: ../navit/country.c:243
+msgid "Somalia"
+msgstr "సోమాలియా"
+
 #. 740
 #: ../navit/country.c:244
 msgid "Suriname"
@@ -1527,6 +1381,11 @@ msgstr ""
 msgid "Syrian Arab Republic"
 msgstr ""
 
+#. 748
+#: ../navit/country.c:248
+msgid "Swaziland"
+msgstr "స్వాజిలాండ్"
+
 #. 796
 #: ../navit/country.c:249
 msgid "Turks and Caicos Islands"
@@ -1542,6 +1401,21 @@ msgstr ""
 msgid "French Southern Territories"
 msgstr ""
 
+#. 768
+#: ../navit/country.c:252
+msgid "Togo"
+msgstr "టోగో"
+
+#. 764
+#: ../navit/country.c:253
+msgid "Thailand"
+msgstr "థాయిలాండ్"
+
+#. 762
+#: ../navit/country.c:254
+msgid "Tajikistan"
+msgstr "తజకిస్తాన్"
+
 #. 772
 #: ../navit/country.c:255
 msgid "Tokelau"
@@ -1592,11 +1466,36 @@ msgstr ""
 msgid "Tanzania, United Republic of"
 msgstr ""
 
+#. 804
+#: ../navit/country.c:265
+msgid "Ukraine"
+msgstr "ఉక్రేయిన్"
+
+#. 800
+#: ../navit/country.c:266
+msgid "Uganda"
+msgstr "ఉగాండా"
+
 #. 581
 #: ../navit/country.c:267
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
+#. 840
+#: ../navit/country.c:268
+msgid "United States"
+msgstr "యునైటెడ్ స్టేట్స్ ఆఫ్ అమెరికా"
+
+#. 858
+#: ../navit/country.c:269
+msgid "Uruguay"
+msgstr "ఉరూగ్వే"
+
+#. 860
+#: ../navit/country.c:270
+msgid "Uzbekistan"
+msgstr "ఉజ్బెకిస్తాన్"
+
 #. 336
 #: ../navit/country.c:271
 msgid "Holy See (Vatican City State)"
@@ -1607,6 +1506,11 @@ msgstr ""
 msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
+#. 862
+#: ../navit/country.c:273
+msgid "Venezuela"
+msgstr "వెనిజులా"
+
 #. 092
 #: ../navit/country.c:274
 msgid "Virgin Islands, British"
@@ -1617,6 +1521,11 @@ msgstr ""
 msgid "Virgin Islands, U.S."
 msgstr ""
 
+#. 704
+#: ../navit/country.c:276
+msgid "Viet Nam"
+msgstr "వియత్నాం"
+
 #. 548
 #: ../navit/country.c:277
 msgid "Vanuatu"
@@ -1642,6 +1551,25 @@ msgstr ""
 msgid "Mayotte"
 msgstr ""
 
+#. 710
+#: ../navit/country.c:282
+msgid "South Africa"
+msgstr "దక్షిణ ఆఫ్రికా"
+
+#. 894
+#: ../navit/country.c:283
+msgid "Zambia"
+msgstr "జాంబియా"
+
+#. 716
+#: ../navit/country.c:284
+msgid "Zimbabwe"
+msgstr "జింబాబ్వే"
+
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1655,6 +1583,40 @@ msgstr ""
 msgid "Iso3"
 msgstr ""
 
+#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
+#: ../navit/gui/internal/gui_internal.c:2865
+msgid "Country"
+msgstr "దేశం"
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "Postal"
+msgstr "తపాలా"
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
+msgid "Town"
+msgstr "పట్టణం"
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+msgid "District"
+msgstr "జిల్లా"
+
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/gtk/destination.c:446
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
+msgid "Street"
+msgstr "వీధి"
+
+#: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
+msgid "Number"
+msgstr "సంఖ్య"
+
 #: ../navit/gui/gtk/destination.c:429
 msgid "Enter Destination"
 msgstr ""
@@ -1663,21 +1625,34 @@ msgstr ""
 msgid "Zip Code"
 msgstr ""
 
+#: ../navit/gui/gtk/destination.c:440
+msgid "City"
+msgstr "నగరం"
+
 #: ../navit/gui/gtk/destination.c:443
 msgid "District/Township"
 msgstr ""
 
+#: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
+msgid "Map"
+msgstr "పటం"
+
 #: ../navit/gui/gtk/destination.c:472
 msgid "Bookmark"
 msgstr ""
 
+#: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
+msgid "Destination"
+msgstr "గమ్యం"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr ""
 
@@ -1685,10 +1660,28 @@ msgstr ""
 msgid "Former Destinations"
 msgstr ""
 
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
+msgid "Bookmarks"
+msgstr "పేజీకలు"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
+msgid "Layout"
+msgstr "కూర్పు"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr ""
 
+#: ../navit/gui/gtk/gui_gtk_action.c:203
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
+msgid "Vehicle"
+msgstr "వాహనం"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
 msgstr ""
@@ -1701,10 +1694,18 @@ msgstr ""
 msgid "Recalculate"
 msgstr ""
 
+#: ../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:213
 msgid "Stop Navigation"
 msgstr ""
 
+#: ../navit/gui/gtk/gui_gtk_action.c:214
+msgid "Test"
+msgstr "పరీక్ష"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
 msgstr ""
@@ -1718,7 +1719,7 @@ msgid "Lock on Road"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr ""
 
@@ -1726,6 +1727,15 @@ msgstr ""
 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:2941
+msgid "Fullscreen"
+msgstr "నిండు తెర"
+
+#: ../navit/gui/gtk/gui_gtk_action.c:238
+msgid "Data"
+msgstr "దత్తాంశం"
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "N"
@@ -1771,12 +1781,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1793,128 +1803,150 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/th.po.in b/po/th.po.in
index 44ea2bdc2..bf1de2225 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -7,194 +7,329 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-09-03 03:29+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:41+0000\n"
 "Last-Translator: mansv68 <mansv68@yahoo.co.th>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+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 ""
+
 #: ../navit/main.c:263
 #, c-format
 msgid "setting '%s' to '%s'\n"
 msgstr "กำหนด '%s' ถึง '%s'\n"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr ""
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr ""
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr ""
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr ""
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr ""
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr ""
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d เมตร"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "อีก %d เมตร"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d เมตร"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "อีก %d เมตร"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d  กิโลเมตร"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "อีก %d.%d กิโลเมตร"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d กิโลเมตร"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "อีก %d กิโลเมตร"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "ทางออก"
 
+#: ../navit/navigation.c:1268
+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:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s เข้าสู่ถนน %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s เข้าสู่ %s%s%s| จาก"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s เข้าสู %s%s%s| จาก"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s เข้าสู่ %s%s%s| จาก"
 
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "ขวา"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "ซ้าย"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "อย่างเคร่งคัด "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "ไม่ทราบ "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "ถ้าเป็นไปได้ ให้กลับรถ"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr ""
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "ตรงไปตามถนน แล้ว %s"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "ในไม่ช้า"
 
-#: ../navit/navigation.c:1464
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "เดี๋ยวนี้"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "เลี้ยว %1$s%2$s %3$s%4$s"
 
-#: ../navit/navigation.c:1521
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "คุณได้ถึงที่หมายแล้ว %s"
 
-#: ../navit/navit.c:1165
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr ""
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "คำสั่ง"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "ความยาว"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "กม."
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "เมตร"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "เวลา"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "ระยะทาง ถึงที่หมาย"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "เวลา ถึงที่หมาย"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
+msgid "Roadbook"
+msgstr ""
+
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "กำหนดตำแหน่ง"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "กำหนดเป็นที่หมาย"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "เพิ่มใน บุกมาร์ก"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "จุด 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "พิกัดหน้าจอ : %d %d"
@@ -329,6 +464,11 @@ msgstr "บูรันดิ"
 msgid "Benin"
 msgstr "เบนิน"
 
+#. 652
+#: ../navit/country.c:65
+msgid "Saint Barthelemy"
+msgstr ""
+
 #. 060
 #: ../navit/country.c:66
 msgid "Bermuda"
@@ -389,6 +529,11 @@ msgstr "แคนาดา"
 msgid "Cocos (Keeling) Islands"
 msgstr "หมู่เกาะโคโคส (คีลิง)"
 
+#. 180
+#: ../navit/country.c:78
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
 #. 140
 #: ../navit/country.c:79
 msgid "Central African Republic"
@@ -719,6 +864,11 @@ msgstr "บริติชอินเดียนโอเชียนเทร
 msgid "Iraq"
 msgstr "อิรัก"
 
+#. 364
+#: ../navit/country.c:145
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
 #. 352
 #: ../navit/country.c:146
 msgid "Iceland"
@@ -894,6 +1044,11 @@ msgstr "มาดากัสกา"
 msgid "Marshall Islands"
 msgstr "หมู่เกาะมาแชล"
 
+#. 807
+#: ../navit/country.c:181
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
 #. 466
 #: ../navit/country.c:182
 msgid "Mali"
@@ -1184,6 +1339,11 @@ msgstr "สฟาลบาร์ และ ยานไมเอน"
 msgid "Slovakia"
 msgstr "สโลวาเกีย"
 
+#. 694
+#: ../navit/country.c:240
+msgid "Sierra Leone"
+msgstr ""
+
 #. 674
 #: ../navit/country.c:241
 msgid "San Marino"
@@ -1404,6 +1564,10 @@ msgstr "แซมเบีย"
 msgid "Zimbabwe"
 msgstr "ซิมบับเว"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1418,7 +1582,7 @@ msgid "Iso3"
 msgstr "ISO3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "ประเทศ"
 
@@ -1429,9 +1593,9 @@ msgstr "ไปรษณีย์"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "เมือง"
 
@@ -1442,8 +1606,8 @@ msgstr "เขต"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "ถนน"
 
@@ -1463,21 +1627,30 @@ msgstr "รหัสไปรษณีย์"
 msgid "City"
 msgstr "เมือง"
 
+#: ../navit/gui/gtk/destination.c:443
+msgid "District/Township"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
 msgstr "แผนที่"
 
+#: ../navit/gui/gtk/destination.c:472
+msgid "Bookmark"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
 msgstr "จุดหมาย"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "แสดง"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "เส้นทาง"
 
@@ -1486,14 +1659,14 @@ msgid "Former Destinations"
 msgstr "ก่อนถึง ที่หมาย"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "บุ๊กมาร์ก"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "การจัดเรียง"
 
@@ -1502,8 +1675,8 @@ msgid "Projection"
 msgstr "การฉายแผนที่"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "ยานพาหนะ"
 
@@ -1539,13 +1712,21 @@ msgstr "_ออกจากโปรแกรม"
 msgid "Cursor"
 msgstr "เคอร์เซอร์"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:223
+msgid "Lock on Road"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "ทางทิศเหนือ"
 
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "แสดงผลเต็มจอภาพ"
 
@@ -1593,197 +1774,17 @@ msgstr "ตะวันตก"
 msgid "NW"
 msgstr "ตะวันออกเฉียงเหนือ"
 
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
-#, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "เส้นทาง %4.0f กม. %02d:%02d ETA"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
-msgid "Route 0000km  0+00:00 ETA"
-msgstr "เส้นทาง 0000km 0+00:00 ETA"
-
-#: ../navit/main.c:231
-#, c-format
-msgid "Running from source directory\n"
-msgstr ""
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:242
-msgid "first"
-msgstr ""
-
-#: ../navit/navigation.c:244
-msgid "second"
-msgstr ""
-
-#: ../navit/navigation.c:246
-msgid "third"
-msgstr ""
-
-#: ../navit/navigation.c:248
-msgid "fourth"
-msgstr ""
-
-#: ../navit/navigation.c:250
-msgid "fifth"
-msgstr ""
-
-#: ../navit/navigation.c:252
-msgid "sixth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr ""
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
-msgid "easily "
-msgstr ""
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr ""
-
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
-msgid "Roadbook"
-msgstr ""
-
-#. 652
-#: ../navit/country.c:65
-msgid "Saint Barthelemy"
-msgstr ""
-
-#. 180
-#: ../navit/country.c:78
-msgid "Congo, Democratic Republic of the"
-msgstr ""
-
-#. 364
-#: ../navit/country.c:145
-msgid "Iran, Islamic Republic of"
-msgstr ""
-
-#. 807
-#: ../navit/country.c:181
-msgid "Macedonia, the former Yugoslav Republic of"
-msgstr ""
-
-#. 694
-#: ../navit/country.c:240
-msgid "Sierra Leone"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:443
-msgid "District/Township"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:472
-msgid "Bookmark"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:223
-msgid "Lock on Road"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1791,128 +1792,159 @@ msgstr ""
 msgid "OT"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:119
+#, c-format
+msgid "Route %4.0fkm    %02d:%02d ETA"
+msgstr "เส้นทาง %4.0f กม. %02d:%02d ETA"
+
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:164
+msgid "Route 0000km  0+00:00 ETA"
+msgstr "เส้นทาง 0000km 0+00:00 ETA"
+
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/tr.po.in b/po/tr.po.in
index e469f4ac9..d246a6c6f 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-05-16 08:43+0000\n"
-"Last-Translator: Abesis <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-26 22:22+0000\n"
+"Last-Translator: ViZiT <vizit@free.fr>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,233 +29,307 @@ msgstr "Kaynak klasörden çalıştırılıyor\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' , '%s' değerine ayarlanıyor\n"
 
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr "sıfırıncı"
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr "birinci"
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr "ikinci"
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr "üçüncü"
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr "dördüncü"
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr "beşinci"
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr "altıncı"
 
-#: ../navit/navigation.c:316
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr "sıfırıncı çıkış"
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr "ilk çıkış"
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr "ikinci çıkış"
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr "üçüncü çıkış"
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr "dördüncü çıkış"
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr "beşinci çıkış"
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr "altıncı çıkış"
+
+#: ../navit/navigation.c:314
 #, c-format
 msgid "%d m"
 msgstr "%d m"
 
-#: ../navit/navigation.c:318
+#: ../navit/navigation.c:316
 #, c-format
 msgid "in %d m"
 msgstr "%d m'de"
 
-#: ../navit/navigation.c:322
+#: ../navit/navigation.c:320
 #, c-format
 msgid "%d meters"
 msgstr "%d metre"
 
-#: ../navit/navigation.c:324
+#: ../navit/navigation.c:322
 #, c-format
 msgid "in %d meters"
 msgstr "%d metrede"
 
-#: ../navit/navigation.c:330
+#: ../navit/navigation.c:328
 #, c-format
 msgid "%d.%d kilometer"
 msgstr "%d.%d kilometre"
 
-#: ../navit/navigation.c:332
+#: ../navit/navigation.c:330
 #, c-format
 msgid "in %d.%d kilometers"
 msgstr "%d.%d kilometrede"
 
-#: ../navit/navigation.c:336
+#: ../navit/navigation.c:334
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "%d kilometre"
 
-#: ../navit/navigation.c:338
+#: ../navit/navigation.c:336
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "%d kilometrede"
 
-#: ../navit/navigation.c:1268
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "çıkış"
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:1268
 msgid "into the ramp"
 msgstr "rampada"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
+#: ../navit/navigation.c:1298
 #, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%sCaddesi'ne %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
+#: ../navit/navigation.c:1302
 #, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%scaddesine %s%s%s|male form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
+#: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%scaddesine %s%s%s|female form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
+#: ../navit/navigation.c:1310
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%scaddesine %s%s%s|neutral form"
 
+#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
+#: ../navit/navigation.c:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr "%s%s yoluna"
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "Sağa"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "Sola"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "kolayca "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
+#: ../navit/navigation.c:1389
 msgid "strongly "
 msgstr "sertçe "
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr "gerçekten sertçe "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
 msgid "unknown "
 msgstr "bilinmeyen "
 
-#: ../navit/navigation.c:1402
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr "Müsait olduğunda lütfen yönünü değiştir"
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr "Yakındaki kavşağa girin"
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr "%s içerisinde kavşağa girin"
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr "%s'de kavşaktan çıkın"
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr "ardından %s'de kavşaktan çıkın"
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "Gelecek %s için yolu takip et"
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr "yakında"
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr "%1$s yolunda  %2$s yönüne dönün"
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr "%i yol sonra"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "şimdi"
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr "ardından %1$s yolunda  %2$s yönüne dönün"
+
+#: ../navit/navigation.c:1484
 msgid "error"
 msgstr "hata"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
-#: ../navit/navigation.c:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Dönüş %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr "sonra %1$s%2$s %3$s%4$s dönün"
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr "Hedefinize ulaştınız, %s"
 
-#: ../navit/navit.c:1164
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr "ardından hedefinize ulaşacaksınız"
+
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr "Konum"
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "Komut"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "Uzaklık"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "km"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "m"
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr "Zaman"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "Hedef Uzaklığı"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "Varış Zamanı"
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr "Yol Haritası"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "Pozisyon olarak ayarla"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "Hedef olarak ayarla"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "Yer imi olarak ayarla"
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Nokta 0x%x 0x%x"
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr "Ekran koordinatları :%d %d"
@@ -898,7 +972,7 @@ msgstr "Sen Lusia"
 #. 438
 #: ../navit/country.c:166
 msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr "Lihtenştayn"
 
 #. 144
 #: ../navit/country.c:167
@@ -993,7 +1067,7 @@ msgstr "Moğolistan"
 #. 446
 #: ../navit/country.c:185
 msgid "Macao"
-msgstr "Macao"
+msgstr "Makao"
 
 #. 580
 #: ../navit/country.c:186
@@ -1023,7 +1097,7 @@ msgstr "Malta"
 #. 480
 #: ../navit/country.c:191
 msgid "Mauritius"
-msgstr "Mauritus Adası"
+msgstr "Mauritius"
 
 #. 462
 #: ../navit/country.c:192
@@ -1098,7 +1172,7 @@ msgstr "Nepal"
 #. 520
 #: ../navit/country.c:206
 msgid "Nauru"
-msgstr "Nauru Adası"
+msgstr "Nauru"
 
 #. 570
 #: ../navit/country.c:207
@@ -1153,7 +1227,7 @@ msgstr "Polonya"
 #. 666
 #: ../navit/country.c:217
 msgid "Saint Pierre and Miquelon"
-msgstr "Sen Piyer ve Miquelon"
+msgstr "Saint Pierre ve Miquelon"
 
 #. 612
 #: ../navit/country.c:218
@@ -1193,7 +1267,7 @@ msgstr "Katar"
 #. 638
 #: ../navit/country.c:225
 msgid "Reunion"
-msgstr "Yeniden buluşma"
+msgstr "Reunion"
 
 #. 642
 #: ../navit/country.c:226
@@ -1208,7 +1282,7 @@ msgstr "Sırbistan"
 #. 643
 #: ../navit/country.c:228
 msgid "Russian Federation"
-msgstr "Rusya"
+msgstr "Rusya Federasyonu"
 
 #. 646
 #: ../navit/country.c:229
@@ -1248,7 +1322,7 @@ msgstr "Singapur"
 #. 654
 #: ../navit/country.c:236
 msgid "Saint Helena"
-msgstr "Sen Helen"
+msgstr "Saint Helena"
 
 #. 705
 #: ../navit/country.c:237
@@ -1490,6 +1564,10 @@ msgstr "Zambiya"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr "* tanınmıyor, bu yerleşime bir etiket ekleyin"
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1504,7 +1582,7 @@ msgid "Iso3"
 msgstr "Isa3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "Ülke"
 
@@ -1515,9 +1593,9 @@ msgstr "Posta"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "Şehir"
 
@@ -1528,8 +1606,8 @@ msgstr "Bölge"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "Cadde"
 
@@ -1566,12 +1644,13 @@ msgid "Destination"
 msgstr "Hedef"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "Görüntüle"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "Rota"
 
@@ -1580,14 +1659,14 @@ msgid "Former Destinations"
 msgstr "önceki istikamet"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr "Yer İmleri"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr "Yerleşim"
 
@@ -1596,8 +1675,8 @@ msgid "Projection"
 msgstr "İzdüşüm"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "Araç"
 
@@ -1638,12 +1717,16 @@ msgid "Lock on Road"
 msgstr "Kapalı yol"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr "Kuzey mesafesi"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:226
+msgid "Autozoom"
+msgstr "Oto-yaklaş"
+
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "Tam Ekran"
 
@@ -1691,16 +1774,24 @@ msgstr "B"
 msgid "NW"
 msgstr "Kuzey-Batı"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
+msgid "No"
+msgstr "Hayır"
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr "2B"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr "3B"
 
+#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
+msgid "OT"
+msgstr "OT"
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1710,57 +1801,79 @@ 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:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr "Haritaya dön"
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr "Ana Menü"
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:1461
+msgid "Help"
+msgstr "Yardım"
+
+#: ../navit/gui/internal/gui_internal.c:1611
+msgid "Back"
+msgstr "Geri"
+
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
+msgid "POIs"
+msgstr "İlgi Noktaları"
+
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr "Sokaklar"
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr "Ev numaraları"
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr "Tarayıcıda Bak"
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr "Özniteliklere Bak"
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr "Haritada bak"
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr "Yerimi ata %s"
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr "Ev no:"
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr "Pencere Modu"
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr "Eylemler"
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr "Harita Noktası"
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr "Araç Konumu"
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr "Çık"
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
@@ -1768,155 +1881,74 @@ msgstr ""
 "Navigasyonu\n"
 "Durdur"
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr "Haritalar"
 
-#: ../navit/gui/internal/gui_internal.c:3101
-msgid "Map follows Vehicle"
-msgstr "Harita aracı takip etsin"
-
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: ../navit/gui/internal/gui_internal.c:3159
-msgid "Main menu"
-msgstr "Ana menü"
-
-#: ../navit/gui/internal/gui_internal.c:3172
-msgid "Tools"
-msgstr "Araçlar"
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr "sıfırıncı çıkış"
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr "ilk çıkış"
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr "ikinci çıkış"
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr "üçüncü çıkış"
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr "dördüncü çıkış"
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr "beşinci çıkış"
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr "altıncı çıkış"
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr "%s%s yoluna"
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr "Yakındaki kavşağa girin"
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr "%s içerisinde kavşağa girin"
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr "%s'de kavşaktan çıkın"
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr "ardından %s'de kavşaktan çıkın"
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr "%1$s yolunda  %2$s yönüne dönün"
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr "ardından %1$s yolunda  %2$s yönüne dönün"
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr "ardından hedefinize ulaşacaksınız"
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr "Oto-yaklaş"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:74
-msgid "No"
-msgstr "Hayır"
-
-#: ../navit/gui/gtk/gui_gtk_statusbar.c:78
-msgid "OT"
-msgstr "OT"
-
-#: ../navit/gui/internal/gui_internal.c:1452
-msgid "Help"
-msgstr "Yardım"
-
-#: ../navit/gui/internal/gui_internal.c:1602
-msgid "Back"
-msgstr "Geri"
-
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
-msgid "POIs"
-msgstr "İlgi Noktaları"
-
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr "Uydu durumunu göster"
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr "NMEA verisi göster"
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr "Etkin olarak ata"
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr "Uydu durumunuı göster"
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr "NMEA verisi göster"
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr "Kurallar"
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr "Yola Kilitlen"
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3210
+msgid "Map follows Vehicle"
+msgstr "Harita aracı takip etsin"
+
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: ../navit/gui/internal/gui_internal.c:3268
+msgid "Main menu"
+msgstr "Ana menü"
+
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 "Goster\n"
 "Harita"
+
+#: ../navit/gui/internal/gui_internal.c:3281
+msgid "Tools"
+msgstr "Araçlar"
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr "Mesaj"
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr "Tanımlama"
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index 62c63da11..637945ae6 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2009-02-14 13:57+0000\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:42+0000\n"
 "Last-Translator: rainofchaos <rainofchaos@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -29,302 +29,307 @@ msgstr "从根目录执行\n"
 msgid "setting '%s' to '%s'\n"
 msgstr "'%s' 设置为 '%s'\n"
 
-#: ../navit/navigation.c:316
-#, c-format
-msgid "%d m"
-msgstr "%d米"
-
-#: ../navit/navigation.c:318
-#, c-format
-msgid "in %d m"
-msgstr "距离%d米"
-
-#: ../navit/navigation.c:322
-#, c-format
-msgid "%d meters"
-msgstr "%d米"
-
-#: ../navit/navigation.c:324
-#, c-format
-msgid "in %d meters"
-msgstr "距离%d米"
-
-#: ../navit/navigation.c:330
-#, c-format
-msgid "%d.%d kilometer"
-msgstr "%d.%d千米"
-
-#: ../navit/navigation.c:332
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "距离%d.%d千米"
-
-#: ../navit/navigation.c:336
-#, c-format
-msgid "one kilometer"
-msgid_plural "%d kilometers"
-msgstr[0] "%d千米"
-
-#: ../navit/navigation.c:338
-#, c-format
-msgid "in one kilometer"
-msgid_plural "in %d kilometers"
-msgstr[0] "距离%d千米"
-
-#: ../navit/navigation.c:1268
-msgid "exit"
-msgstr "退出"
-
-#. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
-msgid "right"
-msgstr "右"
-
-#. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
-msgid "left"
-msgstr "左"
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
-msgid "easily "
-msgstr "轻轻 "
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
-msgid "strongly "
-msgstr "大幅度 "
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
-msgid "unknown "
-msgstr "未知 "
-
-#: ../navit/navigation.c:240
+#: ../navit/navigation.c:238
 msgid "zeroth"
 msgstr ""
 
-#: ../navit/navigation.c:242
+#: ../navit/navigation.c:240
 msgid "first"
 msgstr ""
 
-#: ../navit/navigation.c:244
+#: ../navit/navigation.c:242
 msgid "second"
 msgstr ""
 
-#: ../navit/navigation.c:246
+#: ../navit/navigation.c:244
 msgid "third"
 msgstr ""
 
-#: ../navit/navigation.c:248
+#: ../navit/navigation.c:246
 msgid "fourth"
 msgstr ""
 
-#: ../navit/navigation.c:250
+#: ../navit/navigation.c:248
 msgid "fifth"
 msgstr ""
 
-#: ../navit/navigation.c:252
+#: ../navit/navigation.c:250
 msgid "sixth"
 msgstr ""
 
-#: ../navit/navigation.c:263
+#: ../navit/navigation.c:261
 msgid "zeroth exit"
 msgstr ""
 
-#: ../navit/navigation.c:265
+#: ../navit/navigation.c:263
 msgid "first exit"
 msgstr ""
 
-#: ../navit/navigation.c:267
+#: ../navit/navigation.c:265
 msgid "second exit"
 msgstr ""
 
-#: ../navit/navigation.c:269
+#: ../navit/navigation.c:267
 msgid "third exit"
 msgstr ""
 
-#: ../navit/navigation.c:271
+#: ../navit/navigation.c:269
 msgid "fourth exit"
 msgstr ""
 
-#: ../navit/navigation.c:273
+#: ../navit/navigation.c:271
 msgid "fifth exit"
 msgstr ""
 
-#: ../navit/navigation.c:275
+#: ../navit/navigation.c:273
 msgid "sixth exit"
 msgstr ""
 
-#: ../navit/navigation.c:1270
+#: ../navit/navigation.c:314
+#, c-format
+msgid "%d m"
+msgstr "%d米"
+
+#: ../navit/navigation.c:316
+#, c-format
+msgid "in %d m"
+msgstr "距离%d米"
+
+#: ../navit/navigation.c:320
+#, c-format
+msgid "%d meters"
+msgstr "%d米"
+
+#: ../navit/navigation.c:322
+#, c-format
+msgid "in %d meters"
+msgstr "距离%d米"
+
+#: ../navit/navigation.c:328
+#, c-format
+msgid "%d.%d kilometer"
+msgstr "%d.%d千米"
+
+#: ../navit/navigation.c:330
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "距离%d.%d千米"
+
+#: ../navit/navigation.c:334
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] "%d千米"
+
+#: ../navit/navigation.c:336
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] "距离%d千米"
+
+#: ../navit/navigation.c:1266
+msgid "exit"
+msgstr "退出"
+
+#: ../navit/navigation.c:1268
 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:1300
+#: ../navit/navigation.c:1298
 #, 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:1304
+#: ../navit/navigation.c:1302
 #, 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:1308
+#: ../navit/navigation.c:1306
 #, 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:1312
+#: ../navit/navigation.c:1310
 #, 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:1319
+#: ../navit/navigation.c:1317
 #, c-format
 msgid "%sinto the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1402
+#. TRANSLATORS: right, as in 'Turn right'
+#: ../navit/navigation.c:1338
+msgid "right"
+msgstr "右"
+
+#. TRANSLATORS: left, as in 'Turn left'
+#: ../navit/navigation.c:1377
+msgid "left"
+msgstr "左"
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1384
+msgid "easily "
+msgstr "轻轻 "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1389
+msgid "strongly "
+msgstr "大幅度 "
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
+msgid "unknown "
+msgstr "未知 "
+
+#: ../navit/navigation.c:1403
 msgid "When possible, please turn around"
 msgstr ""
 
-#: ../navit/navigation.c:1412
+#: ../navit/navigation.c:1413
 msgid "Enter the roundabout soon"
 msgstr ""
 
 #. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
+#: ../navit/navigation.c:1417
 #, c-format
 msgid "In %s, enter the roundabout"
 msgstr ""
 
-#: ../navit/navigation.c:1431
+#: ../navit/navigation.c:1432
 #, c-format
 msgid "Leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1434
+#: ../navit/navigation.c:1435
 #, c-format
 msgid "then leave the roundabout at the %s"
 msgstr ""
 
-#: ../navit/navigation.c:1444
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr ""
 
-#: ../navit/navigation.c:1448
+#: ../navit/navigation.c:1449
 msgid "soon"
 msgstr ""
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
+#: ../navit/navigation.c:1459
 #, c-format
 msgid "Take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
 #, c-format
 msgid "after %i roads"
 msgstr ""
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr ""
 
-#: ../navit/navigation.c:1472
+#: ../navit/navigation.c:1473
 #, c-format
 msgid "then take the %1$s road to the %2$s"
 msgstr ""
 
-#: ../navit/navigation.c:1483
+#: ../navit/navigation.c:1484
 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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
+#: ../navit/navigation.c:1517
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
 msgstr ""
 
-#: ../navit/navigation.c:1521
+#: ../navit/navigation.c:1522
 #, c-format
 msgid "You have reached your destination %s"
 msgstr ""
 
-#: ../navit/navigation.c:1523
+#: ../navit/navigation.c:1524
 msgid "then you have reached your destination."
 msgstr ""
 
-#: ../navit/navit.c:1164
+#: ../navit/navit.c:1174
 msgid "Position"
 msgstr ""
 
-#: ../navit/navit.c:1165
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr ""
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr ""
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr ""
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr ""
 
-#: ../navit/navit.c:1183
+#: ../navit/navit.c:1193
 msgid "Time"
 msgstr ""
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr ""
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr ""
 
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
 msgstr ""
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr ""
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr ""
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr ""
 
-#: ../navit/popup.c:282
+#: ../navit/popup.c:337
 #, c-format
 msgid "Point 0x%x 0x%x"
 msgstr ""
 
-#: ../navit/popup.c:283
+#: ../navit/popup.c:338
 #, c-format
 msgid "Screen coord : %d %d"
 msgstr ""
@@ -1559,6 +1564,10 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
@@ -1573,7 +1582,7 @@ msgid "Iso3"
 msgstr ""
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr ""
 
@@ -1584,9 +1593,9 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr ""
 
@@ -1597,8 +1606,8 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr ""
 
@@ -1635,12 +1644,13 @@ msgid "Destination"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr ""
 
@@ -1649,14 +1659,14 @@ msgid "Former Destinations"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
 msgid "Bookmarks"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
 msgid "Layout"
 msgstr ""
 
@@ -1665,8 +1675,8 @@ msgid "Projection"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr ""
 
@@ -1707,7 +1717,7 @@ msgid "Lock on Road"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
+#: ../navit/gui/internal/gui_internal.c:3204
 msgid "Northing"
 msgstr ""
 
@@ -1716,7 +1726,7 @@ msgid "Autozoom"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
-#: ../navit/gui/internal/gui_internal.c:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr ""
 
@@ -1769,12 +1779,12 @@ msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1791,128 +1801,150 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index 411f5ef4d..1c2e8c148 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -7,91 +7,335 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-11 10:33+0200\n"
-"PO-Revision-Date: 2008-09-08 12:56+0000\n"
-"Last-Translator: Kyle <Unknown>\n"
+"POT-Creation-Date: 2009-06-26 07:37+0200\n"
+"PO-Revision-Date: 2009-06-21 22:42+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-05-30 06:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-02 18:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
-#: ../navit/navigation.c:1268
+#: ../navit/main.c:231
+#, c-format
+msgid "Running from source directory\n"
+msgstr ""
+
+#: ../navit/main.c:263
+#, c-format
+msgid "setting '%s' to '%s'\n"
+msgstr ""
+
+#: ../navit/navigation.c:238
+msgid "zeroth"
+msgstr ""
+
+#: ../navit/navigation.c:240
+msgid "first"
+msgstr ""
+
+#: ../navit/navigation.c:242
+msgid "second"
+msgstr ""
+
+#: ../navit/navigation.c:244
+msgid "third"
+msgstr ""
+
+#: ../navit/navigation.c:246
+msgid "fourth"
+msgstr ""
+
+#: ../navit/navigation.c:248
+msgid "fifth"
+msgstr ""
+
+#: ../navit/navigation.c:250
+msgid "sixth"
+msgstr ""
+
+#: ../navit/navigation.c:261
+msgid "zeroth exit"
+msgstr ""
+
+#: ../navit/navigation.c:263
+msgid "first exit"
+msgstr ""
+
+#: ../navit/navigation.c:265
+msgid "second exit"
+msgstr ""
+
+#: ../navit/navigation.c:267
+msgid "third exit"
+msgstr ""
+
+#: ../navit/navigation.c:269
+msgid "fourth exit"
+msgstr ""
+
+#: ../navit/navigation.c:271
+msgid "fifth exit"
+msgstr ""
+
+#: ../navit/navigation.c:273
+msgid "sixth exit"
+msgstr ""
+
+#: ../navit/navigation.c:314
+#, c-format
+msgid "%d m"
+msgstr ""
+
+#: ../navit/navigation.c:316
+#, c-format
+msgid "in %d m"
+msgstr ""
+
+#: ../navit/navigation.c:320
+#, c-format
+msgid "%d meters"
+msgstr ""
+
+#: ../navit/navigation.c:322
+#, c-format
+msgid "in %d meters"
+msgstr ""
+
+#: ../navit/navigation.c:328
+#, c-format
+msgid "%d.%d kilometer"
+msgstr ""
+
+#: ../navit/navigation.c:330
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr ""
+
+#: ../navit/navigation.c:334
+#, c-format
+msgid "one kilometer"
+msgid_plural "%d kilometers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../navit/navigation.c:336
+#, c-format
+msgid "in one kilometer"
+msgid_plural "in %d kilometers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../navit/navigation.c:1266
 msgid "exit"
 msgstr "退出"
 
+#: ../navit/navigation.c:1268
+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:1298
+#, 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:1302
+#, 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:1306
+#, 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:1310
+#, 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:1317
+#, c-format
+msgid "%sinto the %s"
+msgstr ""
+
 #. TRANSLATORS: right, as in 'Turn right'
-#: ../navit/navigation.c:1340
+#: ../navit/navigation.c:1338
 msgid "right"
 msgstr "右"
 
 #. TRANSLATORS: left, as in 'Turn left'
-#: ../navit/navigation.c:1379
+#: ../navit/navigation.c:1377
 msgid "left"
 msgstr "左"
 
 #. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1386
+#: ../navit/navigation.c:1384
 msgid "easily "
 msgstr "简单 "
 
-#: ../navit/navigation.c:1444
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1389
+msgid "strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1392
+msgid "really strongly "
+msgstr ""
+
+#. TRANSLATORS: Don't forget the ending space
+#: ../navit/navigation.c:1396
+msgid "unknown "
+msgstr ""
+
+#: ../navit/navigation.c:1403
+msgid "When possible, please turn around"
+msgstr ""
+
+#: ../navit/navigation.c:1413
+msgid "Enter the roundabout soon"
+msgstr ""
+
+#. TRANSLATORS: %s is the distance to the roundabout
+#: ../navit/navigation.c:1417
+#, c-format
+msgid "In %s, enter the roundabout"
+msgstr ""
+
+#: ../navit/navigation.c:1432
+#, c-format
+msgid "Leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1435
+#, c-format
+msgid "then leave the roundabout at the %s"
+msgstr ""
+
+#: ../navit/navigation.c:1445
 #, c-format
 msgid "Follow the road for the next %s"
 msgstr "直走到下一个%s"
 
-#: ../navit/navigation.c:1464
+#: ../navit/navigation.c:1449
+msgid "soon"
+msgstr ""
+
+#. TRANSLATORS: First argument is the how manieth street to take, second the direction
+#: ../navit/navigation.c:1459
+#, c-format
+msgid "Take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1462 ../navit/navigation.c:1476
+#, c-format
+msgid "after %i roads"
+msgstr ""
+
+#: ../navit/navigation.c:1465
 msgid "now"
 msgstr "現在"
 
+#: ../navit/navigation.c:1473
+#, c-format
+msgid "then take the %1$s road to the %2$s"
+msgstr ""
+
+#: ../navit/navigation.c:1484
+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:1513
+#: ../navit/navigation.c:1514
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "%1$s转向%2$s %3$s至%4$s"
 
-#: ../navit/navit.c:1165
+#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
+#: ../navit/navigation.c:1517
+#, c-format
+msgid "then turn %1$s%2$s %3$s%4$s"
+msgstr ""
+
+#: ../navit/navigation.c:1522
+#, c-format
+msgid "You have reached your destination %s"
+msgstr ""
+
+#: ../navit/navigation.c:1524
+msgid "then you have reached your destination."
+msgstr ""
+
+#: ../navit/navit.c:1174
+msgid "Position"
+msgstr ""
+
+#: ../navit/navit.c:1175
 msgid "Command"
 msgstr "指令"
 
-#: ../navit/navit.c:1169
+#: ../navit/navit.c:1179
 msgid "Length"
 msgstr "長度"
 
-#: ../navit/navit.c:1173 ../navit/navit.c:1198
+#: ../navit/navit.c:1183 ../navit/navit.c:1208
 msgid "km"
 msgstr "公里"
 
-#: ../navit/navit.c:1177 ../navit/navit.c:1202
+#: ../navit/navit.c:1187 ../navit/navit.c:1212
 msgid "m"
 msgstr "米"
 
-#: ../navit/navit.c:1195
+#: ../navit/navit.c:1193
+msgid "Time"
+msgstr ""
+
+#: ../navit/navit.c:1205
 msgid "Destination Length"
 msgstr "抵达终点距离"
 
-#: ../navit/navit.c:1208
+#: ../navit/navit.c:1218
 msgid "Destination Time"
 msgstr "抵达终点时间"
 
-#: ../navit/popup.c:238 ../navit/popup.c:292
-#: ../navit/gui/internal/gui_internal.c:2102
+#: ../navit/navit.c:1251 ../navit/gui/gtk/gui_gtk_action.c:225
+msgid "Roadbook"
+msgstr ""
+
+#: ../navit/popup.c:278 ../navit/popup.c:347
+#: ../navit/gui/internal/gui_internal.c:2125
 msgid "Set as position"
 msgstr "设置您所在位置"
 
-#: ../navit/popup.c:239 ../navit/popup.c:293
-#: ../navit/gui/internal/gui_internal.c:2098
+#: ../navit/popup.c:279 ../navit/popup.c:348
+#: ../navit/gui/internal/gui_internal.c:2121
 msgid "Set as destination"
 msgstr "设置目的地地址"
 
-#: ../navit/popup.c:240 ../navit/popup.c:294
-#: ../navit/gui/internal/gui_internal.c:2106
+#: ../navit/popup.c:280 ../navit/popup.c:349
+#: ../navit/gui/internal/gui_internal.c:2129
 msgid "Add as bookmark"
 msgstr "添加书签"
 
+#: ../navit/popup.c:337
+#, c-format
+msgid "Point 0x%x 0x%x"
+msgstr ""
+
+#: ../navit/popup.c:338
+#, c-format
+msgid "Screen coord : %d %d"
+msgstr ""
+
 #. 020
 #: ../navit/country.c:39
 msgid "Andorra"
@@ -127,16 +371,31 @@ msgstr "阿爾巴尼亞"
 msgid "Armenia"
 msgstr "亞美尼亞"
 
+#. 530
+#: ../navit/country.c:46
+msgid "Netherlands Antilles"
+msgstr ""
+
 #. 024
 #: ../navit/country.c:47
 msgid "Angola"
 msgstr "安哥拉"
 
+#. 010
+#: ../navit/country.c:48
+msgid "Antarctica"
+msgstr ""
+
 #. 032
 #: ../navit/country.c:49
 msgid "Argentina"
 msgstr "阿根廷"
 
+#. 016
+#: ../navit/country.c:50
+msgid "American Samoa"
+msgstr ""
+
 #. 040
 #: ../navit/country.c:51
 msgid "Austria"
@@ -147,6 +406,31 @@ msgstr "奧地利"
 msgid "Australia"
 msgstr "澳大利亞"
 
+#. 533
+#: ../navit/country.c:53
+msgid "Aruba"
+msgstr ""
+
+#. 248
+#: ../navit/country.c:54
+msgid "Aland Islands"
+msgstr ""
+
+#. 031
+#: ../navit/country.c:55
+msgid "Azerbaijan"
+msgstr ""
+
+#. 070
+#: ../navit/country.c:56
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#. 052
+#: ../navit/country.c:57
+msgid "Barbados"
+msgstr ""
+
 #. 050
 #: ../navit/country.c:58
 msgid "Bangladesh"
@@ -157,6 +441,11 @@ msgstr "孟加拉"
 msgid "Belgium"
 msgstr "比利時"
 
+#. 854
+#: ../navit/country.c:60
+msgid "Burkina Faso"
+msgstr ""
+
 #. 100
 #: ../navit/country.c:61
 msgid "Bulgaria"
@@ -167,6 +456,21 @@ msgstr "保加利亞"
 msgid "Bahrain"
 msgstr "巴林"
 
+#. 108
+#: ../navit/country.c:63
+msgid "Burundi"
+msgstr ""
+
+#. 204
+#: ../navit/country.c:64
+msgid "Benin"
+msgstr ""
+
+#. 652
+#: ../navit/country.c:65
+msgid "Saint Barthelemy"
+msgstr ""
+
 #. 060
 #: ../navit/country.c:66
 msgid "Bermuda"
@@ -197,11 +501,41 @@ msgstr "巴哈馬"
 msgid "Bhutan"
 msgstr "不丹"
 
+#. 074
+#: ../navit/country.c:72
+msgid "Bouvet Island"
+msgstr ""
+
+#. 072
+#: ../navit/country.c:73
+msgid "Botswana"
+msgstr ""
+
+#. 112
+#: ../navit/country.c:74
+msgid "Belarus"
+msgstr ""
+
+#. 084
+#: ../navit/country.c:75
+msgid "Belize"
+msgstr ""
+
 #. 124
 #: ../navit/country.c:76
 msgid "Canada"
 msgstr "加拿大"
 
+#. 166
+#: ../navit/country.c:77
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. 180
+#: ../navit/country.c:78
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
 #. 140
 #: ../navit/country.c:79
 msgid "Central African Republic"
@@ -222,6 +556,11 @@ msgstr "瑞士"
 msgid "Cote d'Ivoire"
 msgstr "象牙海岸"
 
+#. 184
+#: ../navit/country.c:83
+msgid "Cook Islands"
+msgstr ""
+
 #. 152
 #: ../navit/country.c:84
 msgid "Chile"
@@ -242,11 +581,21 @@ msgstr "中國"
 msgid "Colombia"
 msgstr "哥倫比亞"
 
+#. 188
+#: ../navit/country.c:88
+msgid "Costa Rica"
+msgstr ""
+
 #. 192
 #: ../navit/country.c:89
 msgid "Cuba"
 msgstr "古巴"
 
+#. 132
+#: ../navit/country.c:90
+msgid "Cape Verde"
+msgstr ""
+
 #. 162
 #: ../navit/country.c:91
 msgid "Christmas Island"
@@ -267,11 +616,26 @@ msgstr "捷克共和國"
 msgid "Germany"
 msgstr "德國"
 
+#. 262
+#: ../navit/country.c:95
+msgid "Djibouti"
+msgstr ""
+
 #. 208
 #: ../navit/country.c:96
 msgid "Denmark"
 msgstr "丹麥"
 
+#. 212
+#: ../navit/country.c:97
+msgid "Dominica"
+msgstr ""
+
+#. 214
+#: ../navit/country.c:98
+msgid "Dominican Republic"
+msgstr ""
+
 #. 012
 #: ../navit/country.c:99
 msgid "Algeria"
@@ -292,6 +656,16 @@ msgstr "爱尔沙尼亚"
 msgid "Egypt"
 msgstr "埃及"
 
+#. 732
+#: ../navit/country.c:103
+msgid "Western Sahara"
+msgstr ""
+
+#. 232
+#: ../navit/country.c:104
+msgid "Eritrea"
+msgstr ""
+
 #. 724
 #: ../navit/country.c:105
 msgid "Spain"
@@ -312,6 +686,21 @@ msgstr "芬蘭"
 msgid "Fiji"
 msgstr "斐濟群島"
 
+#. 238
+#: ../navit/country.c:109
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#. 583
+#: ../navit/country.c:110
+msgid "Micronesia, Federated States of"
+msgstr ""
+
+#. 234
+#: ../navit/country.c:111
+msgid "Faroe Islands"
+msgstr ""
+
 #. 250
 #: ../navit/country.c:112
 msgid "France"
@@ -337,6 +726,21 @@ msgstr "格林纳达"
 msgid "Georgia"
 msgstr "喬治亞州"
 
+#. 254
+#: ../navit/country.c:117
+msgid "French Guiana"
+msgstr ""
+
+#. 831
+#: ../navit/country.c:118
+msgid "Guernsey"
+msgstr ""
+
+#. 288
+#: ../navit/country.c:119
+msgid "Ghana"
+msgstr ""
+
 #. 292
 #: ../navit/country.c:120
 msgid "Gibraltar"
@@ -357,16 +761,61 @@ msgstr "岡比亞"
 msgid "Guinea"
 msgstr "几内亚"
 
+#. 312
+#: ../navit/country.c:124
+msgid "Guadeloupe"
+msgstr ""
+
+#. 226
+#: ../navit/country.c:125
+msgid "Equatorial Guinea"
+msgstr ""
+
 #. 300
 #: ../navit/country.c:126
 msgid "Greece"
 msgstr "希腊"
 
+#. 239
+#: ../navit/country.c:127
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. 320
+#: ../navit/country.c:128
+msgid "Guatemala"
+msgstr ""
+
+#. 316
+#: ../navit/country.c:129
+msgid "Guam"
+msgstr ""
+
+#. 624
+#: ../navit/country.c:130
+msgid "Guinea-Bissau"
+msgstr ""
+
+#. 328
+#: ../navit/country.c:131
+msgid "Guyana"
+msgstr ""
+
 #. 344
 #: ../navit/country.c:132
 msgid "Hong Kong"
 msgstr "香港"
 
+#. 334
+#: ../navit/country.c:133
+msgid "Heard Island and McDonald Islands"
+msgstr ""
+
+#. 340
+#: ../navit/country.c:134
+msgid "Honduras"
+msgstr ""
+
 #. 191
 #: ../navit/country.c:135
 msgid "Croatia"
@@ -377,6 +826,16 @@ msgstr "克羅地亞"
 msgid "Haiti"
 msgstr "海地"
 
+#. 348
+#: ../navit/country.c:137
+msgid "Hungary"
+msgstr ""
+
+#. 360
+#: ../navit/country.c:138
+msgid "Indonesia"
+msgstr ""
+
 #. 372
 #: ../navit/country.c:139
 msgid "Ireland"
@@ -387,11 +846,21 @@ msgstr "愛爾蘭"
 msgid "Israel"
 msgstr "以色列"
 
+#. 833
+#: ../navit/country.c:141
+msgid "Isle of Man"
+msgstr ""
+
 #. 356
 #: ../navit/country.c:142
 msgid "India"
 msgstr "印度"
 
+#. 086
+#: ../navit/country.c:143
+msgid "British Indian Ocean Territory"
+msgstr ""
+
 #. 368
 #: ../navit/country.c:144
 msgid "Iraq"
@@ -412,6 +881,11 @@ msgstr "冰島"
 msgid "Italy"
 msgstr "意大利"
 
+#. 832
+#: ../navit/country.c:148
+msgid "Jersey"
+msgstr ""
+
 #. 388
 #: ../navit/country.c:149
 msgid "Jamaica"
@@ -432,21 +906,51 @@ msgstr "日本"
 msgid "Kenya"
 msgstr "肯尼亞"
 
+#. 417
+#: ../navit/country.c:153
+msgid "Kyrgyzstan"
+msgstr ""
+
 #. 116
 #: ../navit/country.c:154
 msgid "Cambodia"
 msgstr "柬埔寨"
 
+#. 296
+#: ../navit/country.c:155
+msgid "Kiribati"
+msgstr ""
+
+#. 174
+#: ../navit/country.c:156
+msgid "Comoros"
+msgstr ""
+
+#. 659
+#: ../navit/country.c:157
+msgid "Saint Kitts and Nevis"
+msgstr ""
+
 #. 408
 #: ../navit/country.c:158
 msgid "Korea, Democratic People's Republic of"
 msgstr "北朝鲜"
 
+#. 410
+#: ../navit/country.c:159
+msgid "Korea, Republic of"
+msgstr ""
+
 #. 414
 #: ../navit/country.c:160
 msgid "Kuwait"
 msgstr "科威特"
 
+#. 136
+#: ../navit/country.c:161
+msgid "Cayman Islands"
+msgstr ""
+
 #. 398
 #: ../navit/country.c:162
 msgid "Kazakhstan"
@@ -462,6 +966,11 @@ msgstr "老撾"
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
+#. 662
+#: ../navit/country.c:165
+msgid "Saint Lucia"
+msgstr ""
+
 #. 438
 #: ../navit/country.c:166
 msgid "Liechtenstein"
@@ -472,6 +981,16 @@ msgstr "列支敦士登"
 msgid "Sri Lanka"
 msgstr "斯里蘭卡"
 
+#. 430
+#: ../navit/country.c:168
+msgid "Liberia"
+msgstr ""
+
+#. 426
+#: ../navit/country.c:169
+msgid "Lesotho"
+msgstr ""
+
 #. 440
 #: ../navit/country.c:170
 msgid "Lithuania"
@@ -482,6 +1001,16 @@ msgstr "立陶宛"
 msgid "Luxembourg"
 msgstr "卢森堡"
 
+#. 428
+#: ../navit/country.c:172
+msgid "Latvia"
+msgstr ""
+
+#. 434
+#: ../navit/country.c:173
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
 #. 504
 #: ../navit/country.c:174
 msgid "Morocco"
@@ -492,11 +1021,36 @@ msgstr "摩洛哥"
 msgid "Monaco"
 msgstr "摩納哥"
 
+#. 498
+#: ../navit/country.c:176
+msgid "Moldova, Republic of"
+msgstr ""
+
+#. 499
+#: ../navit/country.c:177
+msgid "Montenegro"
+msgstr ""
+
+#. 663
+#: ../navit/country.c:178
+msgid "Saint Martin (French part)"
+msgstr ""
+
 #. 450
 #: ../navit/country.c:179
 msgid "Madagascar"
 msgstr "馬達加斯加"
 
+#. 584
+#: ../navit/country.c:180
+msgid "Marshall Islands"
+msgstr ""
+
+#. 807
+#: ../navit/country.c:181
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
 #. 466
 #: ../navit/country.c:182
 msgid "Mali"
@@ -517,6 +1071,26 @@ msgstr "蒙古"
 msgid "Macao"
 msgstr "澳門"
 
+#. 580
+#: ../navit/country.c:186
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. 474
+#: ../navit/country.c:187
+msgid "Martinique"
+msgstr ""
+
+#. 478
+#: ../navit/country.c:188
+msgid "Mauritania"
+msgstr ""
+
+#. 500
+#: ../navit/country.c:189
+msgid "Montserrat"
+msgstr ""
+
 #. 470
 #: ../navit/country.c:190
 msgid "Malta"
@@ -532,6 +1106,11 @@ msgstr "毛里求斯"
 msgid "Maldives"
 msgstr "马尔代夫"
 
+#. 454
+#: ../navit/country.c:193
+msgid "Malawi"
+msgstr ""
+
 #. 484
 #: ../navit/country.c:194
 msgid "Mexico"
@@ -542,16 +1121,31 @@ msgstr "墨西哥"
 msgid "Malaysia"
 msgstr "马來西亚"
 
+#. 508
+#: ../navit/country.c:196
+msgid "Mozambique"
+msgstr ""
+
 #. 516
 #: ../navit/country.c:197
 msgid "Namibia"
 msgstr "纳米比亚"
 
+#. 540
+#: ../navit/country.c:198
+msgid "New Caledonia"
+msgstr ""
+
 #. 562
 #: ../navit/country.c:199
 msgid "Niger"
 msgstr "尼日尔"
 
+#. 574
+#: ../navit/country.c:200
+msgid "Norfolk Island"
+msgstr ""
+
 #. 566
 #: ../navit/country.c:201
 msgid "Nigeria"
@@ -577,6 +1171,16 @@ msgstr "挪威"
 msgid "Nepal"
 msgstr "尼泊尔"
 
+#. 520
+#: ../navit/country.c:206
+msgid "Nauru"
+msgstr ""
+
+#. 570
+#: ../navit/country.c:207
+msgid "Niue"
+msgstr ""
+
 #. 554
 #: ../navit/country.c:208
 msgid "New Zealand"
@@ -597,6 +1201,16 @@ msgstr "巴拿馬"
 msgid "Peru"
 msgstr "秘魯"
 
+#. 258
+#: ../navit/country.c:212
+msgid "French Polynesia"
+msgstr ""
+
+#. 598
+#: ../navit/country.c:213
+msgid "Papua New Guinea"
+msgstr ""
+
 #. 608
 #: ../navit/country.c:214
 msgid "Philippines"
@@ -612,16 +1226,36 @@ msgstr "巴基斯坦"
 msgid "Poland"
 msgstr "波兰"
 
+#. 666
+#: ../navit/country.c:217
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. 612
+#: ../navit/country.c:218
+msgid "Pitcairn"
+msgstr ""
+
 #. 630
 #: ../navit/country.c:219
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
+#. 275
+#: ../navit/country.c:220
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
 #. 620
 #: ../navit/country.c:221
 msgid "Portugal"
 msgstr "葡萄牙"
 
+#. 585
+#: ../navit/country.c:222
+msgid "Palau"
+msgstr ""
+
 #. 600
 #: ../navit/country.c:223
 msgid "Paraguay"
@@ -632,6 +1266,11 @@ msgstr "巴拉圭"
 msgid "Qatar"
 msgstr "卡塔尔"
 
+#. 638
+#: ../navit/country.c:225
+msgid "Reunion"
+msgstr ""
+
 #. 642
 #: ../navit/country.c:226
 msgid "Romania"
@@ -662,6 +1301,11 @@ msgstr "沙特阿拉伯"
 msgid "Solomon Islands"
 msgstr "所罗门群島"
 
+#. 690
+#: ../navit/country.c:232
+msgid "Seychelles"
+msgstr ""
+
 #. 736
 #: ../navit/country.c:233
 msgid "Sudan"
@@ -677,11 +1321,21 @@ msgstr "瑞典"
 msgid "Singapore"
 msgstr "新加坡"
 
+#. 654
+#: ../navit/country.c:236
+msgid "Saint Helena"
+msgstr ""
+
 #. 705
 #: ../navit/country.c:237
 msgid "Slovenia"
 msgstr "斯洛文尼亞"
 
+#. 744
+#: ../navit/country.c:238
+msgid "Svalbard and Jan Mayen"
+msgstr ""
+
 #. 703
 #: ../navit/country.c:239
 msgid "Slovakia"
@@ -692,21 +1346,61 @@ msgstr "斯洛伐克"
 msgid "Sierra Leone"
 msgstr "塞拉利昂"
 
+#. 674
+#: ../navit/country.c:241
+msgid "San Marino"
+msgstr ""
+
+#. 686
+#: ../navit/country.c:242
+msgid "Senegal"
+msgstr ""
+
 #. 706
 #: ../navit/country.c:243
 msgid "Somalia"
 msgstr "索馬里"
 
+#. 740
+#: ../navit/country.c:244
+msgid "Suriname"
+msgstr ""
+
+#. 678
+#: ../navit/country.c:245
+msgid "Sao Tome and Principe"
+msgstr ""
+
+#. 222
+#: ../navit/country.c:246
+msgid "El Salvador"
+msgstr ""
+
+#. 760
+#: ../navit/country.c:247
+msgid "Syrian Arab Republic"
+msgstr ""
+
 #. 748
 #: ../navit/country.c:248
 msgid "Swaziland"
 msgstr "斯威士兰"
 
+#. 796
+#: ../navit/country.c:249
+msgid "Turks and Caicos Islands"
+msgstr ""
+
 #. 148
 #: ../navit/country.c:250
 msgid "Chad"
 msgstr "乍得"
 
+#. 260
+#: ../navit/country.c:251
+msgid "French Southern Territories"
+msgstr ""
+
 #. 768
 #: ../navit/country.c:252
 msgid "Togo"
@@ -722,6 +1416,11 @@ msgstr "泰國"
 msgid "Tajikistan"
 msgstr "塔吉克斯坦"
 
+#. 772
+#: ../navit/country.c:255
+msgid "Tokelau"
+msgstr ""
+
 #. 626
 #: ../navit/country.c:256
 msgid "Timor-Leste"
@@ -747,6 +1446,16 @@ msgstr "汤加"
 msgid "Turkey"
 msgstr "土耳其"
 
+#. 780
+#: ../navit/country.c:261
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. 798
+#: ../navit/country.c:262
+msgid "Tuvalu"
+msgstr ""
+
 #. 158
 #: ../navit/country.c:263
 msgid "Taiwan, Province of China"
@@ -767,6 +1476,11 @@ msgstr "乌克兰"
 msgid "Uganda"
 msgstr "乌干达"
 
+#. 581
+#: ../navit/country.c:267
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
 #. 840
 #: ../navit/country.c:268
 msgid "United States"
@@ -787,16 +1501,41 @@ msgstr "乌兹别克斯坦"
 msgid "Holy See (Vatican City State)"
 msgstr "梵蒂岡"
 
+#. 670
+#: ../navit/country.c:272
+msgid "Saint Vincent and the Grenadines"
+msgstr ""
+
 #. 862
 #: ../navit/country.c:273
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
+#. 092
+#: ../navit/country.c:274
+msgid "Virgin Islands, British"
+msgstr ""
+
+#. 850
+#: ../navit/country.c:275
+msgid "Virgin Islands, U.S."
+msgstr ""
+
 #. 704
 #: ../navit/country.c:276
 msgid "Viet Nam"
 msgstr "越南"
 
+#. 548
+#: ../navit/country.c:277
+msgid "Vanuatu"
+msgstr ""
+
+#. 876
+#: ../navit/country.c:278
+msgid "Wallis and Futuna"
+msgstr ""
+
 #. 882
 #: ../navit/country.c:279
 msgid "Samoa"
@@ -807,6 +1546,11 @@ msgstr "Samoa (薩摩亞)"
 msgid "Yemen"
 msgstr "也门"
 
+#. 175
+#: ../navit/country.c:281
+msgid "Mayotte"
+msgstr ""
+
 #. 710
 #: ../navit/country.c:282
 msgid "South Africa"
@@ -822,16 +1566,38 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
+#: ../navit/country.c:285
+msgid "* Unknown, add is_in tags to those cities"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
+#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
+msgid "Car"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso2"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:127
+msgid "Iso3"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
-#: ../navit/gui/internal/gui_internal.c:2756
+#: ../navit/gui/internal/gui_internal.c:2865
 msgid "Country"
 msgstr "国家"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
-#: ../navit/gui/internal/gui_internal.c:2735
-#: ../navit/gui/internal/gui_internal.c:2764
-#: ../navit/gui/internal/gui_internal.c:2899
+msgid "Postal"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
+#: ../navit/gui/gtk/destination.c:130
+#: ../navit/gui/internal/gui_internal.c:2844
+#: ../navit/gui/internal/gui_internal.c:2873
+#: ../navit/gui/internal/gui_internal.c:3008
 msgid "Town"
 msgstr "城镇"
 
@@ -842,8 +1608,8 @@ msgstr "行政区"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
-#: ../navit/gui/internal/gui_internal.c:2716
-#: ../navit/gui/internal/gui_internal.c:2725
+#: ../navit/gui/internal/gui_internal.c:2825
+#: ../navit/gui/internal/gui_internal.c:2834
 msgid "Street"
 msgstr "街"
 
@@ -863,6 +1629,14 @@ msgstr "邮政编码"
 msgid "City"
 msgstr "城市"
 
+#: ../navit/gui/gtk/destination.c:443
+msgid "District/Township"
+msgstr ""
+
+#: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
+msgid "Map"
+msgstr ""
+
 #: ../navit/gui/gtk/destination.c:472
 msgid "Bookmark"
 msgstr "书签"
@@ -872,12 +1646,13 @@ msgid "Destination"
 msgstr "目的地"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196
-#: ../navit/gui/internal/gui_internal.c:2820
-#: ../navit/gui/internal/gui_internal.c:3113
+#: ../navit/gui/internal/gui_internal.c:2929
+#: ../navit/gui/internal/gui_internal.c:3222
 msgid "Display"
 msgstr "显示"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197
+#: ../navit/gui/internal/gui_internal.c:4654
 msgid "Route"
 msgstr "路"
 
@@ -885,13 +1660,25 @@ msgstr "路"
 msgid "Former Destinations"
 msgstr "前一个目的地"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:199
+#: ../navit/gui/internal/gui_internal.c:2225
+#: ../navit/gui/internal/gui_internal.c:2984
+msgid "Bookmarks"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:201
+#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2931
+msgid "Layout"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
 msgstr "投影"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
-#: ../navit/gui/internal/gui_internal.c:3056
-#: ../navit/gui/internal/gui_internal.c:3121
+#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3230
 msgid "Vehicle"
 msgstr "机动车"
 
@@ -903,6 +1690,10 @@ msgstr "放大"
 msgid "ZoomIn"
 msgstr "缩小"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:206
+msgid "Recalculate"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
 msgstr "信息"
@@ -923,11 +1714,28 @@ msgstr "退出"
 msgid "Cursor"
 msgstr "游标"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:223
+msgid "Lock on Road"
+msgstr ""
+
+#: ../navit/gui/gtk/gui_gtk_action.c:224
+#: ../navit/gui/internal/gui_internal.c:3204
+msgid "Northing"
+msgstr ""
+
+#: ../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:2832
+#: ../navit/gui/internal/gui_internal.c:2941
 msgid "Fullscreen"
 msgstr "全屏"
 
+#: ../navit/gui/gtk/gui_gtk_action.c:238
+msgid "Data"
+msgstr ""
+
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "N"
@@ -968,815 +1776,17 @@ msgstr "西"
 msgid "NW"
 msgstr "北偏西"
 
-#: ../navit/main.c:231
-#, c-format
-msgid "Running from source directory\n"
-msgstr ""
-
-#: ../navit/main.c:263
-#, c-format
-msgid "setting '%s' to '%s'\n"
-msgstr ""
-
-#: ../navit/navigation.c:240
-msgid "zeroth"
-msgstr ""
-
-#: ../navit/navigation.c:242
-msgid "first"
-msgstr ""
-
-#: ../navit/navigation.c:244
-msgid "second"
-msgstr ""
-
-#: ../navit/navigation.c:246
-msgid "third"
-msgstr ""
-
-#: ../navit/navigation.c:248
-msgid "fourth"
-msgstr ""
-
-#: ../navit/navigation.c:250
-msgid "fifth"
-msgstr ""
-
-#: ../navit/navigation.c:252
-msgid "sixth"
-msgstr ""
-
-#: ../navit/navigation.c:263
-msgid "zeroth exit"
-msgstr ""
-
-#: ../navit/navigation.c:265
-msgid "first exit"
-msgstr ""
-
-#: ../navit/navigation.c:267
-msgid "second exit"
-msgstr ""
-
-#: ../navit/navigation.c:269
-msgid "third exit"
-msgstr ""
-
-#: ../navit/navigation.c:271
-msgid "fourth exit"
-msgstr ""
-
-#: ../navit/navigation.c:273
-msgid "fifth exit"
-msgstr ""
-
-#: ../navit/navigation.c:275
-msgid "sixth exit"
-msgstr ""
-
-#: ../navit/navigation.c:316
-#, c-format
-msgid "%d m"
-msgstr ""
-
-#: ../navit/navigation.c:318
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#: ../navit/navigation.c:322
-#, c-format
-msgid "%d meters"
-msgstr ""
-
-#: ../navit/navigation.c:324
-#, c-format
-msgid "in %d meters"
-msgstr ""
-
-#: ../navit/navigation.c:330
-#, c-format
-msgid "%d.%d kilometer"
-msgstr ""
-
-#: ../navit/navigation.c:332
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr ""
-
-#: ../navit/navigation.c:336
-#, c-format
-msgid "one kilometer"
-msgid_plural "%d kilometers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../navit/navigation.c:338
-#, c-format
-msgid "in one kilometer"
-msgid_plural "in %d kilometers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../navit/navigation.c:1270
-msgid "into the ramp"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
-#: ../navit/navigation.c:1300
-#, c-format
-msgid "%sinto the street %s%s%s"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1304
-#, c-format
-msgid "%sinto the %s%s%s|male form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1308
-#, c-format
-msgid "%sinto the %s%s%s|female form"
-msgstr ""
-
-#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
-#: ../navit/navigation.c:1312
-#, c-format
-msgid "%sinto the %s%s%s|neutral form"
-msgstr ""
-
-#. TRANSLATORS: gives the name of the next road to turn into (into the E17)
-#: ../navit/navigation.c:1319
-#, c-format
-msgid "%sinto the %s"
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1391
-msgid "strongly "
-msgstr ""
-
-#. TRANSLATORS: Don't forget the ending space
-#: ../navit/navigation.c:1395
-msgid "unknown "
-msgstr ""
-
-#: ../navit/navigation.c:1402
-msgid "When possible, please turn around"
-msgstr ""
-
-#: ../navit/navigation.c:1412
-msgid "Enter the roundabout soon"
-msgstr ""
-
-#. TRANSLATORS: %s is the distance to the roundabout
-#: ../navit/navigation.c:1416
-#, c-format
-msgid "In %s, enter the roundabout"
-msgstr ""
-
-#: ../navit/navigation.c:1431
-#, c-format
-msgid "Leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1434
-#, c-format
-msgid "then leave the roundabout at the %s"
-msgstr ""
-
-#: ../navit/navigation.c:1448
-msgid "soon"
-msgstr ""
-
-#. TRANSLATORS: First argument is the how manieth street to take, second the direction
-#: ../navit/navigation.c:1458
-#, c-format
-msgid "Take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1461 ../navit/navigation.c:1475
-#, c-format
-msgid "after %i roads"
-msgstr ""
-
-#: ../navit/navigation.c:1472
-#, c-format
-msgid "then take the %1$s road to the %2$s"
-msgstr ""
-
-#: ../navit/navigation.c:1483
-msgid "error"
-msgstr ""
-
-#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
-#: ../navit/navigation.c:1516
-#, c-format
-msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
-
-#: ../navit/navigation.c:1521
-#, c-format
-msgid "You have reached your destination %s"
-msgstr ""
-
-#: ../navit/navigation.c:1523
-msgid "then you have reached your destination."
-msgstr ""
-
-#: ../navit/navit.c:1164
-msgid "Position"
-msgstr ""
-
-#: ../navit/navit.c:1183
-msgid "Time"
-msgstr ""
-
-#: ../navit/navit.c:1241 ../navit/gui/gtk/gui_gtk_action.c:225
-msgid "Roadbook"
-msgstr ""
-
-#: ../navit/popup.c:282
-#, c-format
-msgid "Point 0x%x 0x%x"
-msgstr ""
-
-#: ../navit/popup.c:283
-#, c-format
-msgid "Screen coord : %d %d"
-msgstr ""
-
-#. 530
-#: ../navit/country.c:46
-msgid "Netherlands Antilles"
-msgstr ""
-
-#. 010
-#: ../navit/country.c:48
-msgid "Antarctica"
-msgstr ""
-
-#. 016
-#: ../navit/country.c:50
-msgid "American Samoa"
-msgstr ""
-
-#. 533
-#: ../navit/country.c:53
-msgid "Aruba"
-msgstr ""
-
-#. 248
-#: ../navit/country.c:54
-msgid "Aland Islands"
-msgstr ""
-
-#. 031
-#: ../navit/country.c:55
-msgid "Azerbaijan"
-msgstr ""
-
-#. 070
-#: ../navit/country.c:56
-msgid "Bosnia and Herzegovina"
-msgstr ""
-
-#. 052
-#: ../navit/country.c:57
-msgid "Barbados"
-msgstr ""
-
-#. 854
-#: ../navit/country.c:60
-msgid "Burkina Faso"
-msgstr ""
-
-#. 108
-#: ../navit/country.c:63
-msgid "Burundi"
-msgstr ""
-
-#. 204
-#: ../navit/country.c:64
-msgid "Benin"
-msgstr ""
-
-#. 652
-#: ../navit/country.c:65
-msgid "Saint Barthelemy"
-msgstr ""
-
-#. 074
-#: ../navit/country.c:72
-msgid "Bouvet Island"
-msgstr ""
-
-#. 072
-#: ../navit/country.c:73
-msgid "Botswana"
-msgstr ""
-
-#. 112
-#: ../navit/country.c:74
-msgid "Belarus"
-msgstr ""
-
-#. 084
-#: ../navit/country.c:75
-msgid "Belize"
-msgstr ""
-
-#. 166
-#: ../navit/country.c:77
-msgid "Cocos (Keeling) Islands"
-msgstr ""
-
-#. 180
-#: ../navit/country.c:78
-msgid "Congo, Democratic Republic of the"
-msgstr ""
-
-#. 184
-#: ../navit/country.c:83
-msgid "Cook Islands"
-msgstr ""
-
-#. 188
-#: ../navit/country.c:88
-msgid "Costa Rica"
-msgstr ""
-
-#. 132
-#: ../navit/country.c:90
-msgid "Cape Verde"
-msgstr ""
-
-#. 262
-#: ../navit/country.c:95
-msgid "Djibouti"
-msgstr ""
-
-#. 212
-#: ../navit/country.c:97
-msgid "Dominica"
-msgstr ""
-
-#. 214
-#: ../navit/country.c:98
-msgid "Dominican Republic"
-msgstr ""
-
-#. 732
-#: ../navit/country.c:103
-msgid "Western Sahara"
-msgstr ""
-
-#. 232
-#: ../navit/country.c:104
-msgid "Eritrea"
-msgstr ""
-
-#. 238
-#: ../navit/country.c:109
-msgid "Falkland Islands (Malvinas)"
-msgstr ""
-
-#. 583
-#: ../navit/country.c:110
-msgid "Micronesia, Federated States of"
-msgstr ""
-
-#. 234
-#: ../navit/country.c:111
-msgid "Faroe Islands"
-msgstr ""
-
-#. 254
-#: ../navit/country.c:117
-msgid "French Guiana"
-msgstr ""
-
-#. 831
-#: ../navit/country.c:118
-msgid "Guernsey"
-msgstr ""
-
-#. 288
-#: ../navit/country.c:119
-msgid "Ghana"
-msgstr ""
-
-#. 312
-#: ../navit/country.c:124
-msgid "Guadeloupe"
-msgstr ""
-
-#. 226
-#: ../navit/country.c:125
-msgid "Equatorial Guinea"
-msgstr ""
-
-#. 239
-#: ../navit/country.c:127
-msgid "South Georgia and the South Sandwich Islands"
-msgstr ""
-
-#. 320
-#: ../navit/country.c:128
-msgid "Guatemala"
-msgstr ""
-
-#. 316
-#: ../navit/country.c:129
-msgid "Guam"
-msgstr ""
-
-#. 624
-#: ../navit/country.c:130
-msgid "Guinea-Bissau"
-msgstr ""
-
-#. 328
-#: ../navit/country.c:131
-msgid "Guyana"
-msgstr ""
-
-#. 334
-#: ../navit/country.c:133
-msgid "Heard Island and McDonald Islands"
-msgstr ""
-
-#. 340
-#: ../navit/country.c:134
-msgid "Honduras"
-msgstr ""
-
-#. 348
-#: ../navit/country.c:137
-msgid "Hungary"
-msgstr ""
-
-#. 360
-#: ../navit/country.c:138
-msgid "Indonesia"
-msgstr ""
-
-#. 833
-#: ../navit/country.c:141
-msgid "Isle of Man"
-msgstr ""
-
-#. 086
-#: ../navit/country.c:143
-msgid "British Indian Ocean Territory"
-msgstr ""
-
-#. 832
-#: ../navit/country.c:148
-msgid "Jersey"
-msgstr ""
-
-#. 417
-#: ../navit/country.c:153
-msgid "Kyrgyzstan"
-msgstr ""
-
-#. 296
-#: ../navit/country.c:155
-msgid "Kiribati"
-msgstr ""
-
-#. 174
-#: ../navit/country.c:156
-msgid "Comoros"
-msgstr ""
-
-#. 659
-#: ../navit/country.c:157
-msgid "Saint Kitts and Nevis"
-msgstr ""
-
-#. 410
-#: ../navit/country.c:159
-msgid "Korea, Republic of"
-msgstr ""
-
-#. 136
-#: ../navit/country.c:161
-msgid "Cayman Islands"
-msgstr ""
-
-#. 662
-#: ../navit/country.c:165
-msgid "Saint Lucia"
-msgstr ""
-
-#. 430
-#: ../navit/country.c:168
-msgid "Liberia"
-msgstr ""
-
-#. 426
-#: ../navit/country.c:169
-msgid "Lesotho"
-msgstr ""
-
-#. 428
-#: ../navit/country.c:172
-msgid "Latvia"
-msgstr ""
-
-#. 434
-#: ../navit/country.c:173
-msgid "Libyan Arab Jamahiriya"
-msgstr ""
-
-#. 498
-#: ../navit/country.c:176
-msgid "Moldova, Republic of"
-msgstr ""
-
-#. 499
-#: ../navit/country.c:177
-msgid "Montenegro"
-msgstr ""
-
-#. 663
-#: ../navit/country.c:178
-msgid "Saint Martin (French part)"
-msgstr ""
-
-#. 584
-#: ../navit/country.c:180
-msgid "Marshall Islands"
-msgstr ""
-
-#. 807
-#: ../navit/country.c:181
-msgid "Macedonia, the former Yugoslav Republic of"
-msgstr ""
-
-#. 580
-#: ../navit/country.c:186
-msgid "Northern Mariana Islands"
-msgstr ""
-
-#. 474
-#: ../navit/country.c:187
-msgid "Martinique"
-msgstr ""
-
-#. 478
-#: ../navit/country.c:188
-msgid "Mauritania"
-msgstr ""
-
-#. 500
-#: ../navit/country.c:189
-msgid "Montserrat"
-msgstr ""
-
-#. 454
-#: ../navit/country.c:193
-msgid "Malawi"
-msgstr ""
-
-#. 508
-#: ../navit/country.c:196
-msgid "Mozambique"
-msgstr ""
-
-#. 540
-#: ../navit/country.c:198
-msgid "New Caledonia"
-msgstr ""
-
-#. 574
-#: ../navit/country.c:200
-msgid "Norfolk Island"
-msgstr ""
-
-#. 520
-#: ../navit/country.c:206
-msgid "Nauru"
-msgstr ""
-
-#. 570
-#: ../navit/country.c:207
-msgid "Niue"
-msgstr ""
-
-#. 258
-#: ../navit/country.c:212
-msgid "French Polynesia"
-msgstr ""
-
-#. 598
-#: ../navit/country.c:213
-msgid "Papua New Guinea"
-msgstr ""
-
-#. 666
-#: ../navit/country.c:217
-msgid "Saint Pierre and Miquelon"
-msgstr ""
-
-#. 612
-#: ../navit/country.c:218
-msgid "Pitcairn"
-msgstr ""
-
-#. 275
-#: ../navit/country.c:220
-msgid "Palestinian Territory, Occupied"
-msgstr ""
-
-#. 585
-#: ../navit/country.c:222
-msgid "Palau"
-msgstr ""
-
-#. 638
-#: ../navit/country.c:225
-msgid "Reunion"
-msgstr ""
-
-#. 690
-#: ../navit/country.c:232
-msgid "Seychelles"
-msgstr ""
-
-#. 654
-#: ../navit/country.c:236
-msgid "Saint Helena"
-msgstr ""
-
-#. 744
-#: ../navit/country.c:238
-msgid "Svalbard and Jan Mayen"
-msgstr ""
-
-#. 674
-#: ../navit/country.c:241
-msgid "San Marino"
-msgstr ""
-
-#. 686
-#: ../navit/country.c:242
-msgid "Senegal"
-msgstr ""
-
-#. 740
-#: ../navit/country.c:244
-msgid "Suriname"
-msgstr ""
-
-#. 678
-#: ../navit/country.c:245
-msgid "Sao Tome and Principe"
-msgstr ""
-
-#. 222
-#: ../navit/country.c:246
-msgid "El Salvador"
-msgstr ""
-
-#. 760
-#: ../navit/country.c:247
-msgid "Syrian Arab Republic"
-msgstr ""
-
-#. 796
-#: ../navit/country.c:249
-msgid "Turks and Caicos Islands"
-msgstr ""
-
-#. 260
-#: ../navit/country.c:251
-msgid "French Southern Territories"
-msgstr ""
-
-#. 772
-#: ../navit/country.c:255
-msgid "Tokelau"
-msgstr ""
-
-#. 780
-#: ../navit/country.c:261
-msgid "Trinidad and Tobago"
-msgstr ""
-
-#. 798
-#: ../navit/country.c:262
-msgid "Tuvalu"
-msgstr ""
-
-#. 581
-#: ../navit/country.c:267
-msgid "United States Minor Outlying Islands"
-msgstr ""
-
-#. 670
-#: ../navit/country.c:272
-msgid "Saint Vincent and the Grenadines"
-msgstr ""
-
-#. 092
-#: ../navit/country.c:274
-msgid "Virgin Islands, British"
-msgstr ""
-
-#. 850
-#: ../navit/country.c:275
-msgid "Virgin Islands, U.S."
-msgstr ""
-
-#. 548
-#: ../navit/country.c:277
-msgid "Vanuatu"
-msgstr ""
-
-#. 876
-#: ../navit/country.c:278
-msgid "Wallis and Futuna"
-msgstr ""
-
-#. 175
-#: ../navit/country.c:281
-msgid "Mayotte"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
-#: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
-msgid "Car"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127
-msgid "Iso2"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:127
-msgid "Iso3"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
-#: ../navit/gui/gtk/destination.c:130
-msgid "Postal"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:443
-msgid "District/Township"
-msgstr ""
-
-#: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
-msgid "Map"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:199
-#: ../navit/gui/internal/gui_internal.c:2202
-#: ../navit/gui/internal/gui_internal.c:2875
-msgid "Bookmarks"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:201
-#: ../navit/gui/internal/gui_internal.c:2775
-#: ../navit/gui/internal/gui_internal.c:2822
-msgid "Layout"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:206
-msgid "Recalculate"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:223
-msgid "Lock on Road"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:224
-#: ../navit/gui/internal/gui_internal.c:3095
-msgid "Northing"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:226
-msgid "Autozoom"
-msgstr ""
-
-#: ../navit/gui/gtk/gui_gtk_action.c:238
-msgid "Data"
-msgstr ""
-
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75
-#: ../navit/gui/internal/gui_internal.c:2839
+#: ../navit/gui/internal/gui_internal.c:2948
 msgid "2D"
 msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76
-#: ../navit/gui/internal/gui_internal.c:2845
+#: ../navit/gui/internal/gui_internal.c:2954
 msgid "3D"
 msgstr ""
 
@@ -1793,128 +1803,150 @@ msgstr ""
 msgid "Route 0000km  0+00:00 ETA"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1323
+#: ../navit/gui/internal/gui_internal.c:1335
 msgid "Back to map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1332
+#: ../navit/gui/internal/gui_internal.c:1344
 msgid "Main Menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1452
+#: ../navit/gui/internal/gui_internal.c:1461
 msgid "Help"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1602
+#: ../navit/gui/internal/gui_internal.c:1611
 msgid "Back"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:1906
-#: ../navit/gui/internal/gui_internal.c:2111
+#: ../navit/gui/internal/gui_internal.c:1917
+#: ../navit/gui/internal/gui_internal.c:2134
 msgid "POIs"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2068
+#: ../navit/gui/internal/gui_internal.c:2082
 msgid "Streets"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2084
+#: ../navit/gui/internal/gui_internal.c:2090
+msgid "House numbers"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2107
 msgid "View in Browser"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2090
+#: ../navit/gui/internal/gui_internal.c:2113
 msgid "View Attributes"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2125
+#: ../navit/gui/internal/gui_internal.c:2148
 msgid "View on map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2238
+#: ../navit/gui/internal/gui_internal.c:2261
 #, c-format
 msgid "Bookmark %s"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2827
+#: ../navit/gui/internal/gui_internal.c:2809
+#: ../navit/gui/internal/gui_internal.c:2818
+msgid "House number"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:2936
 msgid "Window Mode"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2873
-#: ../navit/gui/internal/gui_internal.c:3161
+#: ../navit/gui/internal/gui_internal.c:2982
+#: ../navit/gui/internal/gui_internal.c:3270
 msgid "Actions"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2884
+#: ../navit/gui/internal/gui_internal.c:2993
 msgid "Map Point"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2894
+#: ../navit/gui/internal/gui_internal.c:3003
 msgid "Vehicle Position"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2903
+#: ../navit/gui/internal/gui_internal.c:3012
 msgid "Quit"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2909
+#: ../navit/gui/internal/gui_internal.c:3018
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2925
-#: ../navit/gui/internal/gui_internal.c:3117
+#: ../navit/gui/internal/gui_internal.c:3034
+#: ../navit/gui/internal/gui_internal.c:3226
 msgid "Maps"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:2969
+#: ../navit/gui/internal/gui_internal.c:3078
 msgid "Show Satellite Status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3003
+#: ../navit/gui/internal/gui_internal.c:3112
 msgid "Show NMEA Data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3027
+#: ../navit/gui/internal/gui_internal.c:3136
 msgid "Set as active"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3033
+#: ../navit/gui/internal/gui_internal.c:3142
 msgid "Show Satellite status"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3039
+#: ../navit/gui/internal/gui_internal.c:3148
 msgid "Show NMEA data"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3081
-#: ../navit/gui/internal/gui_internal.c:3125
+#: ../navit/gui/internal/gui_internal.c:3190
+#: ../navit/gui/internal/gui_internal.c:3234
 msgid "Rules"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3089
+#: ../navit/gui/internal/gui_internal.c:3198
 msgid "Lock on road"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3101
+#: ../navit/gui/internal/gui_internal.c:3210
 msgid "Map follows Vehicle"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3111
-#: ../navit/gui/internal/gui_internal.c:3169
+#: ../navit/gui/internal/gui_internal.c:3220
+#: ../navit/gui/internal/gui_internal.c:3278
 msgid "Settings"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3159
+#: ../navit/gui/internal/gui_internal.c:3268
 msgid "Main menu"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3165
+#: ../navit/gui/internal/gui_internal.c:3274
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
 
-#: ../navit/gui/internal/gui_internal.c:3172
+#: ../navit/gui/internal/gui_internal.c:3281
 msgid "Tools"
 msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:3392
+msgid "Message"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4511
+#: ../navit/gui/internal/gui_internal.c:4659
+msgid "Height Profile"
+msgstr ""
+
+#: ../navit/gui/internal/gui_internal.c:4656
+msgid "Description"
+msgstr ""