Fix:Core:Added new item types from wiki and changed definitions accordingly

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@805 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/po/cs.po b/navit/po/cs.po
index 0c5ffb9..ffc92f0 100644 (file)
--- a/navit/po/cs.po
+++ b/navit/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-09-22 10:34+0200\n"
 "Last-Translator: Vaclav Cerny <vatoz@seznam.cz>\n"
 "Language-Team: Čeština\n"
@@ -145,60 +145,60 @@ msgstr "%s zabočte %s %s"
 msgid "You have reached your destination %s"
 msgstr "Dorazili jste do cíle %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Rozvržení"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Projekce"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 #, fuzzy
 msgid "Former Destinations"
 msgstr "Cíl"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr ""
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr ""
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 #, fuzzy
 msgid "Command"
 msgstr "Polsko"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr ""
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr ""
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 #, fuzzy
 msgid "Destination Length"
 msgstr "Cíl"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 #, fuzzy
 msgid "Destination Time"
 msgstr "Cíl"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Itinerář"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Mapa"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Trasa"
 

diff --git a/navit/po/da.po b/navit/po/da.po
index a95fd03..00d1ed7 100644 (file)
--- a/navit/po/da.po
+++ b/navit/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-15 20:02+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2008-01-15 22:20+0100\n"
 "Last-Translator: Glenn Sommer <glemsom@gmail.com>>\n"
 "Language-Team: Glenn Sommer <glemsom@gmail.com>\n"
@@ -76,7 +76,6 @@ msgid "in %d.%d kilometers"
 msgstr "om %d.%d kilometer"
 
 #: ../src/navigation.c:182
-#, c-format
 #, fuzzy, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
@@ -142,56 +141,56 @@ msgstr "Drej %1$s til %2$s %3$s"
 msgid "You have reached your destination %s"
 msgstr "Du er fremme ved destinationen %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Layout"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Visning"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 msgid "Former Destinations"
 msgstr "Tidligere destinationer"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr "Køretøj"
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 msgid "Command"
 msgstr "Kommando"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr "Længde"
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 msgid "Destination Length"
 msgstr "Længde til destinationen"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 msgid "Destination Time"
 msgstr "Tid til destinationen"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Vejbog"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Kort"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Rute"
 

diff --git a/navit/po/de.po b/navit/po/de.po
index d902b08..a1dac80 100644 (file)
--- a/navit/po/de.po
+++ b/navit/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-07-10 21:53+0200\n"
 "Last-Translator: Martin Schaller <martin-s@sourceforge.net>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
@@ -143,56 +143,56 @@ msgstr "%3$s %1$s%2$s abbiegen"
 msgid "You have reached your destination %s"
 msgstr "%s haben Sie ihr Ziel erreicht"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Layout"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Projektion"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 msgid "Former Destinations"
 msgstr "Frühere Ziele"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr "Fahrzeug"
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 msgid "Command"
 msgstr "Kommando"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr "Länge"
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 msgid "Destination Length"
 msgstr "Länge Ziel"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 msgid "Destination Time"
 msgstr "Zeit Ziel"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Straßenliste"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Karte"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Route"
 

diff --git a/navit/po/es.po b/navit/po/es.po
index d5e199c..23b42c2 100644 (file)
--- a/navit/po/es.po
+++ b/navit/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-07-15 20:44-0600\n"
 "Last-Translator: Esteban Dauksis <edauksis@gmail.com>\n"
 "Language-Team: Chris Eubank <cteubank@gmail.com>\n"
@@ -143,60 +143,60 @@ msgstr "Gire %s%s %s"
 msgid "You have reached your destination %s"
 msgstr "Ha llegado a su destino %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Diseño"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Proyección"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 #, fuzzy
 msgid "Former Destinations"
 msgstr "Destino"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr ""
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr ""
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 #, fuzzy
 msgid "Command"
 msgstr "Polonia"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr ""
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr ""
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 #, fuzzy
 msgid "Destination Length"
 msgstr "Destino"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 #, fuzzy
 msgid "Destination Time"
 msgstr "Destino"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Guía"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Mapa"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Ruta"
 

diff --git a/navit/po/fi.po b/navit/po/fi.po
index 2bdbda3..9b20c2a 100644 (file)
--- a/navit/po/fi.po
+++ b/navit/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-07-10 21:53+0200\n"
 "Last-Translator: Ossi Berg <o.berg@mail.com>\n"
 "Language-Team: Ossi Berg <o.berg@mail.com>\n"
@@ -143,59 +143,59 @@ msgstr "Käänny %3$s %1$s%2$s"
 msgid "You have reached your destination %s"
 msgstr "Olet saavuttanut kohteesi %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Pohja"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Projektio"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 msgid "Former Destinations"
 msgstr "Aiemmat kohteet"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr "Kulkuneuvo"
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 #, fuzzy
 msgid "Command"
 msgstr "Puola"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr ""
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr ""
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 #, fuzzy
 msgid "Destination Length"
 msgstr "Kohde"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 #, fuzzy
 msgid "Destination Time"
 msgstr "Kohde"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Ohjeistaja"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Kartta"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Reitti"
 

diff --git a/navit/po/fr.po b/navit/po/fr.po
index d0b6442..029700d 100644 (file)
--- a/navit/po/fr.po
+++ b/navit/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-12-17 11:36+0100\n"
 "Last-Translator: KaZeR <kazer@altern.org>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
@@ -142,59 +142,59 @@ msgstr "%3$s tournez %1$s%2$s"
 msgid "You have reached your destination %s"
 msgstr "Vous êtes arrivé à votre destination %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Calques"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Projection"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 msgid "Former Destinations"
 msgstr "Destinations précédentes"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr ""
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr ""
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 #, fuzzy
 msgid "Command"
 msgstr "Pologne"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr ""
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr ""
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 #, fuzzy
 msgid "Destination Length"
 msgstr "Destination"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 #, fuzzy
 msgid "Destination Time"
 msgstr "Destination"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Carnet de route"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Carte"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Route"
 

diff --git a/navit/po/it.po b/navit/po/it.po
index d16a0a1..cc41ce6 100644 (file)
--- a/navit/po/it.po
+++ b/navit/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-07-10 21:53+0200\n"
 "Last-Translator: Andrea GHENSI <andrea.ghensi@gmail.com>\n"
 "Language-Team: Andrea GHENSI <andrea.ghensi@gmail.com>\n"
@@ -142,60 +142,60 @@ msgstr "%s, svoltare %s%s"
 msgid "You have reached your destination %s"
 msgstr "Hai raggiunto la destinazione %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Layout"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Proiezione"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 #, fuzzy
 msgid "Former Destinations"
 msgstr "Destinazione"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr ""
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr ""
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 #, fuzzy
 msgid "Command"
 msgstr "Polonia"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr ""
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr ""
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 #, fuzzy
 msgid "Destination Length"
 msgstr "Destinazione"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 #, fuzzy
 msgid "Destination Time"
 msgstr "Destinazione"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Quaderno di viaggio"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Mappa"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Percorso"
 

diff --git a/navit/po/nl.po b/navit/po/nl.po
index 46472f9..5aa07e9 100644 (file)
--- a/navit/po/nl.po
+++ b/navit/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-07-10 21:53+0200\n"
 "Last-Translator: afaber <afaber_at_sourceforge_dot._net>\n"
 "Language-Team: afaber\n"
@@ -144,56 +144,56 @@ msgstr "%3$s %1$s%2$s afslaan"
 msgid "You have reached your destination %s"
 msgstr "%s bestemming bereikt"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Layout"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Projectie"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 msgid "Former Destinations"
 msgstr "Vorige bestemmingen"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr "Voertuig"
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 msgid "Command"
 msgstr "Opdracht"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr "Lengte"
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr "Tijd"
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 msgid "Destination Length"
 msgstr "Afstand"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 msgid "Destination Time"
 msgstr "Aankomsttijd"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Route"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Kaart"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Route"
 

diff --git a/navit/po/no.po b/navit/po/no.po
index cd91c6f..76aae0d 100644 (file)
--- a/navit/po/no.po
+++ b/navit/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-10-30 16:26+0100\n"
 "Last-Translator: Bendik Brenne <bendik@xplore.nu>\n"
 "Language-Team: Bendik Brenne <bendik@xplore.nu>\n"
@@ -142,60 +142,60 @@ msgstr "Sving %s%s %s"
 msgid "You have reached your destination %s"
 msgstr "Du har nådd ditt reisemål %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Layout"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Projeksjon"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 #, fuzzy
 msgid "Former Destinations"
 msgstr "Destinasjon"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr ""
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr ""
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 #, fuzzy
 msgid "Command"
 msgstr "Polen"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr ""
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr ""
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 #, fuzzy
 msgid "Destination Length"
 msgstr "Destinasjon"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 #, fuzzy
 msgid "Destination Time"
 msgstr "Destinasjon"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr "Kjørebok"
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Kart"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Rute"
 

diff --git a/navit/po/pl.po b/navit/po/pl.po
index 7673318..e2b187e 100644 (file)
--- a/navit/po/pl.po
+++ b/navit/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-16 23:15+0100\n"
+"POT-Creation-Date: 2008-01-24 10:49+0100\n"
 "PO-Revision-Date: 2007-07-12 20:12+0100\n"
 "Last-Translator: Michal Madej <mineque@quanteam.pl>\n"
 "Language-Team: Translators\n"
@@ -144,60 +144,60 @@ msgstr "Skręć %s%s %s"
 msgid "You have reached your destination %s"
 msgstr "Dotarłeś do celu %s"
 
-#: ../src/navit.c:652 ../src/gui/gtk/gui_gtk_action.c:198
+#: ../src/navit.c:654 ../src/gui/gtk/gui_gtk_action.c:198
 msgid "Layout"
 msgstr "Układ kolorów"
 
-#: ../src/navit.c:668
+#: ../src/navit.c:670
 msgid "Projection"
 msgstr "Odwzorowanie"
 
-#: ../src/navit.c:723
+#: ../src/navit.c:725
 #, fuzzy
 msgid "Former Destinations"
 msgstr "Cel"
 
-#: ../src/navit.c:733
+#: ../src/navit.c:735
 msgid "Bookmarks"
 msgstr ""
 
-#: ../src/navit.c:771
+#: ../src/navit.c:773
 msgid "Vehicle"
 msgstr ""
 
-#: ../src/navit.c:821
+#: ../src/navit.c:823
 #, fuzzy
 msgid "Command"
 msgstr "Polska"
 
-#: ../src/navit.c:826
+#: ../src/navit.c:828
 msgid "Length"
 msgstr ""
 
-#: ../src/navit.c:832
+#: ../src/navit.c:834
 msgid "Time"
 msgstr ""
 
-#: ../src/navit.c:837
+#: ../src/navit.c:839
 #, fuzzy
 msgid "Destination Length"
 msgstr "Cel"
 
-#: ../src/navit.c:843
+#: ../src/navit.c:845
 #, fuzzy
 msgid "Destination Time"
 msgstr "Cel"
 
-#: ../src/navit.c:866 ../src/gui/gtk/gui_gtk_action.c:202
+#: ../src/navit.c:868 ../src/gui/gtk/gui_gtk_action.c:202
 msgid "Roadbook"
 msgstr ""
 
-#: ../src/navit.c:1099 ../src/gui/gtk/destination.c:368
+#: ../src/navit.c:1101 ../src/gui/gtk/destination.c:368
 #: ../src/gui/gtk/gui_gtk_action.c:197
 msgid "Map"
 msgstr "Mapa"
 
-#: ../src/navit.c:1106 ../src/gui/gtk/gui_gtk_action.c:196
+#: ../src/navit.c:1108 ../src/gui/gtk/gui_gtk_action.c:196
 msgid "Route"
 msgstr "Trasa"
 

diff --git a/navit/src/data/garmin/garmintypes.txt b/navit/src/data/garmin/garmintypes.txt
index be6054c..fd73d37 100644 (file)
--- a/navit/src/data/garmin/garmintypes.txt
+++ b/navit/src/data/garmin/garmintypes.txt
@@ -357,56 +357,56 @@ POLYLINE
 0x2b = NONE, marine_hazard, Marine Hazard (no line)
 
 POLYGONE
-0x01 = town_poly, City (>200k)
-0x02 = town_poly, City (<200k)
-0x03 = town_poly, Village
-0x04 = military_zone, Military
-0x05 = parking_lot_poly, Parking Lot
-0x06 = parking_lot_poly, Parking Garage
-0x07 = airport_poly, Airport
-0x08 = commercial_center, Shopping Center
-0x09 = marine_poly, Marina
-0x0a = university, University/College
-0x0b = hospital_poly, Hospital
-0x0c = industry_poly, Industrial
+0x01 = poly_town, City (>200k)
+0x02 = poly_town, City (<200k)
+0x03 = poly_town, Village
+0x04 = poly_military_zone, Military
+0x05 = poly_car_parking, Parking Lot
+0x06 = poly_car_parking, Parking Garage
+0x07 = poly_airport, Airport
+0x08 = poly_commercial_center, Shopping Center
+0x09 = poly_marine, Marina
+0x0a = poly_university, University/College
+0x0b = poly_hospital, Hospital
+0x0c = poly_industry, Industrial
 0x0d = area, Reservation
-0x0e = airport_poly, Airport Runway
+0x0e = poly_airport, Airport Runway
 0x13 = area_unspecified, Man made area
-0x14 = park_poly, National park
-0x15 = park_poly, National park
-0x16 = park_poly, National park
-0x17 = park_poly, City Park
-0x18 = golf_course, Golf
-0x19 = sport_poly, Sport
-0x1a = cemetery_poly, Cemetery
-0x1e = park_poly, State Park
-0x1f = park_poly, State Park
-0x20 = park_poly, State Park
-0x28 = water_poly, Ocean
-0x29 = water_poly, Water Reservour
-0x32 = water_poly, Sea
-0x3b = water_poly, Water Reservour
-0x3c = water_poly, Lake (250-600 km2)
-0x3d = water_poly, Lake (77-250 km2)
-0x3e = water_poly, Lake (25-77 km2)
-0x3f = water_poly, Lake (11-25 km2)
-0x40 = water_poly, Lake (0.25-11 km2)
-0x41 = water_poly, Lake (<0.25 km2)
-0x42 = water_poly, Lake (>3.3k km2)
-0x43 = water_poly, Lake (1.1-3.3k km2)
-0x44 = water_poly, Lake (0.6-1.1k km2)
-0x45 = water_poly, Water Reservour
-0x46 = water_poly, River (>1km)
-0x47 = water_poly, River (200m-1km)
-0x48 = water_poly, River (40-200m)
-0x49 = water_poly, River (<40m)
+0x14 = poly_park, National park
+0x15 = poly_park, National park
+0x16 = poly_park, National park
+0x17 = poly_park, City Park
+0x18 = poly_golf_course, Golf
+0x19 = poly_sport, Sport
+0x1a = poly_cemetery, Cemetery
+0x1e = poly_park, State Park
+0x1f = poly_park, State Park
+0x20 = poly_park, State Park
+0x28 = poly_water, Ocean
+0x29 = poly_water, Water Reservour
+0x32 = poly_water, Sea
+0x3b = poly_water, Water Reservour
+0x3c = poly_water, Lake (250-600 km2)
+0x3d = poly_water, Lake (77-250 km2)
+0x3e = poly_water, Lake (25-77 km2)
+0x3f = poly_water, Lake (11-25 km2)
+0x40 = poly_water, Lake (0.25-11 km2)
+0x41 = poly_water, Lake (<0.25 km2)
+0x42 = poly_water, Lake (>3.3k km2)
+0x43 = poly_water, Lake (1.1-3.3k km2)
+0x44 = poly_water, Lake (0.6-1.1k km2)
+0x45 = poly_water, Water Reservour
+0x46 = poly_water, River (>1km)
+0x47 = poly_water, River (200m-1km)
+0x48 = poly_water, River (40-200m)
+0x49 = poly_water, River (<40m)
 0x4a = area, Definition Area
 0x4b = area, Background
-0x4c = water_poly, Intermittent River/Lake
-0x4d = water_poly, Glaciers
+0x4c = poly_water, Intermittent River/Lake
+0x4d = poly_water, Glaciers
 0x4e = plantation, Orchard or plantation
-0x4f = scrub, Scrub
-0x50 = wood, Woods
-0x51 = water_poly, Wetland
+0x4f = poly_scrub, Scrub
+0x50 = poly_wood, Woods
+0x51 = poly_water, Wetland
 0x52 = tundra, Tundra
-0x53 = flats, Flats
+0x53 = poly_flats, Flats

diff --git a/navit/src/data/mg/poly.c b/navit/src/data/mg/poly.c
index b51cbe8..6e73f0f 100644 (file)
--- a/navit/src/data/mg/poly.c
+++ b/navit/src/data/mg/poly.c
@@ -119,74 +119,74 @@ poly_get(struct map_rect_priv *mr, struct poly_priv *poly, struct item *item)
                        }
                        switch(poly->type) {
                        case 0x13:
-                               item->type=type_wood;
+                               item->type=type_poly_wood;
                                break;
                        case 0x14:
-                               item->type=type_town_poly;
+                               item->type=type_poly_town;
                                break;
                        case 0x15:
-                               item->type=type_cemetery_poly;
+                               item->type=type_poly_cemetery;
                                break;
                        case 0x16:
-                               item->type=type_building_poly;
+                               item->type=type_poly_building;
                                break;
                        case 0x17:
-                               item->type=type_museum_poly;
+                               item->type=type_poly_museum;
                                break;
                        case 0x19:
-                               item->type=type_place_poly;
+                               item->type=type_poly_place;
                                break;
                        case 0x1b:
-                               item->type=type_commercial_center;
+                               item->type=type_poly_commercial_center;
                                break;
                        case 0x1e:
-                               item->type=type_industry_poly;
+                               item->type=type_poly_industry;
                                break;
                        case 0x23:
                                /* FIXME: what is this ?*/
-                               item->type=type_place_poly;
+                               item->type=type_poly_place;
                                break;
                        case 0x24:
-                               item->type=type_parking_lot_poly;
+                               item->type=type_poly_car_parking;
                                break;
                        case 0x28:
-                               item->type=type_airport_poly;
+                               item->type=type_poly_airport;
                                break;
                        case 0x29:
-                               item->type=type_station_poly;
+                               item->type=type_poly_station;
                                break;
                        case 0x2d:
-                               item->type=type_hospital_poly;
+                               item->type=type_poly_hospital;
                                break;
                        case 0x2e:
-                               item->type=type_hospital_poly;
+                               item->type=type_poly_hospital;
                                break;
                        case 0x2f:
-                               item->type=type_university;
+                               item->type=type_poly_university;
                                break;
                        case 0x30:
-                               item->type=type_university;
+                               item->type=type_poly_university;
                                break;
                        case 0x32:
-                               item->type=type_park_poly;
+                               item->type=type_poly_park;
                                break;
                        case 0x34:
-                               item->type=type_sport_poly;
+                               item->type=type_poly_sport;
                                break;
                        case 0x35:
-                               item->type=type_sport_poly;
+                               item->type=type_poly_sport;
                                break;
                        case 0x37:
-                               item->type=type_golf_course;
+                               item->type=type_poly_golf_course;
                                break;
                        case 0x38:
-                               item->type=type_national_park;
+                               item->type=type_poly_national_park;
                                break;
                        case 0x39:
-                               item->type=type_nature_park;
+                               item->type=type_poly_nature_park;
                                break;
                        case 0x3c:
-                               item->type=type_water_poly;
+                               item->type=type_poly_water;
                                break;
                        case 0xbc:
                                item->type=type_water_line;

diff --git a/navit/src/item_def.h b/navit/src/item_def.h
index 37fac38..c6c5d27 100644 (file)
--- a/navit/src/item_def.h
+++ b/navit/src/item_def.h
@@ -246,36 +246,38 @@ ITEM(roundabout)
 ITEM(rg_segment)
 ITEM(aeroway_runway)
 ITEM(aeroway_taxiway)
+ITEM(street_service)
 /* Area */
 ITEM2(0xc0000000,area)
 ITEM2(0xc0000001,area_unspecified)
-ITEM(wood)
-ITEM(water_poly)
-ITEM(town_poly)
-ITEM(cemetery_poly)
-ITEM(parking_lot_poly)
-ITEM(industry_poly)
-ITEM(airport_poly)
-ITEM(hospital_poly)
-ITEM(park_poly)
-ITEM(sport_poly)
-ITEM(museum_poly)
+ITEM(poly_wood)
+ITEM(poly_water)
+ITEM(poly_town)
+ITEM(poly_cemetery)
+ITEM(poly_car_parking)
+ITEM(poly_industry)
+ITEM(poly_airport)
+ITEM(poly_hospital)
+ITEM(poly_park)
+ITEM(poly_sport)
+ITEM(poly_museum)
 ITEM(image)
 ITEM(image_path)
-ITEM(commercial_center)
-ITEM(golf_course)
-ITEM(university)
-ITEM(national_park)
-ITEM(nature_park)
-ITEM(flats)
-ITEM(scrub)
-ITEM(military_zone)
-ITEM(marine_poly)
+ITEM(poly_commercial_center)
+ITEM(poly_golf_course)
+ITEM(poly_university)
+ITEM(poly_national_park)
+ITEM(poly_nature_park)
+ITEM(poly_flats)
+ITEM(poly_scrub)
+ITEM(poly_military_zone)
+ITEM(poly_marine)
 ITEM(plantation)
 ITEM(tundra)
 ITEM(tile)
 ITEM(submap)
-ITEM(building_poly)
-ITEM(place_poly)
-ITEM(station_poly)
-ITEM(farm_poly)
+ITEM(poly_building)
+ITEM(poly_place)
+ITEM(poly_station)
+ITEM(poly_farm)
+ITEM(poly_sport_tennis)

diff --git a/navit/src/navit.xml b/navit/src/navit.xml
index ac0f029..55ea0f7 100644 (file)
--- a/navit/src/navit.xml
+++ b/navit/src/navit.xml
@@ -72,29 +72,29 @@ Change to your home coordinates.
 
        <layout name="Tag">
                <layer name="sea" details="0">
-                       <item type="wood" order="0-">
+                       <item type="poly_wood" order="0-">
                                <polygon color="#8ec78d" /> 
                        </item>
-                       <item type="town_poly" order="0-">
+                       <item type="poly_town" order="0-">
                                <polygon color="#ffc895" /> 
                                <polyline color="#ebb481" /> 
                        </item>
-                       <item type="water_poly" order="0-">
+                       <item type="poly_water" order="0-">
                                <polygon color="#82c8ea" /> 
                                <polyline color="#5096b8" /> 
                                <label label_size="5" /> 
                        </item>
-                       <item type="park_poly" order="0-">
+                       <item type="poly_park" order="0-">
                                <polygon color="#7cc334" /> 
                                <label label_size="5" /> 
                        </item>
-                       <item type="airport_poly" order="0-">
+                       <item type="poly_airport" order="0-">
                                <polygon color="#a0a0a0" /> 
                        </item>
-                       <item type="sport_poly" order="0-">
+                       <item type="poly_sport" order="0-">
                                <polygon color="#4af04f" /> 
                        </item>
-                       <item type="industry_poly,building_poly,place_poly" order="0-">
+                       <item type="poly_industry,poly_building,poly_place" order="0-">
                                <polygon color="#e6e6e6" /> 
                        </item>
                        <item type="water_line" order="0-">
@@ -896,7 +896,7 @@ Change to your home coordinates.
                        <item type="poi_gc_webcam" order="0-">
                                <icon src="gc_webcam.xpm" />
                        </item>
-                       <item type="flats,scrub,military_zone,marine_poly,plantation,tundra" order="0-">
+                       <item type="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
                                <polygon color="#a0a0a0" />
                                <label label_size="5" /> 
                        </item>

diff --git a/navit/src/osm2navit.c b/navit/src/osm2navit.c
index 004afbb..26c6afa 100644 (file)
--- a/navit/src/osm2navit.c
+++ b/navit/src/osm2navit.c
@@ -101,8 +101,8 @@ static char *attrmap={
        "n      place   town            town_label_2e4\n"
        "n      place   village         town_label_2e3\n"
        "n      place   hamlet          town_label_2e2\n"
-       "w      amenity place_of_worship        building_poly\n"
-       "w      building        glasshouse      building_poly\n"
+       "w      amenity place_of_worship        poly_building\n"
+       "w      building        glasshouse      poly_building\n"
        "w      building\n"
        "w      aeroway runway          aeroway_runway\n"
        "w      aeroway taxiway         aeroway_taxiway\n"
@@ -125,26 +125,26 @@ static char *attrmap={
        "w      highway trunk_link      ramp\n"
        "w      highway motorway        highway_city\n"
        "w      highway motorway_link   ramp\n"
-       "w      historic        town gate       building_poly\n"
-       "w      landuse allotments      wood\n"
-       "w      landuse cemetery        cemetery_poly\n"
-       "w      landuse forest          wood\n"
-       "w      landuse industrial      industry_poly\n"
-       "w      landuse residential     town_poly\n"
-       "w      landuse farm    farm_poly\n"
-       "w      leisure park            park_poly\n"
-       "w      natural wood            wood\n"
-       "w      natural water           water_poly\n"
+       "w      historic        town gate       poly_building\n"
+       "w      landuse allotments      poly_wood\n"
+       "w      landuse cemetery        poly_cemetery\n"
+       "w      landuse forest          poly_wood\n"
+       "w      landuse industrial      poly_industry\n"
+       "w      landuse residential     poly_town\n"
+       "w      landuse farm    poly_farm\n"
+       "w      leisure park            poly_park\n"
+       "w      natural wood            poly_wood\n"
+       "w      natural water           poly_water\n"
        "w      natural coastline       water_line\n"
-       "w      place           suburb          town_poly\n"
-       "w      place           town            town_poly\n"
+       "w      place           suburb          poly_town\n"
+       "w      place           town            poly_town\n"
        "w      power   line    powerline\n"
        "w      railway rail            rail\n"
        "w      railway narrow_gauge    rail\n"
-       "w      railway station         building_poly\n"
+       "w      railway station         poly_building\n"
        "w      railway subway          rail\n"
        "w      railway tram            rail\n"
-       "w      sport   golf    golf_course\n"
+       "w      sport   golf    poly_golf_course\n"
        "w      waterway        canal           water_line\n"
        "w      waterway        river           water_line\n"
        "w      waterway        weir            water_line\n"

diff --git a/navit/src/script/check_itemdef b/navit/src/script/check_itemdef
new file mode 100755 (executable)
index 0000000..361f87b
--- /dev/null
+++ b/navit/src/script/check_itemdef
@@ -0,0 +1,26 @@
+#! /bin/sh
+function check_item
+{
+       grep -q "[(,]$1)" ../item_def.h || echo "$1 missing"
+}
+
+echo osm2navit.c
+egrep '^       "[nw]   +[^     ]+      +[^     ]+      +' ../osm2navit.c | sed "s/.*   //" |
+while read -r x
+do
+       check_item "${x%%\\n\"}"
+done
+
+echo "navit.xml"
+grep '<item type="' <../navit.xml | cut -d \" -f 2 | tr "," "\012" |
+while read -r x
+do
+       check_item "$x"
+done
+
+echo "garmintypes.txt"
+grep ^0x ../data/garmin/garmintypes.txt | sed -e 's/[A-Z][A-Z]*, //' -e 's/.*= \([^,]*\),.*/\1/' |
+while read -r x
+do
+       check_item "$x"
+done