Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Martin S. <mar...@us...> - 2007-12-26 12:01:36
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27144 Modified Files: cs.po de.po es.po fi.po fr.po it.po no.po pl.po Log Message: Fix:Translations:Added missing translations for de Index: it.po =================================================================== RCS file: /cvsroot/navit/navit/po/it.po,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** it.po 24 Dec 2007 20:36:58 -0000 1.11 --- it.po 26 Dec 2007 11:18:22 -0000 1.12 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" *************** *** 90,142 **** msgstr[1] "tra un chilometro" ! #: ../src/navigation.c:398 msgid "right" msgstr "destra" ! #: ../src/navigation.c:405 msgid "left" msgstr "sinistra" ! #: ../src/navigation.c:409 msgid "easily " msgstr "di poco " ! #: ../src/navigation.c:413 msgid "strongly " msgstr "molto " ! #: ../src/navigation.c:416 msgid "unknown " msgstr "sconosciuto " ! #: ../src/navigation.c:422 #, fuzzy msgid "When possible, please turn around" msgstr "Appena possibile, invertire il senso di marcia" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Seguire la strada per i prossimi %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "tra poco" ! #: ../src/navigation.c:439 msgid "now" msgstr "adesso" ! #: ../src/navigation.c:442 msgid "error" msgstr "errore" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%s, svoltare %s%s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 90,142 ---- msgstr[1] "tra un chilometro" ! #: ../src/navigation.c:399 msgid "right" msgstr "destra" ! #: ../src/navigation.c:406 msgid "left" msgstr "sinistra" ! #: ../src/navigation.c:410 msgid "easily " msgstr "di poco " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "molto " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "sconosciuto " ! #: ../src/navigation.c:423 #, fuzzy msgid "When possible, please turn around" msgstr "Appena possibile, invertire il senso di marcia" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Seguire la strada per i prossimi %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "tra poco" ! #: ../src/navigation.c:440 msgid "now" msgstr "adesso" ! #: ../src/navigation.c:443 msgid "error" msgstr "errore" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%s, svoltare %s%s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 164,177 **** msgstr "" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Quaderno di viaggio" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mappa" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Percorso" --- 164,200 ---- msgstr "" ! #: ../src/navit.c:768 ! #, fuzzy ! msgid "Command" ! msgstr "Polonia" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "" ! ! #: ../src/navit.c:783 ! #, fuzzy ! msgid "Destination Length" ! msgstr "Destinazione" ! ! #: ../src/navit.c:788 ! #, fuzzy ! msgid "Destination Time" ! msgstr "Destinazione" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Quaderno di viaggio" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mappa" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Percorso" Index: fr.po =================================================================== RCS file: /cvsroot/navit/navit/po/fr.po,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** fr.po 24 Dec 2007 20:36:58 -0000 1.34 --- fr.po 26 Dec 2007 11:18:22 -0000 1.35 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" *************** *** 91,142 **** msgstr[1] "dans %d kilomètres" ! #: ../src/navigation.c:398 msgid "right" msgstr "à droite" ! #: ../src/navigation.c:405 msgid "left" msgstr "à gauche" ! #: ../src/navigation.c:409 msgid "easily " msgstr "légérement " ! #: ../src/navigation.c:413 msgid "strongly " msgstr "fortement " ! #: ../src/navigation.c:416 msgid "unknown " msgstr "inconnu" ! #: ../src/navigation.c:422 msgid "When possible, please turn around" msgstr "Dès que possible, faites demi-tour" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Suivez la route sur %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "bientôt" ! #: ../src/navigation.c:439 msgid "now" msgstr "maintenant" ! #: ../src/navigation.c:442 msgid "error" msgstr "erreur" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s tournez %1$s%2$s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 91,142 ---- msgstr[1] "dans %d kilomètres" ! #: ../src/navigation.c:399 msgid "right" msgstr "à droite" ! #: ../src/navigation.c:406 msgid "left" msgstr "à gauche" ! #: ../src/navigation.c:410 msgid "easily " msgstr "légérement " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "fortement " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "inconnu" ! #: ../src/navigation.c:423 msgid "When possible, please turn around" msgstr "Dès que possible, faites demi-tour" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Suivez la route sur %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "bientôt" ! #: ../src/navigation.c:440 msgid "now" msgstr "maintenant" ! #: ../src/navigation.c:443 msgid "error" msgstr "erreur" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s tournez %1$s%2$s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 163,176 **** msgstr "" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" --- 163,199 ---- msgstr "" ! #: ../src/navit.c:768 ! #, fuzzy ! msgid "Command" ! msgstr "Pologne" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "" ! ! #: ../src/navit.c:783 ! #, fuzzy ! msgid "Destination Length" ! msgstr "Destination" ! ! #: ../src/navit.c:788 ! #, fuzzy ! msgid "Destination Time" ! msgstr "Destination" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" Index: de.po =================================================================== RCS file: /cvsroot/navit/navit/po/de.po,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** de.po 24 Dec 2007 20:36:58 -0000 1.20 --- de.po 26 Dec 2007 11:18:22 -0000 1.21 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" *************** *** 91,143 **** msgstr[1] "In %d Kilometern" ! #: ../src/navigation.c:398 msgid "right" msgstr "rechts" ! #: ../src/navigation.c:405 msgid "left" msgstr "links" ! #: ../src/navigation.c:409 msgid "easily " msgstr "leicht " ! #: ../src/navigation.c:413 msgid "strongly " msgstr "scharf " ! #: ../src/navigation.c:416 msgid "unknown " msgstr "unbekannt " # ! #: ../src/navigation.c:422 msgid "When possible, please turn around" msgstr "Wenn möglich bitte wenden" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Dem StraÃenverlauf %s folgen" ! #: ../src/navigation.c:433 msgid "soon" msgstr "Demnächst" ! #: ../src/navigation.c:439 msgid "now" msgstr "Jetzt" ! #: ../src/navigation.c:442 msgid "error" msgstr "fehler" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s %1$s%2$s abbiegen" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 91,143 ---- msgstr[1] "In %d Kilometern" ! #: ../src/navigation.c:399 msgid "right" msgstr "rechts" ! #: ../src/navigation.c:406 msgid "left" msgstr "links" ! #: ../src/navigation.c:410 msgid "easily " msgstr "leicht " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "scharf " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "unbekannt " # ! #: ../src/navigation.c:423 msgid "When possible, please turn around" msgstr "Wenn möglich bitte wenden" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Dem StraÃenverlauf %s folgen" ! #: ../src/navigation.c:434 msgid "soon" msgstr "Demnächst" ! #: ../src/navigation.c:440 msgid "now" msgstr "Jetzt" ! #: ../src/navigation.c:443 msgid "error" msgstr "fehler" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%3$s %1$s%2$s abbiegen" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 164,177 **** msgstr "Fahrzeug" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "StraÃenliste" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Karte" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" --- 164,197 ---- msgstr "Fahrzeug" ! #: ../src/navit.c:768 ! msgid "Command" ! msgstr "Kommando" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "Länge" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "Zeit" ! ! #: ../src/navit.c:783 ! msgid "Destination Length" ! msgstr "Länge Ziel" ! ! #: ../src/navit.c:788 ! msgid "Destination Time" ! msgstr "Zeit Ziel" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "StraÃenliste" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Karte" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" Index: es.po =================================================================== RCS file: /cvsroot/navit/navit/po/es.po,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** es.po 24 Dec 2007 20:36:58 -0000 1.10 --- es.po 26 Dec 2007 11:18:22 -0000 1.11 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" "Last-Translator: Esteban Dauksis <eda...@gm...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" "Last-Translator: Esteban Dauksis <eda...@gm...>\n" *************** *** 91,143 **** msgstr[1] "en un kilómetro" ! #: ../src/navigation.c:398 msgid "right" msgstr "derecha" ! #: ../src/navigation.c:405 msgid "left" msgstr "izquerida" ! #: ../src/navigation.c:409 msgid "easily " msgstr "suavemente" ! #: ../src/navigation.c:413 msgid "strongly " msgstr "brúscamente" ! #: ../src/navigation.c:416 msgid "unknown " msgstr "desconocido" ! #: ../src/navigation.c:422 #, fuzzy msgid "When possible, please turn around" msgstr "Cuando sea posible, gire a la" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Continue hasta %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "pronto" ! #: ../src/navigation.c:439 msgid "now" msgstr "ahora" ! #: ../src/navigation.c:442 msgid "error" msgstr "error" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "Gire %s%s %s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 91,143 ---- msgstr[1] "en un kilómetro" ! #: ../src/navigation.c:399 msgid "right" msgstr "derecha" ! #: ../src/navigation.c:406 msgid "left" msgstr "izquerida" ! #: ../src/navigation.c:410 msgid "easily " msgstr "suavemente" ! #: ../src/navigation.c:414 msgid "strongly " msgstr "brúscamente" ! #: ../src/navigation.c:417 msgid "unknown " msgstr "desconocido" ! #: ../src/navigation.c:423 #, fuzzy msgid "When possible, please turn around" msgstr "Cuando sea posible, gire a la" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Continue hasta %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "pronto" ! #: ../src/navigation.c:440 msgid "now" msgstr "ahora" ! #: ../src/navigation.c:443 msgid "error" msgstr "error" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "Gire %s%s %s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 165,178 **** msgstr "" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "GuÃa" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Ruta" --- 165,201 ---- msgstr "" ! #: ../src/navit.c:768 ! #, fuzzy ! msgid "Command" ! msgstr "Polonia" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "" ! ! #: ../src/navit.c:783 ! #, fuzzy ! msgid "Destination Length" ! msgstr "Destino" ! ! #: ../src/navit.c:788 ! #, fuzzy ! msgid "Destination Time" ! msgstr "Destino" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "GuÃa" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Ruta" Index: fi.po =================================================================== RCS file: /cvsroot/navit/navit/po/fi.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fi.po 24 Dec 2007 20:36:58 -0000 1.3 --- fi.po 26 Dec 2007 11:18:22 -0000 1.4 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Ossi Berg <o....@ma...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Ossi Berg <o....@ma...>\n" *************** *** 91,143 **** msgstr[1] "%d kilometrin päästä" ! #: ../src/navigation.c:398 msgid "right" msgstr "vasemmalle" ! #: ../src/navigation.c:405 msgid "left" msgstr "oikealle" ! #: ../src/navigation.c:409 msgid "easily " msgstr "loivasti " ! #: ../src/navigation.c:413 msgid "strongly " msgstr "jyrkästi " ! #: ../src/navigation.c:416 msgid "unknown " msgstr "tuntematon " # ! #: ../src/navigation.c:422 msgid "When possible, please turn around" msgstr "Käänny ympäri" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Seuraa tätä tietä %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "pian" ! #: ../src/navigation.c:439 msgid "now" msgstr "nyt" ! #: ../src/navigation.c:442 msgid "error" msgstr "virhe" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "Käänny %3$s %1$s%2$s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 91,143 ---- msgstr[1] "%d kilometrin päästä" ! #: ../src/navigation.c:399 msgid "right" msgstr "vasemmalle" ! #: ../src/navigation.c:406 msgid "left" msgstr "oikealle" ! #: ../src/navigation.c:410 msgid "easily " msgstr "loivasti " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "jyrkästi " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "tuntematon " # ! #: ../src/navigation.c:423 msgid "When possible, please turn around" msgstr "Käänny ympäri" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Seuraa tätä tietä %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "pian" ! #: ../src/navigation.c:440 msgid "now" msgstr "nyt" ! #: ../src/navigation.c:443 msgid "error" msgstr "virhe" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, c-format msgid "Turn %1$s%2$s %3$s" msgstr "Käänny %3$s %1$s%2$s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 164,177 **** msgstr "Kulkuneuvo" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Ohjeistaja" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Kartta" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Reitti" --- 164,200 ---- msgstr "Kulkuneuvo" ! #: ../src/navit.c:768 ! #, fuzzy ! msgid "Command" ! msgstr "Puola" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "" ! ! #: ../src/navit.c:783 ! #, fuzzy ! msgid "Destination Length" ! msgstr "Kohde" ! ! #: ../src/navit.c:788 ! #, fuzzy ! msgid "Destination Time" ! msgstr "Kohde" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Ohjeistaja" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Kartta" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Reitti" Index: pl.po =================================================================== RCS file: /cvsroot/navit/navit/po/pl.po,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pl.po 24 Dec 2007 20:36:58 -0000 1.10 --- pl.po 26 Dec 2007 11:18:23 -0000 1.11 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" "Last-Translator: Michal Madej <mi...@qu...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" "Last-Translator: Michal Madej <mi...@qu...>\n" *************** *** 92,144 **** msgstr[1] "za kilometr" ! #: ../src/navigation.c:398 msgid "right" msgstr "w prawo" ! #: ../src/navigation.c:405 msgid "left" msgstr "w lewo" ! #: ../src/navigation.c:409 msgid "easily " msgstr "Åatwo" ! #: ../src/navigation.c:413 msgid "strongly " msgstr "silnie" ! #: ../src/navigation.c:416 msgid "unknown " msgstr "nieznane" ! #: ../src/navigation.c:422 #, fuzzy msgid "When possible, please turn around" msgstr "SkrÄÄ gdy bÄdzie możliwoÅÄ" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "PodÄ Å¼aj drogÄ przez nastÄpne %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "wkrótce" ! #: ../src/navigation.c:439 msgid "now" msgstr "teraz" ! #: ../src/navigation.c:442 msgid "error" msgstr "bÅÄ d" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "SkrÄÄ %s%s %s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 92,144 ---- msgstr[1] "za kilometr" ! #: ../src/navigation.c:399 msgid "right" msgstr "w prawo" ! #: ../src/navigation.c:406 msgid "left" msgstr "w lewo" ! #: ../src/navigation.c:410 msgid "easily " msgstr "Åatwo" ! #: ../src/navigation.c:414 msgid "strongly " msgstr "silnie" ! #: ../src/navigation.c:417 msgid "unknown " msgstr "nieznane" ! #: ../src/navigation.c:423 #, fuzzy msgid "When possible, please turn around" msgstr "SkrÄÄ gdy bÄdzie możliwoÅÄ" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "PodÄ Å¼aj drogÄ przez nastÄpne %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "wkrótce" ! #: ../src/navigation.c:440 msgid "now" msgstr "teraz" ! #: ../src/navigation.c:443 msgid "error" msgstr "bÅÄ d" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "SkrÄÄ %s%s %s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 166,179 **** msgstr "" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Trasa" --- 166,202 ---- msgstr "" ! #: ../src/navit.c:768 ! #, fuzzy ! msgid "Command" ! msgstr "Polska" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "" ! ! #: ../src/navit.c:783 ! #, fuzzy ! msgid "Destination Length" ! msgstr "Cel" ! ! #: ../src/navit.c:788 ! #, fuzzy ! msgid "Destination Time" ! msgstr "Cel" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Trasa" Index: no.po =================================================================== RCS file: /cvsroot/navit/navit/po/no.po,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** no.po 24 Dec 2007 20:36:58 -0000 1.12 --- no.po 26 Dec 2007 11:18:23 -0000 1.13 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-10-30 16:26+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-10-30 16:26+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" *************** *** 90,142 **** msgstr[1] "om èn kilometer" ! #: ../src/navigation.c:398 msgid "right" msgstr "høyre" ! #: ../src/navigation.c:405 msgid "left" msgstr "venstre" ! #: ../src/navigation.c:409 msgid "easily " msgstr "slakk " ! #: ../src/navigation.c:413 msgid "strongly " msgstr "skarp " ! #: ../src/navigation.c:416 msgid "unknown " msgstr "ukjent " ! #: ../src/navigation.c:422 #, fuzzy msgid "When possible, please turn around" msgstr "NÃ¥r mulig, vennligst sving" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Følg veien de neste %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "snart" ! #: ../src/navigation.c:439 msgid "now" msgstr "nÃ¥" ! #: ../src/navigation.c:442 msgid "error" msgstr "feil" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "Sving %s%s %s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 90,142 ---- msgstr[1] "om èn kilometer" ! #: ../src/navigation.c:399 msgid "right" msgstr "høyre" ! #: ../src/navigation.c:406 msgid "left" msgstr "venstre" ! #: ../src/navigation.c:410 msgid "easily " msgstr "slakk " ! #: ../src/navigation.c:414 msgid "strongly " msgstr "skarp " ! #: ../src/navigation.c:417 msgid "unknown " msgstr "ukjent " ! #: ../src/navigation.c:423 #, fuzzy msgid "When possible, please turn around" msgstr "NÃ¥r mulig, vennligst sving" ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "Følg veien de neste %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "snart" ! #: ../src/navigation.c:440 msgid "now" msgstr "nÃ¥" ! #: ../src/navigation.c:443 msgid "error" msgstr "feil" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "Sving %s%s %s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 164,177 **** msgstr "" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Kjørebok" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Kart" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Rute" --- 164,200 ---- msgstr "" ! #: ../src/navit.c:768 ! #, fuzzy ! msgid "Command" ! msgstr "Polen" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "" ! ! #: ../src/navit.c:783 ! #, fuzzy ! msgid "Destination Length" ! msgstr "Destinasjon" ! ! #: ../src/navit.c:788 ! #, fuzzy ! msgid "Destination Time" ! msgstr "Destinasjon" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Kjørebok" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Kart" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Rute" Index: cs.po =================================================================== RCS file: /cvsroot/navit/navit/po/cs.po,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cs.po 24 Dec 2007 20:36:58 -0000 1.5 --- cs.po 26 Dec 2007 11:18:21 -0000 1.6 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-09-22 10:34+0200\n" "Last-Translator: Vaclav Cerny <va...@se...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-26 11:26+0100\n" "PO-Revision-Date: 2007-09-22 10:34+0200\n" "Last-Translator: Vaclav Cerny <va...@se...>\n" *************** *** 94,145 **** msgstr[2] "za jeden kilometr " ! #: ../src/navigation.c:398 msgid "right" msgstr "vpravo" ! #: ../src/navigation.c:405 msgid "left" msgstr "vlevo" ! #: ../src/navigation.c:409 msgid "easily " msgstr "mÃrnÄ" ! #: ../src/navigation.c:413 msgid "strongly " msgstr "silnÄ" ! #: ../src/navigation.c:416 msgid "unknown " msgstr "neurÄitÄ" ! #: ../src/navigation.c:422 msgid "When possible, please turn around" msgstr "Až to bude možné, otoÄte se " ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "PokraÄujte po dalÅ¡Ã %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "brzy" ! #: ../src/navigation.c:439 msgid "now" msgstr "nynÃ" ! #: ../src/navigation.c:442 msgid "error" msgstr "chyba" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%s zaboÄte %s %s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" --- 94,145 ---- msgstr[2] "za jeden kilometr " ! #: ../src/navigation.c:399 msgid "right" msgstr "vpravo" ! #: ../src/navigation.c:406 msgid "left" msgstr "vlevo" ! #: ../src/navigation.c:410 msgid "easily " msgstr "mÃrnÄ" ! #: ../src/navigation.c:414 msgid "strongly " msgstr "silnÄ" ! #: ../src/navigation.c:417 msgid "unknown " msgstr "neurÄitÄ" ! #: ../src/navigation.c:423 msgid "When possible, please turn around" msgstr "Až to bude možné, otoÄte se " ! #: ../src/navigation.c:430 #, c-format msgid "Follow the road for the next %s" msgstr "PokraÄujte po dalÅ¡Ã %s" ! #: ../src/navigation.c:434 msgid "soon" msgstr "brzy" ! #: ../src/navigation.c:440 msgid "now" msgstr "nynÃ" ! #: ../src/navigation.c:443 msgid "error" msgstr "chyba" #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:447 #, fuzzy, c-format msgid "Turn %1$s%2$s %3$s" msgstr "%s zaboÄte %s %s" ! #: ../src/navigation.c:450 #, c-format msgid "You have reached your destination %s" *************** *** 167,180 **** msgstr "" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "ItineráÅ" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Trasa" --- 167,203 ---- msgstr "" ! #: ../src/navit.c:768 ! #, fuzzy ! msgid "Command" ! msgstr "Polsko" ! ! #: ../src/navit.c:773 ! msgid "Length" ! msgstr "" ! ! #: ../src/navit.c:778 ! msgid "Time" ! msgstr "" ! ! #: ../src/navit.c:783 ! #, fuzzy ! msgid "Destination Length" ! msgstr "CÃl" ! ! #: ../src/navit.c:788 ! #, fuzzy ! msgid "Destination Time" ! msgstr "CÃl" ! ! #: ../src/navit.c:810 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "ItineráÅ" ! #: ../src/navit.c:1030 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Mapa" ! #: ../src/navit.c:1037 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Trasa" |
|
From: Martin S. <mar...@us...> - 2007-12-26 10:39:46
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8434 Modified Files: attr.c log.c navigation.c popup.c route.c Log Message: Add:Core:Support for position_coord_geo parsing Index: attr.c =================================================================== RCS file: /cvsroot/navit/navit/src/attr.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** attr.c 18 Dec 2007 19:36:56 -0000 1.11 --- attr.c 26 Dec 2007 10:39:48 -0000 1.12 *************** *** 5,8 **** --- 5,10 ---- #include "debug.h" #include "item.h" + #include "coord.h" + #include "transform.h" #include "color.h" #include "attr.h" *************** *** 51,54 **** --- 53,58 ---- enum attr_type attr; struct attr *ret; + struct coord_geo *g; + struct coord c; ret=g_new0(struct attr, 1); *************** *** 60,63 **** --- 64,73 ---- ret->u.item_type=item_from_name(value); break; + case attr_position_coord_geo: + g=g_new(struct coord_geo, 1); + ret->u.coord_geo=g; + coord_parse(value, projection_mg, &c); + transform_to_geo(projection_mg, &c, g); + break; default: if (attr >= attr_type_string_begin && attr <= attr_type_string_end) { *************** *** 149,152 **** --- 159,164 ---- attr_free(struct attr *attr) { + if (attr->type == attr_position_coord_geo) + g_free(attr->u.coord_geo); if (attr->type >= attr_type_color_begin && attr->type <= attr_type_color_end) g_free(attr->u.color); Index: navigation.c =================================================================== RCS file: /cvsroot/navit/navit/src/navigation.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** navigation.c 25 Dec 2007 17:25:37 -0000 1.30 --- navigation.c 26 Dec 2007 10:39:48 -0000 1.31 *************** *** 331,336 **** { dbg(1,"enter %p %p %p\n",old, new, delta); ! if (new->item.type == type_ramp && old && (old->item.type == type_highway_land || old->item.type == type_highway_city)) { ! dbg(1, "maneuver_required: new is ramp from highway: yes\n"); return 1; } --- 331,336 ---- { dbg(1,"enter %p %p %p\n",old, new, delta); ! if (new->item.type != old->item.type && (new->item.type == type_ramp || old->item.type == type_ramp)) { ! dbg(1, "maneuver_required: old or new is ramp\n"); return 1; } Index: route.c =================================================================== RCS file: /cvsroot/navit/navit/src/route.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** route.c 25 Dec 2007 17:25:38 -0000 1.30 --- route.c 26 Dec 2007 10:39:48 -0000 1.31 *************** *** 700,704 **** h->rp=route_path_open(h->route); case 0: ! if (! h->street_data) { seg=route_path_get_segment(h->rp); if (seg) { --- 700,704 ---- h->rp=route_path_open(h->route); case 0: ! if (! h->street_data && h->rp) { seg=route_path_get_segment(h->rp); if (seg) { Index: popup.c =================================================================== RCS file: /cvsroot/navit/navit/src/popup.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** popup.c 18 Dec 2007 12:07:40 -0000 1.19 --- popup.c 26 Dec 2007 10:39:48 -0000 1.20 *************** *** 121,132 **** static void ! popup_show_attr_val(void *menu, struct attr *attr) { char *attr_name=attr_to_name(attr->type); if (attr->type >= attr_type_int_begin && attr->type <= attr_type_int_end) popup_printf(menu, menu_type_menu, "%s: %d", attr_name, attr->u.num); ! else ! popup_printf(menu, menu_type_menu, "%s: %s", attr_name, attr->u.str); } --- 121,136 ---- static void ! popup_show_attr_val(struct map *map, void *menu, struct attr *attr) { char *attr_name=attr_to_name(attr->type); + char *str; if (attr->type >= attr_type_int_begin && attr->type <= attr_type_int_end) popup_printf(menu, menu_type_menu, "%s: %d", attr_name, attr->u.num); ! else { ! str=map_convert_string(map, attr->u.str); ! popup_printf(menu, menu_type_menu, "%s: %s", attr_name, str); ! map_convert_free(str); ! } } *************** *** 144,148 **** static void ! popup_show_attrs(void *menu, struct item *item) { #if 0 --- 148,152 ---- static void ! popup_show_attrs(struct map *map, void *menu, struct item *item) { #if 0 *************** *** 158,162 **** memset(&attr, 0, sizeof(attr)); if (item_attr_get(item, attr_any, &attr)) ! popup_show_attr_val(menu, &attr); else break; --- 162,166 ---- memset(&attr, 0, sizeof(attr)); if (item_attr_get(item, attr_any, &attr)) ! popup_show_attr_val(map, menu, &attr); else break; *************** *** 189,193 **** dbg(1,"item=%p\n", item); if (item) { ! popup_show_attrs(menu_item, item); } map_rect_destroy(mr); --- 193,197 ---- dbg(1,"item=%p\n", item); if (item) { ! popup_show_attrs(item->map, menu_item, item); } map_rect_destroy(mr); Index: log.c =================================================================== RCS file: /cvsroot/navit/navit/src/log.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** log.c 9 Oct 2007 18:14:27 -0000 1.5 --- log.c 26 Dec 2007 10:39:48 -0000 1.6 *************** *** 146,150 **** struct attr *data,*overwrite,*flush_size,*flush_time; ! dbg(0,"enter\n"); data=attr_search(attrs, NULL, attr_data); if (! data) --- 146,150 ---- struct attr *data,*overwrite,*flush_size,*flush_time; ! dbg(1,"enter\n"); data=attr_search(attrs, NULL, attr_data); if (! data) |
|
From: Martin S. <mar...@us...> - 2007-12-26 10:39:46
|
Update of /cvsroot/navit/navit/src/vehicle/demo In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8434/vehicle/demo Modified Files: vehicle_demo.c Log Message: Add:Core:Support for position_coord_geo parsing Index: vehicle_demo.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/demo/vehicle_demo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vehicle_demo.c 25 Dec 2007 21:01:58 -0000 1.4 --- vehicle_demo.c 26 Dec 2007 10:39:48 -0000 1.5 *************** *** 12,15 **** --- 12,16 ---- struct vehicle_priv { int interval; + int position_set; struct callback_list *cbl; struct navit *navit; *************** *** 38,42 **** break; case attr_position_coord_geo: - dbg(1, "coord %f,%f\n", priv->geo.lat, priv->geo.lng); attr->u.coord_geo = &priv->geo; break; --- 39,42 ---- *************** *** 68,73 **** vehicle_demo_timer(struct vehicle_priv *priv) { ! struct route_path_coord_handle *h; ! struct coord *c, *pos, ci; int slen, len, dx, dy; --- 68,73 ---- vehicle_demo_timer(struct vehicle_priv *priv) { ! struct route_path_coord_handle *h=NULL; ! struct coord *c, *pos=NULL, ci; int slen, len, dx, dy; *************** *** 79,95 **** } struct route *vehicle_route = navit_get_route(priv->navit); ! if (!vehicle_route) { ! dbg(1, "navit_get_route NOK\n"); ! return 1; ! } ! ! h = route_path_coord_open(vehicle_route); ! if (!h) { ! dbg(1, "navit_path_coord_open NOK\n"); ! return 1; ! } ! pos = route_path_coord_get(h); dbg(1, "current pos=%p\n", pos); if (pos) { dbg(1, "current pos=0x%x,0x%x\n", pos->x, pos->y); dbg(1, "last pos=0x%x,0x%x\n", priv->last.x, priv->last.y); --- 79,89 ---- } struct route *vehicle_route = navit_get_route(priv->navit); ! if (vehicle_route) ! h = route_path_coord_open(vehicle_route); ! if (h) ! pos = route_path_coord_get(h); dbg(1, "current pos=%p\n", pos); if (pos) { + priv->position_set=0; dbg(1, "current pos=0x%x,0x%x\n", pos->x, pos->y); dbg(1, "last pos=0x%x,0x%x\n", priv->last.x, priv->last.y); *************** *** 123,126 **** --- 117,123 ---- } } + } else { + if (priv->position_set) + callback_list_call_0(priv->cbl); } return 1; *************** *** 135,139 **** { struct vehicle_priv *ret; ! struct attr *interval,*speed; dbg(1, "enter\n"); --- 132,136 ---- { struct vehicle_priv *ret; ! struct attr *interval,*speed,*position_coord_geo; dbg(1, "enter\n"); *************** *** 146,149 **** --- 143,151 ---- if ((interval=attr_search(attrs, NULL, attr_interval))) ret->interval=speed->u.num; + if ((position_coord_geo=attr_search(attrs, NULL, attr_position_coord_geo))) { + ret->geo=*(position_coord_geo->u.coord_geo); + ret->position_set=1; + dbg(0,"position_set %f %f\n", ret->geo.lat, ret->geo.lng); + } *meth = vehicle_demo_methods; g_timeout_add(ret->interval, (GSourceFunc) vehicle_demo_timer, ret); |
|
From: Martin S. <mar...@us...> - 2007-12-25 21:01:56
|
Update of /cvsroot/navit/navit/src/vehicle/demo In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15299/vehicle/demo Modified Files: vehicle_demo.c Log Message: Made interval and speed for demo vehicle configurable Index: vehicle_demo.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/demo/vehicle_demo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vehicle_demo.c 25 Dec 2007 17:25:38 -0000 1.3 --- vehicle_demo.c 25 Dec 2007 21:01:58 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- struct vehicle_priv { + int interval; struct callback_list *cbl; struct navit *navit; *************** *** 71,76 **** int slen, len, dx, dy; ! priv->speed = 40; ! len = priv->speed / 3.6; dbg(1, "###### Entering simulation loop\n"); if (!priv->navit) { --- 72,76 ---- int slen, len, dx, dy; ! len = (priv->speed * priv->interval / 1000)/ 3.6; dbg(1, "###### Entering simulation loop\n"); if (!priv->navit) { *************** *** 135,144 **** { struct vehicle_priv *ret; dbg(1, "enter\n"); ret = g_new0(struct vehicle_priv, 1); ret->cbl = cbl; *meth = vehicle_demo_methods; ! g_timeout_add(1000, (GSourceFunc) vehicle_demo_timer, ret); return ret; } --- 135,151 ---- { struct vehicle_priv *ret; + struct attr *interval,*speed; dbg(1, "enter\n"); ret = g_new0(struct vehicle_priv, 1); ret->cbl = cbl; + ret->interval=1000; + ret->speed=40; + if ((speed=attr_search(attrs, NULL, attr_speed))) + ret->speed=speed->u.num; + if ((interval=attr_search(attrs, NULL, attr_interval))) + ret->interval=speed->u.num; *meth = vehicle_demo_methods; ! g_timeout_add(ret->interval, (GSourceFunc) vehicle_demo_timer, ret); return ret; } |
|
From: Martin S. <mar...@us...> - 2007-12-25 21:01:55
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15299 Modified Files: attr_def.h Log Message: Made interval and speed for demo vehicle configurable Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** attr_def.h 25 Dec 2007 17:25:37 -0000 1.18 --- attr_def.h 25 Dec 2007 21:01:58 -0000 1.19 *************** *** 33,36 **** --- 33,38 ---- ATTR(destination_length) ATTR(destination_time) + ATTR(speed) + ATTR(interval) ATTR2(0x00028000,type_boolean_begin) /* boolean */ |
|
From: Martin S. <mar...@us...> - 2007-12-25 18:46:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12051 Modified Files: vehicle.c Log Message: Added support for gpx logging Index: vehicle.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** vehicle.c 25 Dec 2007 17:25:38 -0000 1.30 --- vehicle.c 25 Dec 2007 18:46:23 -0000 1.31 *************** *** 19,22 **** --- 19,41 ---- static void + vehicle_log_nmea(struct vehicle *this_, struct log *log) + { + } + + static void + vehicle_log_gpx(struct vehicle *this_, struct log *log) + { + struct attr pos_attr; + char buffer[256]; + if (!this_->meth.position_attr_get) + return; + if (!this_->meth.position_attr_get(this_->priv, attr_position_coord_geo, &pos_attr)) + return; + sprintf(buffer,"<trkpt lat=\"%f\" lon=\"%f\" />\n", pos_attr.u.coord_geo->lat, pos_attr.u.coord_geo->lng); + log_write(log, buffer, strlen(buffer)); + } + + + static void vehicle_log_textfile(struct vehicle *this_, struct log *log) { *************** *** 41,59 **** return 1; if (!strcmp(type->u.str, "nmea")) { ! this_->nmea_log = log; } else if (!strcmp(type->u.str, "gpx")) { char *header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<gpx version=\"1.0\" creator=\"Navit http://navit.sourceforge.net\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://www.topografix.com/GPX/1/0\" xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\n<trk>\n<trkseg>\n"; char *trailer = "</trkseg>\n</trk>\n</gpx>\n"; - this_->gpx_log = log; log_set_header(log, header, strlen(header)); log_set_trailer(log, trailer, strlen(trailer)); } else if (!strcmp(type->u.str, "textfile")) { char *header = "type=track\n"; log_set_header(log, header, strlen(header)); cb=callback_new_2(callback_cast(vehicle_log_textfile), this_, log); - callback_list_add(this_->cbl, cb); } else return 1; return 0; } --- 60,78 ---- return 1; if (!strcmp(type->u.str, "nmea")) { ! cb=callback_new_2(callback_cast(vehicle_log_nmea), this_, log); } else if (!strcmp(type->u.str, "gpx")) { char *header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<gpx version=\"1.0\" creator=\"Navit http://navit.sourceforge.net\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://www.topografix.com/GPX/1/0\" xsi:schemaLocation=\"http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd\">\n<trk>\n<trkseg>\n"; char *trailer = "</trkseg>\n</trk>\n</gpx>\n"; log_set_header(log, header, strlen(header)); log_set_trailer(log, trailer, strlen(trailer)); + cb=callback_new_2(callback_cast(vehicle_log_gpx), this_, log); } else if (!strcmp(type->u.str, "textfile")) { char *header = "type=track\n"; log_set_header(log, header, strlen(header)); cb=callback_new_2(callback_cast(vehicle_log_textfile), this_, log); } else return 1; + callback_list_add(this_->cbl, cb); return 0; } |
|
From: Martin S. <mar...@us...> - 2007-12-25 17:25:36
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8338 Modified Files: attr_def.h navigation.c navit.c route.c vehicle.c Log Message: Fixed a few vehicle and navigation related bugs, added textfile logging to vehicle Index: vehicle.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** vehicle.c 18 Dec 2007 22:14:27 -0000 1.29 --- vehicle.c 25 Dec 2007 17:25:38 -0000 1.30 *************** *** 1,4 **** ! #include <glib.h> #include <string.h> #include "config.h" #include "debug.h" --- 1,5 ---- ! #include <stdio.h> #include <string.h> + #include <glib.h> #include "config.h" #include "debug.h" *************** *** 14,20 **** struct vehicle_methods meth; struct callback_list *cbl; ! struct log *nmea_log, *gpx_log, *textfile_log; }; static int vehicle_add_log(struct vehicle *this_, struct log *log, --- 15,34 ---- struct vehicle_methods meth; struct callback_list *cbl; ! struct log *nmea_log, *gpx_log; }; + static void + vehicle_log_textfile(struct vehicle *this_, struct log *log) + { + struct attr pos_attr; + char buffer[256]; + if (!this_->meth.position_attr_get) + return; + if (!this_->meth.position_attr_get(this_->priv, attr_position_coord_geo, &pos_attr)) + return; + sprintf(buffer,"%f %f type=trackpoint\n", pos_attr.u.coord_geo->lng, pos_attr.u.coord_geo->lat); + log_write(log, buffer, strlen(buffer)); + } + static int vehicle_add_log(struct vehicle *this_, struct log *log, *************** *** 22,25 **** --- 36,40 ---- { struct attr *type; + struct callback *cb; type = attr_search(attrs, NULL, attr_type); if (!type) *************** *** 36,41 **** } else if (!strcmp(type->u.str, "textfile")) { char *header = "type=track\n"; - this_->textfile_log = log; log_set_header(log, header, strlen(header)); } else return 1; --- 51,57 ---- } else if (!strcmp(type->u.str, "textfile")) { char *header = "type=track\n"; log_set_header(log, header, strlen(header)); + cb=callback_new_2(callback_cast(vehicle_log_textfile), this_, log); + callback_list_add(this_->cbl, cb); } else return 1; *************** *** 55,59 **** char *type, *colon; ! dbg(0, "enter\n"); source = attr_search(attrs, NULL, attr_source); if (!source) { --- 71,75 ---- char *type, *colon; ! dbg(1, "enter\n"); source = attr_search(attrs, NULL, attr_source); if (!source) { *************** *** 66,70 **** if (colon) *colon = '\0'; ! dbg(0, "source='%s' type='%s'\n", source->u.str, type); vehicletype_new = plugin_get_vehicle_type(type); --- 82,86 ---- if (colon) *colon = '\0'; ! dbg(1, "source='%s' type='%s'\n", source->u.str, type); vehicletype_new = plugin_get_vehicle_type(type); *************** *** 82,86 **** return NULL; } ! dbg(0, "leave\n"); return this_; --- 98,102 ---- return NULL; } ! dbg(1, "leave\n"); return this_; Index: navigation.c =================================================================== RCS file: /cvsroot/navit/navit/src/navigation.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** navigation.c 18 Dec 2007 12:07:40 -0000 1.29 --- navigation.c 25 Dec 2007 17:25:37 -0000 1.30 *************** *** 266,270 **** ret->angle_end=a1; } ! dbg(1,"i=%d a1 %d a2 %d '%s' '%s'\n", i, a1, a2, ret->name1, ret->name2); map_rect_destroy(mr); } --- 266,270 ---- ret->angle_end=a1; } ! dbg(1,"i=%d dir=%d a1 %d a2 %d '%s' '%s'\n", i, dir, a1, a2, ret->name1, ret->name2); map_rect_destroy(mr); } *************** *** 350,353 **** --- 350,354 ---- if (*delta > 180) *delta-=360; + dbg(1,"delta=%d-%d=%d\n", new->angle_start, old->angle_end, *delta); if (*delta < 20 && *delta >-20) { dbg(1, "maneuver_required: delta(%d) < 20: no\n", *delta); *************** *** 456,459 **** --- 457,461 ---- { struct navigation_list *this_=priv_data; + attr->type=attr_type; switch(attr_type) { case attr_navigation_short: *************** *** 463,467 **** --- 465,482 ---- attr->u.str=show_maneuver(this_->nav, this_->itm, this_->cmd, attr_type); return 1; + case attr_length: + attr->u.num=this_->itm->dest_length-this_->cmd->itm->dest_length; + return 1; + case attr_time: + attr->u.num=(this_->itm->dest_time-this_->cmd->itm->dest_time)/10; + return 1; + case attr_destination_length: + attr->u.num=this_->itm->dest_length; + return 1; + case attr_destination_time: + attr->u.num=this_->itm->dest_time/10; + return 1; default: + attr->type=attr_none; return 0; } Index: route.c =================================================================== RCS file: /cvsroot/navit/navit/src/route.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** route.c 20 Dec 2007 20:39:48 -0000 1.29 --- route.c 25 Dec 2007 17:25:38 -0000 1.30 *************** *** 74,77 **** --- 74,78 ---- int time; int length; + int dir; unsigned ncoords; struct coord c[0]; *************** *** 530,534 **** static void route_path_add_item(struct route_path *this, struct route_path *oldpath, ! struct route_graph_segment *rgs, int len, int time, int offset) { struct route_path_segment *segment; --- 531,535 ---- static void route_path_add_item(struct route_path *this, struct route_path *oldpath, ! struct route_graph_segment *rgs, int len, int time, int offset, int dir) { struct route_path_segment *segment; *************** *** 559,562 **** --- 560,564 ---- segment->length=len; segment->time=time; + segment->dir=dir; segment->next=NULL; item_hash_insert(this->path_hash, &rgs->item, (void *)offset); *************** *** 600,607 **** } struct coord * route_path_segment_get_start(struct route_path_segment *s) { ! return &s->c[0]; } --- 602,618 ---- } + static struct coord * + route_path_segment_get_helper(struct route_path_segment *s, int dir) + { + if (s->dir == dir) + return &s->c[0]; + else + return &s->c[s->ncoords-1]; + } + struct coord * route_path_segment_get_start(struct route_path_segment *s) { ! return route_path_segment_get_helper(s, 1); } *************** *** 609,613 **** route_path_segment_get_end(struct route_path_segment *s) { ! return &s->c[s->ncoords-1]; } --- 620,624 ---- route_path_segment_get_end(struct route_path_segment *s) { ! return route_path_segment_get_helper(s, -1); } *************** *** 1042,1049 **** len+=seg_len; if (s->start == start) { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset); start=s->end; } else { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset); start=s->start; } --- 1053,1060 ---- len+=seg_len; if (s->start == start) { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset, 1); start=s->end; } else { ! route_path_add_item(ret, oldpath, s, seg_len, seg_time, s->offset, -1); start=s->start; } Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** navit.c 21 Dec 2007 14:10:12 -0000 1.56 --- navit.c 25 Dec 2007 17:25:37 -0000 1.57 *************** *** 757,761 **** struct item *item; struct attr attr; ! struct param_list param[1]; dbg(1,"enter\n"); --- 757,761 ---- struct item *item; struct attr attr; ! struct param_list param[5]; dbg(1,"enter\n"); *************** *** 766,772 **** item_attr_get(item, attr_navigation_long, &attr); dbg(2, "Command='%s'\n", attr.u.str); ! param[0].name="Command"; ! param[0].value=attr.u.str; ! datawindow_add(this_->roadbook_window, param, 1); } navigation_list_destroy(list); --- 766,793 ---- item_attr_get(item, attr_navigation_long, &attr); dbg(2, "Command='%s'\n", attr.u.str); ! param[0].name=_("Command"); ! param[0].value=g_strdup(attr.u.str); ! ! item_attr_get(item, attr_length, &attr); ! dbg(2, "Length=%d\n", attr.u.num); ! param[1].name=_("Length"); ! param[1].value=g_strdup_printf("%d m",attr.u.num); ! ! item_attr_get(item, attr_time, &attr); ! dbg(2, "Time=%d\n", attr.u.num); ! param[2].name=_("Time"); ! param[2].value=g_strdup_printf("%d:%d",attr.u.num / 60, attr.u.num % 60); ! ! item_attr_get(item, attr_destination_length, &attr); ! dbg(2, "Destlength=%d\n", attr.u.num); ! param[3].name=_("Destination Length"); ! param[3].value=g_strdup_printf("%d m",attr.u.num); ! ! item_attr_get(item, attr_destination_time, &attr); ! dbg(2, "Desttime=%d\n", attr.u.num); ! param[4].name=_("Destination Time"); ! param[4].value=g_strdup_printf("%d:%d",attr.u.num / 60, attr.u.num % 60); ! ! datawindow_add(this_->roadbook_window, param, 5); } navigation_list_destroy(list); *************** *** 1159,1163 **** return; } - if (this_->tracking && this_->tracking_flag) { if (tracking_update(this_->tracking, &nv->coord, nv->dir)) { --- 1180,1183 ---- Index: attr_def.h =================================================================== RCS file: /cvsroot/navit/navit/src/attr_def.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** attr_def.h 18 Dec 2007 19:36:56 -0000 1.17 --- attr_def.h 25 Dec 2007 17:25:37 -0000 1.18 *************** *** 29,32 **** --- 29,36 ---- ATTR(update) ATTR(follow) + ATTR(length) + ATTR(time) + ATTR(destination_length) + ATTR(destination_time) ATTR2(0x00028000,type_boolean_begin) /* boolean */ |
|
From: Martin S. <mar...@us...> - 2007-12-25 17:25:35
|
Update of /cvsroot/navit/navit/src/vehicle/demo In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8338/vehicle/demo Modified Files: vehicle_demo.c Log Message: Fixed a few vehicle and navigation related bugs, added textfile logging to vehicle Index: vehicle_demo.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/demo/vehicle_demo.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vehicle_demo.c 18 Dec 2007 22:14:27 -0000 1.2 --- vehicle_demo.c 25 Dec 2007 17:25:38 -0000 1.3 *************** *** 93,96 **** --- 93,97 ---- if (pos) { dbg(1, "current pos=0x%x,0x%x\n", pos->x, pos->y); + dbg(1, "last pos=0x%x,0x%x\n", priv->last.x, priv->last.y); if (priv->last.x == pos->x && priv->last.y == pos->y) { dbg(1, "endless loop\n"); |
|
From: Martin S. <mar...@us...> - 2007-12-25 14:11:28
|
Update of /cvsroot/navit/navit/src/data/mg In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25070 Modified Files: map.c Log Message: Fixed umlaut and szlig handling Index: map.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/mg/map.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** map.c 12 Nov 2007 19:25:29 -0000 1.7 --- map.c 25 Dec 2007 14:11:30 -0000 1.8 *************** *** 185,188 **** --- 185,230 ---- } + static char * + map_search_mg_convert_special(char *str) + { + char *ret,*c=g_malloc(strlen(str)*2+1); + + ret=c; + for (;;) { + switch ((unsigned char)(*str)) { + case 0xc4: + *c++='A'; + break; + case 0xd6: + *c++='O'; + break; + case 0xdc: + *c++='U'; + break; + case 0xdf: + *c++='s'; + *c++='s'; + break; + case 0xe4: + *c++='a'; + break; + case 0xf6: + *c++='o'; + break; + case 0xfc: + *c++='u'; + break; + default: + dbg(1,"0x%x\n", *str); + *c++=*str; + break; + } + if (! *str) + return ret; + str++; + } + } + + static struct map_search_priv * map_search_new_mg(struct map_priv *map, struct item *item, struct attr *search, int partial) *************** *** 199,202 **** --- 241,245 ---- tree_search_init(map->dirname, "town.b2", &mr->ts, 0x1000); mr->current_file=file_town_twn; + mr->search_str=map_search_mg_convert_special(search->u.str); break; case attr_street_name: *************** *** 206,209 **** --- 249,253 ---- tree_search_init(map->dirname, "strname.b1", &mr->ts, 0); mr->current_file=file_strname_stn; + mr->search_str=g_strdup(search->u.str); break; default: *************** *** 214,218 **** mr->search_item=*item; mr->search_country=item->id_lo; - mr->search_str=search->u.str; mr->search_partial=partial; mr->file=mr->m->file[mr->current_file]; --- 258,261 ---- *************** *** 228,231 **** --- 271,275 ---- if (! mr) return; + g_free(mr->search_str); tree_search_free(&mr->ts); g_free(mr); |
|
From: Martin S. <mar...@us...> - 2007-12-25 13:38:29
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10997 Modified Files: configure.in Log Message: Added bugfix for older autoconfs Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** configure.in 24 Dec 2007 20:36:58 -0000 1.63 --- configure.in 25 Dec 2007 13:38:31 -0000 1.64 *************** *** 4,8 **** AM_MAINTAINER_MODE ! AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS --- 4,11 ---- AM_MAINTAINER_MODE ! ! m4_ifndef([AC_USE_SYSTEM_EXTENSIONS], ! [AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])]) ! AC_USE_SYSTEM_EXTENSIONS |
|
From: Alexander A. <za...@us...> - 2007-12-25 11:08:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv489 Modified Files: coord.c Log Message: FIX: replace %i with %x for coordinates parsing, since %i fails with negative integers, which are not prefixed with -0x Index: coord.c =================================================================== RCS file: /cvsroot/navit/navit/src/coord.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** coord.c 25 Nov 2007 01:32:14 -0000 1.8 --- coord.c 25 Dec 2007 11:08:52 -0000 1.9 *************** *** 164,168 **** } if (!strncmp(str, "0x", 2) || !strncmp(str,"-0x", 3)) { ! args=sscanf(str, "%i %i%n",&c.x, &c.y, &ret); if (args < 2) goto out; --- 164,168 ---- } if (!strncmp(str, "0x", 2) || !strncmp(str,"-0x", 3)) { ! args=sscanf(str, "%x %x%n",&c.x, &c.y, &ret); if (args < 2) goto out; |
|
From: Martin S. <mar...@us...> - 2007-12-24 20:36:56
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9058/po Modified Files: cs.po de.po es.po fi.po fr.po it.po no.po pl.po Log Message: Set release to 0.0.4 Index: it.po =================================================================== RCS file: /cvsroot/navit/navit/po/it.po,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** it.po 24 Dec 2007 20:33:13 -0000 1.10 --- it.po 24 Dec 2007 20:36:58 -0000 1.11 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" Index: fr.po =================================================================== RCS file: /cvsroot/navit/navit/po/fr.po,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** fr.po 24 Dec 2007 20:33:13 -0000 1.33 --- fr.po 24 Dec 2007 20:36:58 -0000 1.34 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" Index: de.po =================================================================== RCS file: /cvsroot/navit/navit/po/de.po,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** de.po 24 Dec 2007 20:33:13 -0000 1.19 --- de.po 24 Dec 2007 20:36:58 -0000 1.20 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" Index: es.po =================================================================== RCS file: /cvsroot/navit/navit/po/es.po,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** es.po 24 Dec 2007 20:33:13 -0000 1.9 --- es.po 24 Dec 2007 20:36:58 -0000 1.10 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" Index: fi.po =================================================================== RCS file: /cvsroot/navit/navit/po/fi.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fi.po 24 Dec 2007 20:33:13 -0000 1.2 --- fi.po 24 Dec 2007 20:36:58 -0000 1.3 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" Index: pl.po =================================================================== RCS file: /cvsroot/navit/navit/po/pl.po,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pl.po 24 Dec 2007 20:33:13 -0000 1.9 --- pl.po 24 Dec 2007 20:36:58 -0000 1.10 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" Index: no.po =================================================================== RCS file: /cvsroot/navit/navit/po/no.po,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** no.po 24 Dec 2007 20:33:13 -0000 1.11 --- no.po 24 Dec 2007 20:36:58 -0000 1.12 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" Index: cs.po =================================================================== RCS file: /cvsroot/navit/navit/po/cs.po,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cs.po 24 Dec 2007 20:33:13 -0000 1.4 --- cs.po 24 Dec 2007 20:36:58 -0000 1.5 *************** *** 6,10 **** msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" --- 6,10 ---- msgid "" msgstr "" ! "Project-Id-Version: Navit 0.0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-24 21:15+0100\n" |
|
From: Martin S. <mar...@us...> - 2007-12-24 20:36:56
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9058 Modified Files: configure.in Log Message: Set release to 0.0.4 Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** configure.in 19 Dec 2007 10:21:25 -0000 1.62 --- configure.in 24 Dec 2007 20:36:58 -0000 1.63 *************** *** 1,3 **** ! AC_INIT(navit, 0.0.3) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) --- 1,3 ---- ! AC_INIT(navit, 0.0.4) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) |
|
From: Martin S. <mar...@us...> - 2007-12-24 20:33:15
|
Update of /cvsroot/navit/navit/po In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7815/po Modified Files: cs.po de.po es.po fi.po fr.po it.po no.po pl.po Log Message: Tagged 0.0.3 Index: it.po =================================================================== RCS file: /cvsroot/navit/navit/po/it.po,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** it.po 5 Nov 2007 23:54:29 -0000 1.9 --- it.po 24 Dec 2007 20:33:13 -0000 1.10 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-11-05 21:44+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Andrea GHENSI <and...@gm...>\n" *************** *** 26,44 **** msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:170 ! msgid "No config file navit.xml or navit.xml.local found\n" msgstr "" ! #: ../src/main.c:172 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Errore analizzando '%s': %s\n" ! #: ../src/main.c:174 #, c-format msgid "Using '%s'\n" msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:177 #, c-format msgid "No instance has been created, exiting\n" --- 26,45 ---- msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:173 ! #, c-format ! msgid "No config file navit.xml, navit.xml.local found\n" msgstr "" ! #: ../src/main.c:177 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Errore analizzando '%s': %s\n" ! #: ../src/main.c:180 #, c-format msgid "Using '%s'\n" msgstr "Utilizzo il file di configurazione '%s'\n" ! #: ../src/main.c:183 #, c-format msgid "No instance has been created, exiting\n" *************** *** 75,192 **** msgstr "tra %d.%d chilometri" ! #: ../src/navigation.c:195 msgid "one kilometer" ! msgstr "un chilometro" ! #: ../src/navigation.c:197 msgid "in one kilometer" ! msgstr "tra un chilometro" ! ! #: ../src/navigation.c:200 ! msgid "two kilometers" ! msgstr "due chilometri" ! ! #: ../src/navigation.c:202 ! msgid "in two kilometers" ! msgstr "tra due chilometri" ! ! #: ../src/navigation.c:205 ! msgid "three kilometers" ! msgstr "tre chilometri" ! ! #: ../src/navigation.c:207 ! msgid "in three kilometers" ! msgstr "tra tre chilometri" ! ! #: ../src/navigation.c:210 ! msgid "four kilometers" ! msgstr "quattro chilometri" ! ! #: ../src/navigation.c:212 ! msgid "in four kilometers" ! msgstr "tra quattro chilometri" ! ! #: ../src/navigation.c:215 ! #, c-format ! msgid "%d kilometers" ! msgstr "%d chilometri" ! ! #: ../src/navigation.c:217 ! #, c-format ! msgid "in %d kilometers" ! msgstr "tra %d chilometri" ! #: ../src/navigation.c:421 msgid "right" msgstr "destra" ! #: ../src/navigation.c:429 msgid "left" msgstr "sinistra" ! #: ../src/navigation.c:433 msgid "easily " msgstr "di poco " ! #: ../src/navigation.c:437 msgid "strongly " msgstr "molto " ! #: ../src/navigation.c:440 msgid "unknown " msgstr "sconosciuto " ! #: ../src/navigation.c:446 #, fuzzy msgid "When possible, please turn around" msgstr "Appena possibile, invertire il senso di marcia" ! #: ../src/navigation.c:453 #, c-format msgid "Follow the road for the next %s" msgstr "Seguire la strada per i prossimi %s" ! #: ../src/navigation.c:457 msgid "soon" msgstr "tra poco" ! #: ../src/navigation.c:463 msgid "now" msgstr "adesso" ! #: ../src/navigation.c:466 msgid "error" msgstr "errore" ! #: ../src/navigation.c:471 ! msgid "strength_pos" ! msgstr "2" ! ! #: ../src/navigation.c:473 ! msgid "direction_pos" ! msgstr "3" ! ! #: ../src/navigation.c:475 ! msgid "distance_pos" ! msgstr "1" ! ! #: ../src/navigation.c:485 ! #, c-format ! msgid "Turn %s%s %s" msgstr "%s, svoltare %s%s" ! #: ../src/navigation.c:488 #, c-format msgid "You have reached your destination %s" msgstr "Hai raggiunto la destinazione %s" ! #: ../src/navit.c:449 ../src/gui/gtk/gui_gtk_action.c:180 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:462 msgid "Projection" msgstr "Proiezione" #: ../src/country.c:24 msgid "Czech Republic" --- 76,180 ---- msgstr "tra %d.%d chilometri" ! #: ../src/navigation.c:193 ! #, fuzzy, c-format msgid "one kilometer" ! msgid_plural "%d kilometers" ! msgstr[0] "un chilometro" ! msgstr[1] "un chilometro" ! #: ../src/navigation.c:195 ! #, fuzzy, c-format msgid "in one kilometer" ! msgid_plural "in %d kilometers" ! msgstr[0] "tra un chilometro" ! msgstr[1] "tra un chilometro" ! #: ../src/navigation.c:398 msgid "right" msgstr "destra" ! #: ../src/navigation.c:405 msgid "left" msgstr "sinistra" ! #: ../src/navigation.c:409 msgid "easily " msgstr "di poco " ! #: ../src/navigation.c:413 msgid "strongly " msgstr "molto " ! #: ../src/navigation.c:416 msgid "unknown " msgstr "sconosciuto " ! #: ../src/navigation.c:422 #, fuzzy msgid "When possible, please turn around" msgstr "Appena possibile, invertire il senso di marcia" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Seguire la strada per i prossimi %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "tra poco" ! #: ../src/navigation.c:439 msgid "now" msgstr "adesso" ! #: ../src/navigation.c:442 msgid "error" msgstr "errore" ! #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 ! #, fuzzy, c-format ! msgid "Turn %1$s%2$s %3$s" msgstr "%s, svoltare %s%s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" msgstr "Hai raggiunto la destinazione %s" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Proiezione" + #: ../src/navit.c:685 + #, fuzzy + msgid "Former Destinations" + msgstr "Destinazione" + + #: ../src/navit.c:695 + msgid "Bookmarks" + msgstr "" + + #: ../src/navit.c:733 + msgid "Vehicle" + msgstr "" + + #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 + msgid "Roadbook" + msgstr "Quaderno di viaggio" + + #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 + #: ../src/gui/gtk/gui_gtk_action.c:184 + msgid "Map" + msgstr "Mappa" + + #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 + msgid "Route" + msgstr "Percorso" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 437,549 **** msgstr "Svalbard e Jan Mayen" ! #: ../src/gui/gtk/destination.c:325 msgid "Country" msgstr "Stato" ! #: ../src/gui/gtk/destination.c:327 msgid "Zip Code" msgstr "Codice ZIP" ! #: ../src/gui/gtk/destination.c:329 msgid "City" msgstr "Città " ! #: ../src/gui/gtk/destination.c:331 msgid "District/Township" msgstr "Distretto" ! #: ../src/gui/gtk/destination.c:334 ! msgid "Street" ! msgstr "Via" ! #: ../src/gui/gtk/destination.c:336 ! msgid "Number" ! msgstr "Numero" ! #: ../src/gui/gtk/gui_gtk_action.c:177 msgid "Display" msgstr "Visualizza" ! #: ../src/gui/gtk/gui_gtk_action.c:178 ! msgid "Route" ! msgstr "Percorso" ! ! #: ../src/gui/gtk/gui_gtk_action.c:179 ! msgid "Map" ! msgstr "Mappa" ! ! #: ../src/gui/gtk/gui_gtk_action.c:181 msgid "ZoomOut" msgstr "Zoom -" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "ZoomIn" msgstr "Zoom +" ! #: ../src/gui/gtk/gui_gtk_action.c:183 msgid "Refresh" msgstr "Aggiorna" ! #: ../src/gui/gtk/gui_gtk_action.c:184 ! msgid "Roadbook" ! msgstr "Quaderno di viaggio" ! ! #: ../src/gui/gtk/gui_gtk_action.c:186 ../src/gui/gtk/gui_gtk_action.c:188 msgid "Info" msgstr "Informazioni" ! #: ../src/gui/gtk/gui_gtk_action.c:190 ! msgid "Destination" ! msgstr "Destinazione" ! ! #: ../src/gui/gtk/gui_gtk_action.c:191 msgid "Clear" msgstr "Pulisci" ! #: ../src/gui/gtk/gui_gtk_action.c:192 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:193 msgid "_Quit" msgstr "_Esci" ! #: ../src/gui/gtk/gui_gtk_action.c:200 msgid "Cursor" msgstr "Cursore" ! #: ../src/gui/gtk/gui_gtk_action.c:201 msgid "Tracking" msgstr "Tracking" ! #: ../src/gui/gtk/gui_gtk_action.c:202 msgid "Orientation" msgstr "Bussola" ! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206 msgid "Fullscreen" msgstr "Schermo intero" ! #: ../src/gui/gtk/gui_gtk_action.c:214 msgid "Data" msgstr "Dati" ! #: ../src/gui/gtk/gui_gtk_action.c:215 msgid "VisibleBlocks" msgstr "BlocchiVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:216 msgid "VisibleTowns" msgstr "Città Visibili" ! #: ../src/gui/gtk/gui_gtk_action.c:217 msgid "VisiblePolys" msgstr "PoligoniVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:218 msgid "VisibleStreets" msgstr "StradeVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "VisiblePoints" msgstr "PuntiVisibili" --- 425,604 ---- msgstr "Svalbard e Jan Mayen" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100 ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "Car" ! msgstr "Pulisci" ! ! #: ../src/gui/gtk/destination.c:99 ! msgid "Iso2" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:99 ! msgid "Iso3" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:331 msgid "Country" msgstr "Stato" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "Postal" ! msgstr "Portogallo" ! ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! msgid "Town" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "District" ! msgstr "Distretto" ! ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #: ../src/gui/gtk/destination.c:340 ! msgid "Street" ! msgstr "Via" ! ! #: ../src/gui/gtk/destination.c:102 ../src/gui/gtk/destination.c:342 ! msgid "Number" ! msgstr "Numero" ! ! #: ../src/gui/gtk/destination.c:326 ! #, fuzzy ! msgid "Enter Destination" ! msgstr "Destinazione" ! ! #: ../src/gui/gtk/destination.c:333 msgid "Zip Code" msgstr "Codice ZIP" ! #: ../src/gui/gtk/destination.c:335 msgid "City" msgstr "Città " ! #: ../src/gui/gtk/destination.c:337 msgid "District/Township" msgstr "Distretto" ! #: ../src/gui/gtk/destination.c:366 ! msgid "Bookmark" ! msgstr "" ! #: ../src/gui/gtk/destination.c:367 ../src/gui/gtk/gui_gtk_action.c:195 ! msgid "Destination" ! msgstr "Destinazione" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "Display" msgstr "Visualizza" ! #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" msgstr "Zoom -" ! #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "ZoomIn" msgstr "Zoom +" ! #: ../src/gui/gtk/gui_gtk_action.c:188 msgid "Refresh" msgstr "Aggiorna" ! #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" msgstr "Informazioni" ! #: ../src/gui/gtk/gui_gtk_action.c:196 msgid "Clear" msgstr "Pulisci" ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:198 msgid "_Quit" msgstr "_Esci" ! #: ../src/gui/gtk/gui_gtk_action.c:205 msgid "Cursor" msgstr "Cursore" ! #: ../src/gui/gtk/gui_gtk_action.c:206 msgid "Tracking" msgstr "Tracking" ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "Orientation" msgstr "Bussola" ! #: ../src/gui/gtk/gui_gtk_action.c:209 ../src/gui/gtk/gui_gtk_action.c:211 msgid "Fullscreen" msgstr "Schermo intero" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Data" msgstr "Dati" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "VisibleBlocks" msgstr "BlocchiVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:221 msgid "VisibleTowns" msgstr "Città Visibili" ! #: ../src/gui/gtk/gui_gtk_action.c:222 msgid "VisiblePolys" msgstr "PoligoniVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:223 msgid "VisibleStreets" msgstr "StradeVisibili" ! #: ../src/gui/gtk/gui_gtk_action.c:224 msgid "VisiblePoints" msgstr "PuntiVisibili" + + #: ../src/gui/gtk/gui_gtk_action.c:225 + #, fuzzy + msgid "RouteGraph" + msgstr "Percorso" + + #~ msgid "two kilometers" + #~ msgstr "due chilometri" + + #~ msgid "in two kilometers" + #~ msgstr "tra due chilometri" + + #~ msgid "three kilometers" + #~ msgstr "tre chilometri" + + #~ msgid "in three kilometers" + #~ msgstr "tra tre chilometri" + + #~ msgid "four kilometers" + #~ msgstr "quattro chilometri" + + #~ msgid "in four kilometers" + #~ msgstr "tra quattro chilometri" + + #~ msgid "%d kilometers" + #~ msgstr "%d chilometri" + + #~ msgid "in %d kilometers" + #~ msgstr "tra %d chilometri" + + #~ msgid "strength_pos" + #~ msgstr "2" + + #~ msgid "direction_pos" + #~ msgstr "3" + + #~ msgid "distance_pos" + #~ msgstr "1" Index: fr.po =================================================================== RCS file: /cvsroot/navit/navit/po/fr.po,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** fr.po 18 Dec 2007 16:16:22 -0000 1.32 --- fr.po 24 Dec 2007 20:33:13 -0000 1.33 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-18 14:12+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-12-17 11:36+0100\n" "Last-Translator: KaZeR <ka...@al...>\n" *************** *** 78,82 **** #: ../src/navigation.c:193 ! #, c-format msgid "one kilometer" msgid_plural "%d kilometers" --- 78,82 ---- #: ../src/navigation.c:193 ! #, c-format msgid "one kilometer" msgid_plural "%d kilometers" *************** *** 143,176 **** msgstr "Vous êtes arrivé à votre destination %s" ! #: ../src/navit.c:603 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Calques" ! #: ../src/navit.c:619 msgid "Projection" msgstr "Projection" ! #: ../src/navit.c:674 msgid "Former Destinations" msgstr "Destinations précédentes" ! #: ../src/navit.c:684 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:722 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:778 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:997 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1004 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" --- 143,176 ---- msgstr "Vous êtes arrivé à votre destination %s" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Calques" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Projection" ! #: ../src/navit.c:685 msgid "Former Destinations" msgstr "Destinations précédentes" ! #: ../src/navit.c:695 msgid "Bookmarks" msgstr "" ! #: ../src/navit.c:733 msgid "Vehicle" msgstr "" ! #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 msgid "Roadbook" msgstr "Carnet de route" ! #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 #: ../src/gui/gtk/gui_gtk_action.c:184 msgid "Map" msgstr "Carte" ! #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 msgid "Route" msgstr "Route" Index: de.po =================================================================== RCS file: /cvsroot/navit/navit/po/de.po,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** de.po 18 Dec 2007 12:07:41 -0000 1.18 --- de.po 24 Dec 2007 20:33:13 -0000 1.19 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-18 12:58+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Martin Schaller <mar...@so...>\n" *************** *** 17,20 **** --- 17,180 ---- "Plural-Forms: nplurals=2; plural=n != 1;\n" + #: ../src/main.c:94 + #, c-format + msgid "Running from source directory\n" + msgstr "Aufruf aus Quellverzeichnis\n" + + #: ../src/main.c:110 + #, c-format + msgid "setting '%s' to '%s'\n" + msgstr "setze '%s' auf '%s'\n" + + #: ../src/main.c:173 + #, c-format + msgid "No config file navit.xml, navit.xml.local found\n" + msgstr "Keine Konfigurationsdatei navit.xml, navit.xml.local gefunden\n" + + #: ../src/main.c:177 + #, c-format + msgid "Error parsing '%s': %s\n" + msgstr "Fehler beim Parsen von '%s': %s\n" + + #: ../src/main.c:180 + #, c-format + msgid "Using '%s'\n" + msgstr "Benutze '%s'\n" + + #: ../src/main.c:183 + #, c-format + msgid "No instance has been created, exiting\n" + msgstr "Es wurde keine Instanz erzeugt, Ende\n" + + #: ../src/navigation.c:173 + #, c-format + msgid "%d m" + msgstr "%d Meter" + + #: ../src/navigation.c:175 + #, c-format + msgid "in %d m" + msgstr "In %d metern" + + #: ../src/navigation.c:179 + #, c-format + msgid "%d meters" + msgstr "%d Meter" + + #: ../src/navigation.c:181 + #, c-format + msgid "in %d meters" + msgstr "In %d metern" + + #: ../src/navigation.c:187 + #, c-format + msgid "%d.%d kilometer" + msgstr "%d,%d Kilometer" + + #: ../src/navigation.c:189 + #, c-format + msgid "in %d.%d kilometers" + msgstr "In %d,%d Kilometern" + + #: ../src/navigation.c:193 + #, c-format + msgid "one kilometer" + msgid_plural "%d kilometers" + msgstr[0] "einen Kilometer" + msgstr[1] "%d Kilometer" + + #: ../src/navigation.c:195 + #, c-format + msgid "in one kilometer" + msgid_plural "in %d kilometers" + msgstr[0] "In einem Kilometer" + msgstr[1] "In %d Kilometern" + + #: ../src/navigation.c:398 + msgid "right" + msgstr "rechts" + + #: ../src/navigation.c:405 + msgid "left" + msgstr "links" + + #: ../src/navigation.c:409 + msgid "easily " + msgstr "leicht " + + #: ../src/navigation.c:413 + msgid "strongly " + msgstr "scharf " + + #: ../src/navigation.c:416 + msgid "unknown " + msgstr "unbekannt " + + # + #: ../src/navigation.c:422 + msgid "When possible, please turn around" + msgstr "Wenn möglich bitte wenden" + + #: ../src/navigation.c:429 + #, c-format + msgid "Follow the road for the next %s" + msgstr "Dem StraÃenverlauf %s folgen" + + #: ../src/navigation.c:433 + msgid "soon" + msgstr "Demnächst" + + #: ../src/navigation.c:439 + msgid "now" + msgstr "Jetzt" + + #: ../src/navigation.c:442 + msgid "error" + msgstr "fehler" + + #. TRANSLATORS: The first argument is strength, the second direction and the third distance + #: ../src/navigation.c:446 + #, c-format + msgid "Turn %1$s%2$s %3$s" + msgstr "%3$s %1$s%2$s abbiegen" + + #: ../src/navigation.c:449 + #, c-format + msgid "You have reached your destination %s" + msgstr "%s haben Sie ihr Ziel erreicht" + + #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 + msgid "Layout" + msgstr "Layout" + + #: ../src/navit.c:630 + msgid "Projection" + msgstr "Projektion" + + #: ../src/navit.c:685 + msgid "Former Destinations" + msgstr "Frühere Ziele" + + #: ../src/navit.c:695 + msgid "Bookmarks" + msgstr "Lesezeichen" + + #: ../src/navit.c:733 + msgid "Vehicle" + msgstr "Fahrzeug" + + #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 + msgid "Roadbook" + msgstr "StraÃenliste" + + #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 + #: ../src/gui/gtk/gui_gtk_action.c:184 + msgid "Map" + msgstr "Karte" + + #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 + msgid "Route" + msgstr "Route" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 326,334 **** msgstr "Ortsteil/Gemeinde" - #: ../src/gui/gtk/destination.c:365 ../src/gui/gtk/gui_gtk_action.c:184 - #: ../src/navit.c:997 - msgid "Map" - msgstr "Karte" - #: ../src/gui/gtk/destination.c:366 msgid "Bookmark" --- 486,489 ---- *************** *** 343,354 **** msgstr "Anzeige" - #: ../src/gui/gtk/gui_gtk_action.c:183 ../src/navit.c:1004 - msgid "Route" - msgstr "Route" - - #: ../src/gui/gtk/gui_gtk_action.c:185 ../src/navit.c:603 - msgid "Layout" - msgstr "Layout" - #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" --- 498,501 ---- *************** *** 363,370 **** msgstr "Aktualisieren" - #: ../src/gui/gtk/gui_gtk_action.c:189 ../src/navit.c:778 - msgid "Roadbook" - msgstr "StraÃenliste" - #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" --- 510,513 ---- *************** *** 427,594 **** msgstr "Route-Graph" ! #: ../src/main.c:94 ! #, c-format ! msgid "Running from source directory\n" ! msgstr "Aufruf aus Quellverzeichnis\n" ! ! #: ../src/main.c:110 ! #, c-format ! msgid "setting '%s' to '%s'\n" ! msgstr "setze '%s' auf '%s'\n" ! ! #: ../src/main.c:170 ! #, c-format ! msgid "No config file navit.xml, navit.xml.local found\n" ! msgstr "Keine Konfigurationsdatei navit.xml, navit.xml.local gefunden\n" ! ! #: ../src/main.c:174 ! #, c-format ! msgid "Error parsing '%s': %s\n" ! msgstr "Fehler beim Parsen von '%s': %s\n" ! ! #: ../src/main.c:177 ! #, c-format ! msgid "Using '%s'\n" ! msgstr "Benutze '%s'\n" ! ! #: ../src/main.c:180 ! #, c-format ! msgid "No instance has been created, exiting\n" ! msgstr "Es wurde keine Instanz erzeugt, Ende\n" ! ! #: ../src/navigation.c:173 ! #, c-format ! msgid "%d m" ! msgstr "%d Meter" ! ! #: ../src/navigation.c:175 ! #, c-format ! msgid "in %d m" ! msgstr "In %d metern" ! ! #: ../src/navigation.c:179 ! #, c-format ! msgid "%d meters" ! msgstr "%d Meter" ! ! #: ../src/navigation.c:181 ! #, c-format ! msgid "in %d meters" ! msgstr "In %d metern" ! ! #: ../src/navigation.c:187 ! #, c-format ! msgid "%d.%d kilometer" ! msgstr "%d,%d Kilometer" ! ! #: ../src/navigation.c:189 ! #, c-format ! msgid "in %d.%d kilometers" ! msgstr "In %d,%d Kilometern" ! ! #: ../src/navigation.c:193 ! #, c-format ! msgid "one kilometer" ! msgid_plural "%d kilometers" ! msgstr[0] "einen Kilometer" ! msgstr[1] "%d Kilometer" ! ! #: ../src/navigation.c:195 ! #, c-format ! msgid "in one kilometer" ! msgid_plural "in %d kilometers" ! msgstr[0] "In einem Kilometer" ! msgstr[1] "In %d Kilometern" ! ! #: ../src/navigation.c:398 ! msgid "right" ! msgstr "rechts" ! ! #: ../src/navigation.c:405 ! msgid "left" ! msgstr "links" ! ! #: ../src/navigation.c:409 ! msgid "easily " ! msgstr "leicht " ! ! #: ../src/navigation.c:413 ! msgid "strongly " ! msgstr "scharf " ! ! #: ../src/navigation.c:416 ! msgid "unknown " ! msgstr "unbekannt " ! ! # ! #: ../src/navigation.c:422 ! msgid "When possible, please turn around" ! msgstr "Wenn möglich bitte wenden" ! ! #: ../src/navigation.c:429 ! #, c-format ! msgid "Follow the road for the next %s" ! msgstr "Dem StraÃenverlauf %s folgen" ! ! #: ../src/navigation.c:433 ! msgid "soon" ! msgstr "Demnächst" ! ! #: ../src/navigation.c:439 ! msgid "now" ! msgstr "Jetzt" ! ! #: ../src/navigation.c:442 ! msgid "error" ! msgstr "fehler" ! ! #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 ! #, c-format ! msgid "Turn %1$s%2$s %3$s" ! msgstr "%3$s %1$s%2$s abbiegen" ! ! #: ../src/navigation.c:449 ! #, c-format ! msgid "You have reached your destination %s" ! msgstr "%s haben Sie ihr Ziel erreicht" ! ! #: ../src/navit.c:619 ! msgid "Projection" ! msgstr "Projektion" ! ! #: ../src/navit.c:674 ! msgid "Former Destinations" ! msgstr "Frühere Ziele" ! ! #: ../src/navit.c:684 ! msgid "Bookmarks" ! msgstr "Lesezeichen" ! ! #: ../src/navit.c:722 ! msgid "Vehicle" ! msgstr "Fahrzeug" ! ! #: ../src/popup.c:229 ! #, c-format ! msgid "Point 0x%x 0x%x" ! msgstr "Punkt 0x%x 0x%x" ! #: ../src/popup.c:230 ! #, c-format ! msgid "Screen %d %d" ! msgstr "Bildschirm %d %d" ! #: ../src/popup.c:239 ! msgid "Set as position" ! msgstr "Als Position setzen" ! #: ../src/popup.c:240 ! msgid "Set as destination" ! msgstr "Als Ziel setzen" ! #: ../src/popup.c:241 ! msgid "Add as bookmark" ! msgstr "Als Lesezeichen aufnehmen" #~ msgid "two kilometers" --- 570,587 ---- msgstr "Route-Graph" ! #~ msgid "Point 0x%x 0x%x" ! #~ msgstr "Punkt 0x%x 0x%x" ! #~ msgid "Screen %d %d" ! #~ msgstr "Bildschirm %d %d" ! #~ msgid "Set as position" ! #~ msgstr "Als Position setzen" ! #~ msgid "Set as destination" ! #~ msgstr "Als Ziel setzen" ! #~ msgid "Add as bookmark" ! #~ msgstr "Als Lesezeichen aufnehmen" #~ msgid "two kilometers" Index: es.po =================================================================== RCS file: /cvsroot/navit/navit/po/es.po,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** es.po 12 Nov 2007 21:26:17 -0000 1.8 --- es.po 24 Dec 2007 20:33:13 -0000 1.9 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-11-05 21:44+0100\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" "Last-Translator: Esteban Dauksis <eda...@gm...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-15 20:44-0600\n" "Last-Translator: Esteban Dauksis <eda...@gm...>\n" *************** *** 27,45 **** msgstr "Usando '%s'\n" ! #: ../src/main.c:170 ! msgid "No config file navit.xml or navit.xml.local found\n" msgstr "No se ha encontrado navit.xml o navit.xml.local\n" ! #: ../src/main.c:172 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Error leyendo '%s': %s\n" ! #: ../src/main.c:174 #, c-format msgid "Using '%s'\n" msgstr "Usando '%s'\n" ! #: ../src/main.c:177 #, c-format msgid "No instance has been created, exiting\n" --- 27,46 ---- msgstr "Usando '%s'\n" ! #: ../src/main.c:173 ! #, fuzzy, c-format ! msgid "No config file navit.xml, navit.xml.local found\n" msgstr "No se ha encontrado navit.xml o navit.xml.local\n" ! #: ../src/main.c:177 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Error leyendo '%s': %s\n" ! #: ../src/main.c:180 #, c-format msgid "Using '%s'\n" msgstr "Usando '%s'\n" ! #: ../src/main.c:183 #, c-format msgid "No instance has been created, exiting\n" *************** *** 76,193 **** msgstr "en %d.%d kilómetros" ! #: ../src/navigation.c:195 msgid "one kilometer" ! msgstr "un kilómetro" ! #: ../src/navigation.c:197 msgid "in one kilometer" ! msgstr "en un kilómetro" ! ! #: ../src/navigation.c:200 ! msgid "two kilometers" ! msgstr "dos kilómetros" ! ! #: ../src/navigation.c:202 ! msgid "in two kilometers" ! msgstr "en dos kilómetros" ! ! #: ../src/navigation.c:205 ! msgid "three kilometers" ! msgstr "tres kilómetros" ! ! #: ../src/navigation.c:207 ! msgid "in three kilometers" ! msgstr "en tres kilómetros" ! ! #: ../src/navigation.c:210 ! msgid "four kilometers" ! msgstr "cuatro kilómetros" ! ! #: ../src/navigation.c:212 ! msgid "in four kilometers" ! msgstr "en cuatro kilómetros" ! ! #: ../src/navigation.c:215 ! #, c-format ! msgid "%d kilometers" ! msgstr "%d kilómetros" ! ! #: ../src/navigation.c:217 ! #, c-format ! msgid "in %d kilometers" ! msgstr "en %d kilómetros" ! #: ../src/navigation.c:421 msgid "right" msgstr "derecha" ! #: ../src/navigation.c:429 msgid "left" msgstr "izquerida" ! #: ../src/navigation.c:433 msgid "easily " msgstr "suavemente" ! #: ../src/navigation.c:437 msgid "strongly " msgstr "brúscamente" ! #: ../src/navigation.c:440 msgid "unknown " msgstr "desconocido" ! #: ../src/navigation.c:446 #, fuzzy msgid "When possible, please turn around" msgstr "Cuando sea posible, gire a la" ! #: ../src/navigation.c:453 #, c-format msgid "Follow the road for the next %s" msgstr "Continue hasta %s" ! #: ../src/navigation.c:457 msgid "soon" msgstr "pronto" ! #: ../src/navigation.c:463 msgid "now" msgstr "ahora" ! #: ../src/navigation.c:466 msgid "error" msgstr "error" ! #: ../src/navigation.c:471 ! msgid "strength_pos" ! msgstr "fuerza_pos" ! ! #: ../src/navigation.c:473 ! msgid "direction_pos" ! msgstr "dirección_pos" ! ! #: ../src/navigation.c:475 ! msgid "distance_pos" ! msgstr "distancia_pos" ! ! #: ../src/navigation.c:485 ! #, c-format ! msgid "Turn %s%s %s" msgstr "Gire %s%s %s" ! #: ../src/navigation.c:488 #, c-format msgid "You have reached your destination %s" msgstr "Ha llegado a su destino %s" ! #: ../src/navit.c:449 ../src/gui/gtk/gui_gtk_action.c:180 msgid "Layout" msgstr "Diseño" ! #: ../src/navit.c:462 msgid "Projection" msgstr "Proyección" #: ../src/country.c:24 msgid "Czech Republic" --- 77,181 ---- msgstr "en %d.%d kilómetros" ! #: ../src/navigation.c:193 ! #, fuzzy, c-format msgid "one kilometer" ! msgid_plural "%d kilometers" ! msgstr[0] "un kilómetro" ! msgstr[1] "un kilómetro" ! #: ../src/navigation.c:195 ! #, fuzzy, c-format msgid "in one kilometer" ! msgid_plural "in %d kilometers" ! msgstr[0] "en un kilómetro" ! msgstr[1] "en un kilómetro" ! #: ../src/navigation.c:398 msgid "right" msgstr "derecha" ! #: ../src/navigation.c:405 msgid "left" msgstr "izquerida" ! #: ../src/navigation.c:409 msgid "easily " msgstr "suavemente" ! #: ../src/navigation.c:413 msgid "strongly " msgstr "brúscamente" ! #: ../src/navigation.c:416 msgid "unknown " msgstr "desconocido" ! #: ../src/navigation.c:422 #, fuzzy msgid "When possible, please turn around" msgstr "Cuando sea posible, gire a la" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Continue hasta %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "pronto" ! #: ../src/navigation.c:439 msgid "now" msgstr "ahora" ! #: ../src/navigation.c:442 msgid "error" msgstr "error" ! #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 ! #, fuzzy, c-format ! msgid "Turn %1$s%2$s %3$s" msgstr "Gire %s%s %s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" msgstr "Ha llegado a su destino %s" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Diseño" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Proyección" + #: ../src/navit.c:685 + #, fuzzy + msgid "Former Destinations" + msgstr "Destino" + + #: ../src/navit.c:695 + msgid "Bookmarks" + msgstr "" + + #: ../src/navit.c:733 + msgid "Vehicle" + msgstr "" + + #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 + msgid "Roadbook" + msgstr "GuÃa" + + #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 + #: ../src/gui/gtk/gui_gtk_action.c:184 + msgid "Map" + msgstr "Mapa" + + #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 + msgid "Route" + msgstr "Ruta" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 438,550 **** msgstr "Svalbard y Jan Mayen" ! #: ../src/gui/gtk/destination.c:325 msgid "Country" msgstr "PaÃs" ! #: ../src/gui/gtk/destination.c:327 msgid "Zip Code" msgstr "Código Postal" ! #: ../src/gui/gtk/destination.c:329 msgid "City" msgstr "Cuidad" ! #: ../src/gui/gtk/destination.c:331 msgid "District/Township" msgstr "Distrito" ! #: ../src/gui/gtk/destination.c:334 ! msgid "Street" ! msgstr "Calle" ! #: ../src/gui/gtk/destination.c:336 ! msgid "Number" ! msgstr "Número" ! #: ../src/gui/gtk/gui_gtk_action.c:177 msgid "Display" msgstr "Visualización" ! #: ../src/gui/gtk/gui_gtk_action.c:178 ! msgid "Route" ! msgstr "Ruta" ! ! #: ../src/gui/gtk/gui_gtk_action.c:179 ! msgid "Map" ! msgstr "Mapa" ! ! #: ../src/gui/gtk/gui_gtk_action.c:181 msgid "ZoomOut" msgstr "Alejar" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "ZoomIn" msgstr "Aumentar" ! #: ../src/gui/gtk/gui_gtk_action.c:183 msgid "Refresh" msgstr "Refrescar" ! #: ../src/gui/gtk/gui_gtk_action.c:184 ! msgid "Roadbook" ! msgstr "GuÃa" ! ! #: ../src/gui/gtk/gui_gtk_action.c:186 ../src/gui/gtk/gui_gtk_action.c:188 msgid "Info" msgstr "Información" ! #: ../src/gui/gtk/gui_gtk_action.c:190 ! msgid "Destination" ! msgstr "Destino" ! ! #: ../src/gui/gtk/gui_gtk_action.c:191 msgid "Clear" msgstr "Limpiar" ! #: ../src/gui/gtk/gui_gtk_action.c:192 msgid "Test" msgstr "Probar" ! #: ../src/gui/gtk/gui_gtk_action.c:193 msgid "_Quit" msgstr "_Salir" ! #: ../src/gui/gtk/gui_gtk_action.c:200 msgid "Cursor" msgstr "Puntero" ! #: ../src/gui/gtk/gui_gtk_action.c:201 msgid "Tracking" msgstr "Posicionando" ! #: ../src/gui/gtk/gui_gtk_action.c:202 msgid "Orientation" msgstr "Orientación" ! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206 msgid "Fullscreen" msgstr "Pantalla completa" ! #: ../src/gui/gtk/gui_gtk_action.c:214 msgid "Data" msgstr "Datos" ! #: ../src/gui/gtk/gui_gtk_action.c:215 msgid "VisibleBlocks" msgstr "BloquesVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:216 msgid "VisibleTowns" msgstr "CuidadesVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:217 msgid "VisiblePolys" msgstr "PoligonosVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:218 msgid "VisibleStreets" msgstr "CallesVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "VisiblePoints" msgstr "PuntosVisibles" --- 426,605 ---- msgstr "Svalbard y Jan Mayen" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100 ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "Car" ! msgstr "Limpiar" ! ! #: ../src/gui/gtk/destination.c:99 ! msgid "Iso2" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:99 ! msgid "Iso3" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:331 msgid "Country" msgstr "PaÃs" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "Postal" ! msgstr "Portugal" ! ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! msgid "Town" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "District" ! msgstr "Distrito" ! ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #: ../src/gui/gtk/destination.c:340 ! msgid "Street" ! msgstr "Calle" ! ! #: ../src/gui/gtk/destination.c:102 ../src/gui/gtk/destination.c:342 ! msgid "Number" ! msgstr "Número" ! ! #: ../src/gui/gtk/destination.c:326 ! #, fuzzy ! msgid "Enter Destination" ! msgstr "Destino" ! ! #: ../src/gui/gtk/destination.c:333 msgid "Zip Code" msgstr "Código Postal" ! #: ../src/gui/gtk/destination.c:335 msgid "City" msgstr "Cuidad" ! #: ../src/gui/gtk/destination.c:337 msgid "District/Township" msgstr "Distrito" ! #: ../src/gui/gtk/destination.c:366 ! msgid "Bookmark" ! msgstr "" ! #: ../src/gui/gtk/destination.c:367 ../src/gui/gtk/gui_gtk_action.c:195 ! msgid "Destination" ! msgstr "Destino" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "Display" msgstr "Visualización" ! #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" msgstr "Alejar" ! #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "ZoomIn" msgstr "Aumentar" ! #: ../src/gui/gtk/gui_gtk_action.c:188 msgid "Refresh" msgstr "Refrescar" ! #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" msgstr "Información" ! #: ../src/gui/gtk/gui_gtk_action.c:196 msgid "Clear" msgstr "Limpiar" ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Test" msgstr "Probar" ! #: ../src/gui/gtk/gui_gtk_action.c:198 msgid "_Quit" msgstr "_Salir" ! #: ../src/gui/gtk/gui_gtk_action.c:205 msgid "Cursor" msgstr "Puntero" ! #: ../src/gui/gtk/gui_gtk_action.c:206 msgid "Tracking" msgstr "Posicionando" ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "Orientation" msgstr "Orientación" ! #: ../src/gui/gtk/gui_gtk_action.c:209 ../src/gui/gtk/gui_gtk_action.c:211 msgid "Fullscreen" msgstr "Pantalla completa" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Data" msgstr "Datos" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "VisibleBlocks" msgstr "BloquesVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:221 msgid "VisibleTowns" msgstr "CuidadesVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:222 msgid "VisiblePolys" msgstr "PoligonosVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:223 msgid "VisibleStreets" msgstr "CallesVisibles" ! #: ../src/gui/gtk/gui_gtk_action.c:224 msgid "VisiblePoints" msgstr "PuntosVisibles" + + #: ../src/gui/gtk/gui_gtk_action.c:225 + #, fuzzy + msgid "RouteGraph" + msgstr "Ruta" + + #~ msgid "two kilometers" + #~ msgstr "dos kilómetros" + + #~ msgid "in two kilometers" + #~ msgstr "en dos kilómetros" + + #~ msgid "three kilometers" + #~ msgstr "tres kilómetros" + + #~ msgid "in three kilometers" + #~ msgstr "en tres kilómetros" + + #~ msgid "four kilometers" + #~ msgstr "cuatro kilómetros" + + #~ msgid "in four kilometers" + #~ msgstr "en cuatro kilómetros" + + #~ msgid "%d kilometers" + #~ msgstr "%d kilómetros" + + #~ msgid "in %d kilometers" + #~ msgstr "en %d kilómetros" + + #~ msgid "strength_pos" + #~ msgstr "fuerza_pos" + + #~ msgid "direction_pos" + #~ msgstr "dirección_pos" + + #~ msgid "distance_pos" + #~ msgstr "distancia_pos" Index: fi.po =================================================================== RCS file: /cvsroot/navit/navit/po/fi.po,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fi.po 18 Dec 2007 14:53:10 -0000 1.1 --- fi.po 24 Dec 2007 20:33:13 -0000 1.2 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-17 15:58+0300\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Ossi Berg <o....@ma...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-10 21:53+0200\n" "Last-Translator: Ossi Berg <o....@ma...>\n" *************** *** 17,20 **** --- 17,180 ---- "Plural-Forms: nplurals=2; plural=n != 1;\n" + #: ../src/main.c:94 + #, c-format + msgid "Running from source directory\n" + msgstr "Ajetaan lähdehakemistosta\n" + + #: ../src/main.c:110 + #, c-format + msgid "setting '%s' to '%s'\n" + msgstr "asetetaan '%s' arvoon '%s'\n" + + #: ../src/main.c:173 + #, c-format + msgid "No config file navit.xml, navit.xml.local found\n" + msgstr "Ei asetustiedostoita navit.xml tai navit.xml.local\n" + + #: ../src/main.c:177 + #, c-format + msgid "Error parsing '%s': %s\n" + msgstr "Virhe tulkitessa '%s': %s\n" + + #: ../src/main.c:180 + #, c-format + msgid "Using '%s'\n" + msgstr "Käytetään '%s'\n" + + #: ../src/main.c:183 + #, c-format + msgid "No instance has been created, exiting\n" + msgstr "Esimerkkiä ei tehty, lopetetaan\n" + + #: ../src/navigation.c:173 + #, c-format + msgid "%d m" + msgstr "%d m" + + #: ../src/navigation.c:175 + #, c-format + msgid "in %d m" + msgstr "%d m päästä" + + #: ../src/navigation.c:179 + #, c-format + msgid "%d meters" + msgstr "%d metriä" + + #: ../src/navigation.c:181 + #, c-format + msgid "in %d meters" + msgstr "%d metrin päästä" + + #: ../src/navigation.c:187 + #, c-format + msgid "%d.%d kilometer" + msgstr "%d,%d kilometri" + + #: ../src/navigation.c:189 + #, c-format + msgid "in %d.%d kilometers" + msgstr "%d,%d kilometrin päästä" + + #: ../src/navigation.c:193 + #, c-format + msgid "one kilometer" + msgid_plural "%d kilometers" + msgstr[0] "yksi kilometri" + msgstr[1] "%d kilometriä" + + #: ../src/navigation.c:195 + #, c-format + msgid "in one kilometer" + msgid_plural "in %d kilometers" + msgstr[0] "Kilometrin päästä" + msgstr[1] "%d kilometrin päästä" + + #: ../src/navigation.c:398 + msgid "right" + msgstr "vasemmalle" + + #: ../src/navigation.c:405 + msgid "left" + msgstr "oikealle" + + #: ../src/navigation.c:409 + msgid "easily " + msgstr "loivasti " + + #: ../src/navigation.c:413 + msgid "strongly " + msgstr "jyrkästi " + + #: ../src/navigation.c:416 + msgid "unknown " + msgstr "tuntematon " + + # + #: ../src/navigation.c:422 + msgid "When possible, please turn around" + msgstr "Käänny ympäri" + + #: ../src/navigation.c:429 + #, c-format + msgid "Follow the road for the next %s" + msgstr "Seuraa tätä tietä %s" + + #: ../src/navigation.c:433 + msgid "soon" + msgstr "pian" + + #: ../src/navigation.c:439 + msgid "now" + msgstr "nyt" + + #: ../src/navigation.c:442 + msgid "error" + msgstr "virhe" + + #. TRANSLATORS: The first argument is strength, the second direction and the third distance + #: ../src/navigation.c:446 + #, c-format + msgid "Turn %1$s%2$s %3$s" + msgstr "Käänny %3$s %1$s%2$s" + + #: ../src/navigation.c:449 + #, c-format + msgid "You have reached your destination %s" + msgstr "Olet saavuttanut kohteesi %s" + + #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 + msgid "Layout" + msgstr "Pohja" + + #: ../src/navit.c:630 + msgid "Projection" + msgstr "Projektio" + + #: ../src/navit.c:685 + msgid "Former Destinations" + msgstr "Aiemmat kohteet" + + #: ../src/navit.c:695 + msgid "Bookmarks" + msgstr "Kirjanmerkit" + + #: ../src/navit.c:733 + msgid "Vehicle" + msgstr "Kulkuneuvo" + + #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 + msgid "Roadbook" + msgstr "Ohjeistaja" + + #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 + #: ../src/gui/gtk/gui_gtk_action.c:184 + msgid "Map" + msgstr "Kartta" + + #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 + msgid "Route" + msgstr "Reitti" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 326,334 **** msgstr "Maakunta" - #: ../src/gui/gtk/destination.c:365 ../src/gui/gtk/gui_gtk_action.c:184 - #: ../src/navit.c:997 - msgid "Map" - msgstr "Kartta" - #: ../src/gui/gtk/destination.c:366 msgid "Bookmark" --- 486,489 ---- *************** *** 343,354 **** msgstr "Näyttö" - #: ../src/gui/gtk/gui_gtk_action.c:183 ../src/navit.c:1004 - msgid "Route" - msgstr "Reitti" - - #: ../src/gui/gtk/gui_gtk_action.c:185 ../src/navit.c:603 - msgid "Layout" - msgstr "Pohja" - #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" --- 498,501 ---- *************** *** 363,370 **** msgstr "Päivitä" - #: ../src/gui/gtk/gui_gtk_action.c:189 ../src/navit.c:778 - msgid "Roadbook" - msgstr "Ohjeistaja" - #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" --- 510,513 ---- *************** *** 427,594 **** msgstr "Tiepiirros" ! #: ../src/main.c:94 ! #, c-format ! msgid "Running from source directory\n" ! msgstr "Ajetaan lähdehakemistosta\n" ! ! #: ../src/main.c:110 ! #, c-format ! msgid "setting '%s' to '%s'\n" ! msgstr "asetetaan '%s' arvoon '%s'\n" ! ! #: ../src/main.c:170 ! #, c-format ! msgid "No config file navit.xml, navit.xml.local found\n" ! msgstr "Ei asetustiedostoita navit.xml tai navit.xml.local\n" ! ! #: ../src/main.c:174 ! #, c-format ! msgid "Error parsing '%s': %s\n" ! msgstr "Virhe tulkitessa '%s': %s\n" ! ! #: ../src/main.c:177 ! #, c-format ! msgid "Using '%s'\n" ! msgstr "Käytetään '%s'\n" ! ! #: ../src/main.c:180 ! #, c-format ! msgid "No instance has been created, exiting\n" ! msgstr "Esimerkkiä ei tehty, lopetetaan\n" ! ! #: ../src/navigation.c:173 ! #, c-format ! msgid "%d m" ! msgstr "%d m" ! ! #: ../src/navigation.c:175 ! #, c-format ! msgid "in %d m" ! msgstr "%d m päästä" ! ! #: ../src/navigation.c:179 ! #, c-format ! msgid "%d meters" ! msgstr "%d metriä" ! ! #: ../src/navigation.c:181 ! #, c-format ! msgid "in %d meters" ! msgstr "%d metrin päästä" ! ! #: ../src/navigation.c:187 ! #, c-format ! msgid "%d.%d kilometer" ! msgstr "%d,%d kilometri" ! ! #: ../src/navigation.c:189 ! #, c-format ! msgid "in %d.%d kilometers" ! msgstr "%d,%d kilometrin päästä" ! ! #: ../src/navigation.c:193 ! #, c-format ! msgid "one kilometer" ! msgid_plural "%d kilometers" ! msgstr[0] "yksi kilometri" ! msgstr[1] "%d kilometriä" ! ! #: ../src/navigation.c:195 ! #, c-format ! msgid "in one kilometer" ! msgid_plural "in %d kilometers" ! msgstr[0] "Kilometrin päästä" ! msgstr[1] "%d kilometrin päästä" ! ! #: ../src/navigation.c:398 ! msgid "right" ! msgstr "vasemmalle" ! ! #: ../src/navigation.c:405 ! msgid "left" ! msgstr "oikealle" ! ! #: ../src/navigation.c:409 ! msgid "easily " ! msgstr "loivasti " ! ! #: ../src/navigation.c:413 ! msgid "strongly " ! msgstr "jyrkästi " ! ! #: ../src/navigation.c:416 ! msgid "unknown " ! msgstr "tuntematon " ! ! # ! #: ../src/navigation.c:422 ! msgid "When possible, please turn around" ! msgstr "Käänny ympäri" ! ! #: ../src/navigation.c:429 ! #, c-format ! msgid "Follow the road for the next %s" ! msgstr "Seuraa tätä tietä %s" ! ! #: ../src/navigation.c:433 ! msgid "soon" ! msgstr "pian" ! ! #: ../src/navigation.c:439 ! msgid "now" ! msgstr "nyt" ! ! #: ../src/navigation.c:442 ! msgid "error" ! msgstr "virhe" ! ! #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 ! #, c-format ! msgid "Turn %1$s%2$s %3$s" ! msgstr "Käänny %3$s %1$s%2$s" ! ! #: ../src/navigation.c:449 ! #, c-format ! msgid "You have reached your destination %s" ! msgstr "Olet saavuttanut kohteesi %s" ! ! #: ../src/navit.c:619 ! msgid "Projection" ! msgstr "Projektio" ! ! #: ../src/navit.c:674 ! msgid "Former Destinations" ! msgstr "Aiemmat kohteet" ! ! #: ../src/navit.c:684 ! msgid "Bookmarks" ! msgstr "Kirjanmerkit" ! ! #: ../src/navit.c:722 ! msgid "Vehicle" ! msgstr "Kulkuneuvo" ! ! #: ../src/popup.c:229 ! #, c-format ! msgid "Point 0x%x 0x%x" ! msgstr "Piste 0x%x 0x%x" ! #: ../src/popup.c:230 ! #, c-format ! msgid "Screen %d %d" ! msgstr "Ruutu %d %d" ! #: ../src/popup.c:239 ! msgid "Set as position" ! msgstr "Aseta sijainniksi" ! #: ../src/popup.c:240 ! msgid "Set as destination" ! msgstr "Aseta kohteeksi" ! #: ../src/popup.c:241 ! msgid "Add as bookmark" ! msgstr "Lisää kirjanmerkiksi" #~ msgid "two kilometers" --- 570,587 ---- msgstr "Tiepiirros" ! #~ msgid "Point 0x%x 0x%x" ! #~ msgstr "Piste 0x%x 0x%x" ! #~ msgid "Screen %d %d" ! #~ msgstr "Ruutu %d %d" ! #~ msgid "Set as position" ! #~ msgstr "Aseta sijainniksi" ! #~ msgid "Set as destination" ! #~ msgstr "Aseta kohteeksi" ! #~ msgid "Add as bookmark" ! #~ msgstr "Lisää kirjanmerkiksi" #~ msgid "two kilometers" Index: pl.po =================================================================== RCS file: /cvsroot/navit/navit/po/pl.po,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pl.po 5 Nov 2007 23:54:29 -0000 1.8 --- pl.po 24 Dec 2007 20:33:13 -0000 1.9 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-09-29 01:53+0200\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" "Last-Translator: Michal Madej <mi...@qu...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-07-12 20:12+0100\n" [...1099 lines suppressed...] + #~ msgid "four kilometers" + #~ msgstr "cztery kilometry" + + #~ msgid "in four kilometers" + #~ msgstr "za cztery kilometry" + + #~ msgid "%d kilometers" + #~ msgstr "%d kilometrów" + + #~ msgid "in %d kilometers" + #~ msgstr "za %d kilometrów" + + #~ msgid "strength_pos" + #~ msgstr "siÅa_pos" + + #~ msgid "direction_pos" + #~ msgstr "kierunek_pos" + + #~ msgid "distance_pos" + #~ msgstr "odlegÅoÅÄ_pos" Index: no.po =================================================================== RCS file: /cvsroot/navit/navit/po/no.po,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** no.po 5 Nov 2007 23:54:29 -0000 1.10 --- no.po 24 Dec 2007 20:33:13 -0000 1.11 *************** *** 8,12 **** "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-11-05 21:44+0100\n" "PO-Revision-Date: 2007-10-30 16:26+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" --- 8,12 ---- "Project-Id-Version: Navit 0.0.3\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2007-12-24 21:15+0100\n" "PO-Revision-Date: 2007-10-30 16:26+0100\n" "Last-Translator: Bendik Brenne <be...@xp...>\n" *************** *** 26,44 **** msgstr "Bruker '%s'\n" ! #: ../src/main.c:170 ! msgid "No config file navit.xml or navit.xml.local found\n" msgstr "" ! #: ../src/main.c:172 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Feil ved parsing av '%s': %s\n" ! #: ../src/main.c:174 #, c-format msgid "Using '%s'\n" msgstr "Bruker '%s'\n" ! #: ../src/main.c:177 #, c-format msgid "No instance has been created, exiting\n" --- 26,45 ---- msgstr "Bruker '%s'\n" ! #: ../src/main.c:173 ! #, c-format ! msgid "No config file navit.xml, navit.xml.local found\n" msgstr "" ! #: ../src/main.c:177 #, c-format msgid "Error parsing '%s': %s\n" msgstr "Feil ved parsing av '%s': %s\n" ! #: ../src/main.c:180 #, c-format msgid "Using '%s'\n" msgstr "Bruker '%s'\n" ! #: ../src/main.c:183 #, c-format msgid "No instance has been created, exiting\n" *************** *** 75,192 **** msgstr "om %d,%d kilometer" ! #: ../src/navigation.c:195 msgid "one kilometer" ! msgstr "èn kilometer" ! #: ../src/navigation.c:197 msgid "in one kilometer" ! msgstr "om èn kilometer" ! ! #: ../src/navigation.c:200 ! msgid "two kilometers" ! msgstr "to kilometer" ! ! #: ../src/navigation.c:202 ! msgid "in two kilometers" ! msgstr "om to Kilometer" ! ! #: ../src/navigation.c:205 ! msgid "three kilometers" ! msgstr "tre kilometer" ! ! #: ../src/navigation.c:207 ! msgid "in three kilometers" ! msgstr "om tre kilometer" ! ! #: ../src/navigation.c:210 ! msgid "four kilometers" ! msgstr "fire kilometer" ! ! #: ../src/navigation.c:212 ! msgid "in four kilometers" ! msgstr "om fire kilometer" ! ! #: ../src/navigation.c:215 ! #, c-format ! msgid "%d kilometers" ! msgstr "%d kilometer" ! ! #: ../src/navigation.c:217 ! #, c-format ! msgid "in %d kilometers" ! msgstr "om %d kilometer" ! #: ../src/navigation.c:421 msgid "right" msgstr "høyre" ! #: ../src/navigation.c:429 msgid "left" msgstr "venstre" ! #: ../src/navigation.c:433 msgid "easily " msgstr "slakk " ! #: ../src/navigation.c:437 msgid "strongly " msgstr "skarp " ! #: ../src/navigation.c:440 msgid "unknown " msgstr "ukjent " ! #: ../src/navigation.c:446 #, fuzzy msgid "When possible, please turn around" msgstr "NÃ¥r mulig, vennligst sving" ! #: ../src/navigation.c:453 #, c-format msgid "Follow the road for the next %s" msgstr "Følg veien de neste %s" ! #: ../src/navigation.c:457 msgid "soon" msgstr "snart" ! #: ../src/navigation.c:463 msgid "now" msgstr "nÃ¥" ! #: ../src/navigation.c:466 msgid "error" msgstr "feil" ! #: ../src/navigation.c:471 ! msgid "strength_pos" ! msgstr "2" ! ! #: ../src/navigation.c:473 ! msgid "direction_pos" ! msgstr "3" ! ! #: ../src/navigation.c:475 ! msgid "distance_pos" ! msgstr "1" ! ! #: ../src/navigation.c:485 ! #, c-format ! msgid "Turn %s%s %s" msgstr "Sving %s%s %s" ! #: ../src/navigation.c:488 #, c-format msgid "You have reached your destination %s" msgstr "Du har nÃ¥dd ditt reisemÃ¥l %s" ! #: ../src/navit.c:449 ../src/gui/gtk/gui_gtk_action.c:180 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:462 msgid "Projection" msgstr "Projeksjon" #: ../src/country.c:24 msgid "Czech Republic" --- 76,180 ---- msgstr "om %d,%d kilometer" ! #: ../src/navigation.c:193 ! #, fuzzy, c-format msgid "one kilometer" ! msgid_plural "%d kilometers" ! msgstr[0] "èn kilometer" ! msgstr[1] "èn kilometer" ! #: ../src/navigation.c:195 ! #, fuzzy, c-format msgid "in one kilometer" ! msgid_plural "in %d kilometers" ! msgstr[0] "om èn kilometer" ! msgstr[1] "om èn kilometer" ! #: ../src/navigation.c:398 msgid "right" msgstr "høyre" ! #: ../src/navigation.c:405 msgid "left" msgstr "venstre" ! #: ../src/navigation.c:409 msgid "easily " msgstr "slakk " ! #: ../src/navigation.c:413 msgid "strongly " msgstr "skarp " ! #: ../src/navigation.c:416 msgid "unknown " msgstr "ukjent " ! #: ../src/navigation.c:422 #, fuzzy msgid "When possible, please turn around" msgstr "NÃ¥r mulig, vennligst sving" ! #: ../src/navigation.c:429 #, c-format msgid "Follow the road for the next %s" msgstr "Følg veien de neste %s" ! #: ../src/navigation.c:433 msgid "soon" msgstr "snart" ! #: ../src/navigation.c:439 msgid "now" msgstr "nÃ¥" ! #: ../src/navigation.c:442 msgid "error" msgstr "feil" ! #. TRANSLATORS: The first argument is strength, the second direction and the third distance ! #: ../src/navigation.c:446 ! #, fuzzy, c-format ! msgid "Turn %1$s%2$s %3$s" msgstr "Sving %s%s %s" ! #: ../src/navigation.c:449 #, c-format msgid "You have reached your destination %s" msgstr "Du har nÃ¥dd ditt reisemÃ¥l %s" ! #: ../src/navit.c:614 ../src/gui/gtk/gui_gtk_action.c:185 msgid "Layout" msgstr "Layout" ! #: ../src/navit.c:630 msgid "Projection" msgstr "Projeksjon" + #: ../src/navit.c:685 + #, fuzzy + msgid "Former Destinations" + msgstr "Destinasjon" + + #: ../src/navit.c:695 + msgid "Bookmarks" + msgstr "" + + #: ../src/navit.c:733 + msgid "Vehicle" + msgstr "" + + #: ../src/navit.c:789 ../src/gui/gtk/gui_gtk_action.c:189 + msgid "Roadbook" + msgstr "Kjørebok" + + #: ../src/navit.c:1009 ../src/gui/gtk/destination.c:365 + #: ../src/gui/gtk/gui_gtk_action.c:184 + msgid "Map" + msgstr "Kart" + + #: ../src/navit.c:1016 ../src/gui/gtk/gui_gtk_action.c:183 + msgid "Route" + msgstr "Rute" + #: ../src/country.c:24 msgid "Czech Republic" *************** *** 438,550 **** msgstr "Svalbard og Jan Mayen" ! #: ../src/gui/gtk/destination.c:325 msgid "Country" msgstr "Land" ! #: ../src/gui/gtk/destination.c:327 msgid "Zip Code" msgstr "Postnummer" ! #: ../src/gui/gtk/destination.c:329 msgid "City" msgstr "By" ! #: ../src/gui/gtk/destination.c:331 msgid "District/Township" msgstr "Distrikt/Kommune" ! #: ../src/gui/gtk/destination.c:334 ! msgid "Street" ! msgstr "Gate" ! #: ../src/gui/gtk/destination.c:336 ! msgid "Number" ! msgstr "Nummer" ! #: ../src/gui/gtk/gui_gtk_action.c:177 msgid "Display" msgstr "Display" ! #: ../src/gui/gtk/gui_gtk_action.c:178 ! msgid "Route" ! msgstr "Rute" ! ! #: ../src/gui/gtk/gui_gtk_action.c:179 ! msgid "Map" ! msgstr "Kart" ! ! #: ../src/gui/gtk/gui_gtk_action.c:181 msgid "ZoomOut" msgstr "ZoomUt" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "ZoomIn" msgstr "ZoomInn" ! #: ../src/gui/gtk/gui_gtk_action.c:183 msgid "Refresh" msgstr "Oppdater" ! #: ../src/gui/gtk/gui_gtk_action.c:184 ! msgid "Roadbook" ! msgstr "Kjørebok" ! ! #: ../src/gui/gtk/gui_gtk_action.c:186 ../src/gui/gtk/gui_gtk_action.c:188 msgid "Info" msgstr "Info" ! #: ../src/gui/gtk/gui_gtk_action.c:190 ! msgid "Destination" ! msgstr "Destinasjon" ! ! #: ../src/gui/gtk/gui_gtk_action.c:191 msgid "Clear" msgstr "Fjern" ! #: ../src/gui/gtk/gui_gtk_action.c:192 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:193 msgid "_Quit" msgstr "Avslutt" ! #: ../src/gui/gtk/gui_gtk_action.c:200 msgid "Cursor" msgstr "Markør" ! #: ../src/gui/gtk/gui_gtk_action.c:201 msgid "Tracking" msgstr "Sporing" ! #: ../src/gui/gtk/gui_gtk_action.c:202 msgid "Orientation" msgstr "Orientering" ! #: ../src/gui/gtk/gui_gtk_action.c:204 ../src/gui/gtk/gui_gtk_action.c:206 msgid "Fullscreen" msgstr "Fullskjerm" ! #: ../src/gui/gtk/gui_gtk_action.c:214 msgid "Data" msgstr "Data" ! #: ../src/gui/gtk/gui_gtk_action.c:215 msgid "VisibleBlocks" msgstr "Synlige blokker" ! #: ../src/gui/gtk/gui_gtk_action.c:216 msgid "VisibleTowns" msgstr "Synlige byer" ! #: ../src/gui/gtk/gui_gtk_action.c:217 msgid "VisiblePolys" msgstr "Synlige polygon" ! #: ../src/gui/gtk/gui_gtk_action.c:218 msgid "VisibleStreets" msgstr "Synlige gater" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "VisiblePoints" msgstr "Synlige punkt" --- 426,605 ---- msgstr "Svalbard og Jan Mayen" ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:100 ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "Car" ! msgstr "Fjern" ! ! #: ../src/gui/gtk/destination.c:99 ! msgid "Iso2" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:99 ! msgid "Iso3" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:99 ../src/gui/gtk/destination.c:331 msgid "Country" msgstr "Land" ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "Postal" ! msgstr "Portugal" ! ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! msgid "Town" ! msgstr "" ! ! #: ../src/gui/gtk/destination.c:100 ../src/gui/gtk/destination.c:101 ! #: ../src/gui/gtk/destination.c:102 ! #, fuzzy ! msgid "District" ! msgstr "Distrikt/Kommune" ! ! #: ../src/gui/gtk/destination.c:101 ../src/gui/gtk/destination.c:102 ! #: ../src/gui/gtk/destination.c:340 ! msgid "Street" ! msgstr "Gate" ! ! #: ../src/gui/gtk/destination.c:102 ../src/gui/gtk/destination.c:342 ! msgid "Number" ! msgstr "Nummer" ! ! #: ../src/gui/gtk/destination.c:326 ! #, fuzzy ! msgid "Enter Destination" ! msgstr "Destinasjon" ! ! #: ../src/gui/gtk/destination.c:333 msgid "Zip Code" msgstr "Postnummer" ! #: ../src/gui/gtk/destination.c:335 msgid "City" msgstr "By" ! #: ../src/gui/gtk/destination.c:337 msgid "District/Township" msgstr "Distrikt/Kommune" ! #: ../src/gui/gtk/destination.c:366 ! msgid "Bookmark" ! msgstr "" ! #: ../src/gui/gtk/destination.c:367 ../src/gui/gtk/gui_gtk_action.c:195 ! msgid "Destination" ! msgstr "Destinasjon" ! #: ../src/gui/gtk/gui_gtk_action.c:182 msgid "Display" msgstr "Display" ! #: ../src/gui/gtk/gui_gtk_action.c:186 msgid "ZoomOut" msgstr "ZoomUt" ! #: ../src/gui/gtk/gui_gtk_action.c:187 msgid "ZoomIn" msgstr "ZoomInn" ! #: ../src/gui/gtk/gui_gtk_action.c:188 msgid "Refresh" msgstr "Oppdater" ! #: ../src/gui/gtk/gui_gtk_action.c:191 ../src/gui/gtk/gui_gtk_action.c:193 msgid "Info" msgstr "Info" ! #: ../src/gui/gtk/gui_gtk_action.c:196 msgid "Clear" msgstr "Fjern" ! #: ../src/gui/gtk/gui_gtk_action.c:197 msgid "Test" msgstr "Test" ! #: ../src/gui/gtk/gui_gtk_action.c:198 msgid "_Quit" msgstr "Avslutt" ! #: ../src/gui/gtk/gui_gtk_action.c:205 msgid "Cursor" msgstr "Markør" ! #: ../src/gui/gtk/gui_gtk_action.c:206 msgid "Tracking" msgstr "Sporing" ! #: ../src/gui/gtk/gui_gtk_action.c:207 msgid "Orientation" msgstr "Orientering" ! #: ../src/gui/gtk/gui_gtk_action.c:209 ../src/gui/gtk/gui_gtk_action.c:211 msgid "Fullscreen" msgstr "Fullskjerm" ! #: ../src/gui/gtk/gui_gtk_action.c:219 msgid "Data" msgstr "Data" ! #: ../src/gui/gtk/gui_gtk_action.c:220 msgid "VisibleBlocks" msgstr "Synlige blokker" ! #: ../src/gui/gtk/gui_gtk_action.c:221 msgid "VisibleTowns" msgstr "Synlige byer" ! #: ../src/gui/gtk/gui_gtk_action.c:222 msgid "VisiblePolys" msgstr "Synlige polygon" ! #: ../src/gui/gtk/gui_gtk_action.c:223 msgid "VisibleStreets" msgstr "Synlige gater" ! #: ../src/gui/gtk/gui_gtk_action.c:224 msgid "VisiblePoints" msgstr "Synlige punkt" + + #: ../src/gui/gtk/gui_gtk_action.c:225 + #, fuzzy + msgid "RouteGr... [truncated message content] |
|
From: Martin S. <mar...@us...> - 2007-12-21 14:10:21
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25445 Modified Files: graphics.c map.h navit.c transform.c Log Message: More bugfixes Index: graphics.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** graphics.c 20 Dec 2007 20:39:48 -0000 1.24 --- graphics.c 21 Dec 2007 14:10:10 -0000 1.25 *************** *** 482,493 **** continue; } ! count=transform(t, pro, ca, pnt, count, ! item->type < type_line ? 1 : (item->type < type_area ? 5 : 7)); ! if (!count) { ! dbg(1,"not visible\n"); ! continue; } if (count == max) dbg(0,"point count overflow\n", count); if (item->type >= type_line && count < 2) { dbg(1,"poly from transform has only %d points\n", count); --- 482,504 ---- continue; } ! if (item->type < type_line) { ! if (! map_selection_contains_point(sel, &ca[0])) { ! dbg(1,"point not visible\n"); ! continue; ! } ! } else if (item->type < type_area) { ! if (! map_selection_contains_polyline(sel, ca, count)) { ! dbg(1,"polyline not visible\n"); ! continue; ! } ! } else { ! if (! map_selection_contains_polygon(sel, ca, count)) { ! dbg(1,"polygon not visible\n"); ! continue; ! } } if (count == max) dbg(0,"point count overflow\n", count); + count=transform(t, pro, ca, pnt, count, 1); if (item->type >= type_line && count < 2) { dbg(1,"poly from transform has only %d points\n", count); Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** navit.c 20 Dec 2007 21:17:44 -0000 1.55 --- navit.c 21 Dec 2007 14:10:12 -0000 1.56 *************** *** 1144,1147 **** --- 1144,1150 ---- int border=16; + if (! this_->ready) + return; + if (! vehicle_position_attr_get(nv->vehicle, attr_position_direction, &attr_dir) || ! vehicle_position_attr_get(nv->vehicle, attr_position_speed, &attr_speed) || *************** *** 1171,1176 **** } ! if ((!transform(this_->trans, pro, &nv->coord, &cursor_pnt, 1, 1) || ! !transform_within_border(this_->trans, &cursor_pnt, border))) { if (!this_->cursor_flag) return; --- 1174,1179 ---- } ! transform(this_->trans, pro, &nv->coord, &cursor_pnt, 1, 0); ! if (!transform_within_border(this_->trans, &cursor_pnt, border)) { if (!this_->cursor_flag) return; Index: transform.c =================================================================== RCS file: /cvsroot/navit/navit/src/transform.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** transform.c 20 Dec 2007 21:17:44 -0000 1.15 --- transform.c 21 Dec 2007 14:10:16 -0000 1.16 *************** *** 71,75 **** int ! transform(struct transformation *t, enum projection pro, struct coord *c, struct point *p, int count, int flags) { struct coord c1; --- 71,75 ---- int ! transform(struct transformation *t, enum projection pro, struct coord *c, struct point *p, int count, int unique) { struct coord c1; *************** *** 82,99 **** #endif int i,j = 0; - if (flags & 1) { - if (count == 1) { - if (!map_selection_contains_point(t->map_sel, &c[0])) - return 0; - } else { - if (flags & 2) { - if (!map_selection_contains_polygon(t->map_sel, c, count)) - return 0; - } else { - if (!map_selection_contains_polyline(t->map_sel, c, count)) - return 0; - } - } - } for (i=0; i < count; i++) { if (pro == t->pro) { --- 82,85 ---- *************** *** 141,145 **** if (yc > 0x7fff) yc=0x7fff; ! if (j == 0 || !(flags & 4) || p[j-1].x != xc || p[j-1].y != yc) { p[j].x=xc; p[j].y=yc; --- 127,131 ---- if (yc > 0x7fff) yc=0x7fff; ! if (j == 0 || !unique || p[j-1].x != xc || p[j-1].y != yc) { p[j].x=xc; p[j].y=yc; *************** *** 281,286 **** transform_get_size(struct transformation *t, int *width, int *height) { ! struct coord_rect *r=&t->screen_sel->u.p_rect; ! *width=r->rl.x-r->lu.y; *height=r->rl.y-r->lu.y; } --- 267,272 ---- transform_get_size(struct transformation *t, int *width, int *height) { ! struct point_rect *r=&t->screen_sel->u.p_rect; ! *width=r->rl.x-r->lu.x; *height=r->rl.y-r->lu.y; } Index: map.h =================================================================== RCS file: /cvsroot/navit/navit/src/map.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** map.h 20 Dec 2007 20:39:48 -0000 1.10 --- map.h 21 Dec 2007 14:10:10 -0000 1.11 *************** *** 45,49 **** struct coord_rect *r=&curr->u.c_rect; if (c->x >= r->lu.x && c->x <= r->rl.x && ! c->y >= r->lu.y && c->y <= r->rl.y) return 1; curr=curr->next; --- 45,49 ---- struct coord_rect *r=&curr->u.c_rect; if (c->x >= r->lu.x && c->x <= r->rl.x && ! c->y <= r->lu.y && c->y >= r->rl.y) return 1; curr=curr->next; |
|
From: KaZeR <ka...@us...> - 2007-12-21 10:51:01
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24596/src/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fixed height display in SDL with new vehicle modules Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** gui_sdl_window.cpp 20 Dec 2007 20:39:48 -0000 1.40 --- gui_sdl_window.cpp 21 Dec 2007 10:51:03 -0000 1.41 *************** *** 725,730 **** CEGUI::WindowManager::getSingleton().getWindow("OSD/SpeedoMeter")->setText(buffer); ! if (vehicle_position_attr_get(v, attr_position_speed, &attr)) ! sprintf (buffer, ".0f m", *attr.u.numd); else strcpy (buffer, "N/A"); --- 725,730 ---- CEGUI::WindowManager::getSingleton().getWindow("OSD/SpeedoMeter")->setText(buffer); ! if (vehicle_position_attr_get(v, attr_position_height, &attr)) ! sprintf (buffer, "%.f m", *attr.u.numd); else strcpy (buffer, "N/A"); |
|
From: Martin S. <mar...@us...> - 2007-12-20 21:17:42
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10875 Modified Files: navit.c navit.xml transform.c transform.h Log Message: More bugfixes Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** navit.c 20 Dec 2007 20:44:42 -0000 1.54 --- navit.c 20 Dec 2007 21:17:44 -0000 1.55 *************** *** 212,218 **** if (this_->moved) { struct point p; - #if 0 transform_get_size(this_->trans, &p.x, &p.y); - #endif p.x/=2; p.y/=2; --- 212,216 ---- *************** *** 1057,1061 **** navit_set_center_cursor(struct navit *this_, struct coord *cursor, int dir, int xpercent, int ypercent) { - #if 0 struct coord *c=transform_center(this_->trans); int width, height; --- 1055,1058 ---- *************** *** 1072,1077 **** if (this_->ready) navit_draw(this_); - #endif - } --- 1069,1072 ---- Index: navit.xml =================================================================== RCS file: /cvsroot/navit/navit/src/navit.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** navit.xml 18 Dec 2007 20:17:54 -0000 1.20 --- navit.xml 20 Dec 2007 21:17:44 -0000 1.21 *************** *** 2,6 **** <!DOCTYPE navit SYSTEM "navit.dtd"> <plugins> ! <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" /> <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no" /> </plugins> --- 2,6 ---- <!DOCTYPE navit SYSTEM "navit.dtd"> <plugins> ! <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"/> <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no" /> </plugins> Index: transform.h =================================================================== RCS file: /cvsroot/navit/navit/src/transform.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** transform.h 20 Dec 2007 20:39:48 -0000 1.9 --- transform.h 20 Dec 2007 21:17:44 -0000 1.10 *************** *** 10,13 **** --- 10,14 ---- struct coord_geo; struct map_selection; + struct pcoord; struct point; struct transformation; *************** *** 19,26 **** --- 20,30 ---- enum projection transform_get_projection(struct transformation *this_); void transform_set_projection(struct transformation *this_, enum projection pro); + struct map_selection *transform_get_selection(struct transformation *this_, enum projection pro, int order); struct coord *transform_center(struct transformation *this_); void transform_set_angle(struct transformation *t, int angle); int transform_get_angle(struct transformation *this_, int angle); void transform_set_screen_selection(struct transformation *t, struct map_selection *sel); + void transform_get_size(struct transformation *t, int *width, int *height); + void transform_setup(struct transformation *t, struct pcoord *c, int scale, int angle); void transform_setup_source_rect(struct transformation *t); long transform_get_scale(struct transformation *t); *************** *** 34,41 **** int transform_distance_polyline_sq(struct coord *c, int count, struct coord *ref, struct coord *lpnt, int *pos); void transform_print_deg(double deg); - int transform_contains_polygon(struct transformation *t, struct coord *c, int count); - int transform_contains_polyline(struct transformation *t, struct coord *c, int count); - int transform_contains_point(struct transformation *t, struct coord *c); - int is_too_small(struct transformation *t, struct coord *c, int limit); int transform_get_angle_delta(struct coord *c1, struct coord *c2, int dir); int transform_within_border(struct transformation *this_, struct point *p, int border); --- 38,41 ---- Index: transform.c =================================================================== RCS file: /cvsroot/navit/navit/src/transform.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** transform.c 20 Dec 2007 20:39:48 -0000 1.14 --- transform.c 20 Dec 2007 21:17:44 -0000 1.15 *************** *** 278,289 **** #endif - #if 0 void transform_get_size(struct transformation *t, int *width, int *height) { ! *width=t->width; ! *height=t->height; } - #endif void --- 278,288 ---- #endif void transform_get_size(struct transformation *t, int *width, int *height) { ! struct coord_rect *r=&t->screen_sel->u.p_rect; ! *width=r->rl.x-r->lu.y; ! *height=r->rl.y-r->lu.y; } void |
|
From: Martin S. <mar...@us...> - 2007-12-20 20:44:40
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28361 Modified Files: navit.c Log Message: Bugfix Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** navit.c 20 Dec 2007 20:39:48 -0000 1.53 --- navit.c 20 Dec 2007 20:44:42 -0000 1.54 *************** *** 158,165 **** struct map_selection sel; memset(&sel, 0, sizeof(sel)); ! sel.u.p_rect.lu.x=w/4; ! sel.u.p_rect.lu.y=h/4; ! sel.u.p_rect.rl.x=w*3/4; ! sel.u.p_rect.rl.y=h*3/4; transform_set_screen_selection(this_->trans, &sel); navit_draw(this_); --- 158,163 ---- struct map_selection sel; memset(&sel, 0, sizeof(sel)); ! sel.u.p_rect.rl.x=w; ! sel.u.p_rect.rl.y=h; transform_set_screen_selection(this_->trans, &sel); navit_draw(this_); |
|
From: Martin S. <mar...@us...> - 2007-12-20 20:39:54
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26258/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Made viewport more flexible Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** gui_sdl_window.cpp 18 Dec 2007 19:36:57 -0000 1.39 --- gui_sdl_window.cpp 20 Dec 2007 20:39:48 -0000 1.40 *************** *** 22,25 **** --- 22,26 ---- #include "track.h" #include "menu.h" + #include "map.h" *************** *** 180,188 **** char fps [12]; ! struct transformation *t; ! ! t=navit_get_trans(this_->nav); ! transform_set_size(t, 800, 600); navit_draw(this_->nav); --- 181,191 ---- char fps [12]; ! struct map_selection sel; ! memset(&sel, 0, sizeof(sel)); ! sel.u.c_rect.rl.x=800; ! sel.u.c_rect.rl.y=600; ! ! transform_set_screen_selection(navit_get_trans(this_->nav), &sel); navit_draw(this_->nav); |
|
From: Martin S. <mar...@us...> - 2007-12-20 20:39:50
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26258 Modified Files: graphics.c map.c map.h navit.c route.c transform.c transform.h Log Message: Made viewport more flexible Index: transform.h =================================================================== RCS file: /cvsroot/navit/navit/src/transform.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** transform.h 22 Nov 2007 19:37:27 -0000 1.8 --- transform.h 20 Dec 2007 20:39:48 -0000 1.9 *************** *** 8,14 **** enum projection; struct coord; - struct pcoord; struct coord_geo; ! struct coord_rect; struct point; struct transformation; --- 8,13 ---- enum projection; struct coord; struct coord_geo; ! struct map_selection; struct point; struct transformation; *************** *** 16,33 **** void transform_to_geo(enum projection pro, struct coord *c, struct coord_geo *g); void transform_from_geo(enum projection pro, struct coord_geo *g, struct coord *c); ! int transform(struct transformation *t, enum projection pro, struct coord *c, struct point *p); ! int transform_array(struct transformation *t, enum projection pro, struct coord *c, struct point *p, int count, int uniq); void transform_reverse(struct transformation *t, struct point *p, struct coord *c); enum projection transform_get_projection(struct transformation *this_); void transform_set_projection(struct transformation *this_, enum projection pro); - void transform_rect(struct transformation *this_, enum projection pro, struct coord_rect *r); struct coord *transform_center(struct transformation *this_); - int transform_contains(struct transformation *this_, enum projection pro, struct coord_rect *r); void transform_set_angle(struct transformation *t, int angle); int transform_get_angle(struct transformation *this_, int angle); ! void transform_set_size(struct transformation *t, int width, int height); ! void transform_get_size(struct transformation *t, int *width, int *height); ! void transform_setup(struct transformation *t, struct pcoord *c, int scale, int angle); ! void transform_setup_source_rect_limit(struct transformation *t, struct coord *center, int limit); void transform_setup_source_rect(struct transformation *t); long transform_get_scale(struct transformation *t); --- 15,26 ---- void transform_to_geo(enum projection pro, struct coord *c, struct coord_geo *g); void transform_from_geo(enum projection pro, struct coord_geo *g, struct coord *c); ! int transform(struct transformation *t, enum projection pro, struct coord *c, struct point *p, int count, int flags); void transform_reverse(struct transformation *t, struct point *p, struct coord *c); enum projection transform_get_projection(struct transformation *this_); void transform_set_projection(struct transformation *this_, enum projection pro); struct coord *transform_center(struct transformation *this_); void transform_set_angle(struct transformation *t, int angle); int transform_get_angle(struct transformation *this_, int angle); ! void transform_set_screen_selection(struct transformation *t, struct map_selection *sel); void transform_setup_source_rect(struct transformation *t); long transform_get_scale(struct transformation *t); *************** *** 41,47 **** int transform_distance_polyline_sq(struct coord *c, int count, struct coord *ref, struct coord *lpnt, int *pos); void transform_print_deg(double deg); ! int is_visible(struct transformation *t, struct coord *c); ! int is_line_visible(struct transformation *t, struct coord *c); ! int is_point_visible(struct transformation *t, struct coord *c); int is_too_small(struct transformation *t, struct coord *c, int limit); int transform_get_angle_delta(struct coord *c1, struct coord *c2, int dir); --- 34,40 ---- int transform_distance_polyline_sq(struct coord *c, int count, struct coord *ref, struct coord *lpnt, int *pos); void transform_print_deg(double deg); ! int transform_contains_polygon(struct transformation *t, struct coord *c, int count); ! int transform_contains_polyline(struct transformation *t, struct coord *c, int count); ! int transform_contains_point(struct transformation *t, struct coord *c); int is_too_small(struct transformation *t, struct coord *c, int limit); int transform_get_angle_delta(struct coord *c1, struct coord *c2, int dir); Index: route.c =================================================================== RCS file: /cvsroot/navit/navit/src/route.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** route.c 11 Dec 2007 23:43:10 -0000 1.28 --- route.c 20 Dec 2007 20:39:48 -0000 1.29 *************** *** 1415,1422 **** { struct route_info_handle *h; ! struct coord *c; ! struct coord_rect r; struct item item; ! struct point pnt[100]; int count=0; struct street_data *street; --- 1415,1423 ---- { struct route_info_handle *h; ! struct coord *cp; struct item item; ! int max=100; ! struct coord c[max]; ! struct point pnt[max]; int count=0; struct street_data *street; *************** *** 1439,1453 **** if (pos) dbg(1, "pos=%p pos->dir=%d pos->pos=%d\n", pos, pos->dir, pos->pos); ! c=route_info_get(h); ! r.lu=*c; ! r.rl=*c; ! while (c && count < 100) { ! dbg(1,"c=%p (0x%x,0x%x)\n", c, c->x, c->y); ! transform(t, pro, c, &pnt[count++]); ! coord_rect_extend(&r, c); ! c=route_info_get(h); ! ! } ! if (count && transform_contains(t, pro, &r)) display_add(dsp, &item, count, pnt, "Route"); route_info_close(h); --- 1440,1448 ---- if (pos) dbg(1, "pos=%p pos->dir=%d pos->pos=%d\n", pos, pos->dir, pos->pos); ! while ((cp=route_info_get(h)) && count < max) ! c[count++]=*cp; ! if (count) ! count=transform(t, pro, c, pnt, count, 1); ! if (count) display_add(dsp, &item, count, pnt, "Route"); route_info_close(h); Index: transform.c =================================================================== RCS file: /cvsroot/navit/navit/src/transform.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** transform.c 19 Dec 2007 23:46:36 -0000 1.13 --- transform.c 20 Dec 2007 20:39:48 -0000 1.14 *************** *** 7,10 **** --- 7,11 ---- #include "coord.h" #include "debug.h" + #include "map.h" #include "transform.h" #include "projection.h" *************** *** 12,23 **** struct transformation { - int width; /* Height of destination rectangle */ - int height; /* Width of destination rectangle */ long scale; /* Scale factor */ int angle; /* Rotation angle */ double cos_val,sin_val; /* cos and sin of rotation angle */ enum projection pro; ! struct coord_rect r; /* Source rectangle */ ! struct coord center; /* Center of source rectangle */ }; --- 13,24 ---- struct transformation { long scale; /* Scale factor */ int angle; /* Rotation angle */ double cos_val,sin_val; /* cos and sin of rotation angle */ enum projection pro; ! struct map_selection *map_sel; ! struct map_selection *screen_sel; ! struct point screen_center; ! struct coord map_center; /* Center of source rectangle */ }; *************** *** 70,140 **** int ! transform(struct transformation *t, enum projection pro, struct coord *c, struct point *p) ! { ! struct coord c1; ! #ifdef AVOID_FLOAT ! int xc,yc; ! #else ! double xc,yc; ! #endif ! int ret; ! if (pro != t->pro) { ! struct coord_geo g; ! transform_to_geo(pro, c, &g); ! transform_from_geo(t->pro, &g, &c1); ! c=&c1; ! } ! xc=c->x; ! yc=c->y; ! dbg(2,"0x%x, 0x%x - 0x%x,0x%x contains 0x%x,0x%x\n", t->r.lu.x, t->r.lu.y, t->r.rl.x, t->r.rl.y, c->x, c->y); ! ret=coord_rect_contains(&t->r, c); ! xc-=t->center.x; ! yc-=t->center.y; ! yc=-yc; ! if (t->angle) { ! int xcn, ycn; ! xcn=xc*t->cos_val+yc*t->sin_val; ! ycn=-xc*t->sin_val+yc*t->cos_val; ! xc=xcn; ! yc=ycn; ! } ! #ifndef AVOID_FLOAT ! xc=xc*16.0/(double)(t->scale); ! yc=yc*16.0/(double)(t->scale); ! #else ! xc=xc*16/t->scale; ! yc=yc*16/t->scale; ! #endif ! #if 0 ! { ! double zc=yc; ! if (zc < 10 && zc > 10) ! zc=10; ! return 0; ! yc=300; ! xc/=(-zc+1000.0)/1000.0; ! yc/=(-zc+1000.0)/1000.0; ! xc+=t->width/2; ! } ! #else ! yc+=t->height/2; ! xc+=t->width/2; ! #endif ! if (xc < -0x8000) ! xc=-0x8000; ! if (xc > 0x7fff) { ! xc=0x7fff; ! } ! if (yc < -0x8000) ! yc=-0x8000; ! if (yc > 0x7fff) ! yc=0x7fff; ! p->x=xc; ! p->y=yc; ! return ret; ! } ! ! int ! transform_array(struct transformation *t, enum projection pro, struct coord *c, struct point *p, int count, int uniq) { struct coord c1; --- 71,75 ---- int ! transform(struct transformation *t, enum projection pro, struct coord *c, struct point *p, int count, int flags) { struct coord c1; *************** *** 147,150 **** --- 82,99 ---- #endif int i,j = 0; + if (flags & 1) { + if (count == 1) { + if (!map_selection_contains_point(t->map_sel, &c[0])) + return 0; + } else { + if (flags & 2) { + if (!map_selection_contains_polygon(t->map_sel, c, count)) + return 0; + } else { + if (!map_selection_contains_polyline(t->map_sel, c, count)) + return 0; + } + } + } for (i=0; i < count; i++) { if (pro == t->pro) { *************** *** 159,164 **** // dbg(2,"0x%x, 0x%x - 0x%x,0x%x contains 0x%x,0x%x\n", t->r.lu.x, t->r.lu.y, t->r.rl.x, t->r.rl.y, c->x, c->y); // ret=coord_rect_contains(&t->r, c); ! xc-=t->center.x; ! yc-=t->center.y; yc=-yc; if (t->angle) { --- 108,113 ---- // dbg(2,"0x%x, 0x%x - 0x%x,0x%x contains 0x%x,0x%x\n", t->r.lu.x, t->r.lu.y, t->r.rl.x, t->r.rl.y, c->x, c->y); // ret=coord_rect_contains(&t->r, c); ! xc-=t->map_center.x; ! yc-=t->map_center.y; yc=-yc; if (t->angle) { *************** *** 181,186 **** } #endif ! yc+=t->height>>1; ! xc+=t->width>>1; if (xc < -0x8000) xc=-0x8000; --- 130,135 ---- } #endif ! xc+=t->screen_center.x; ! yc+=t->screen_center.y; if (xc < -0x8000) xc=-0x8000; *************** *** 192,216 **** if (yc > 0x7fff) yc=0x7fff; ! if (uniq) { ! if (i) { ! if (p[j].x != xc || p[j].y != yc) { ! j++; ! p[j].x=xc; ! p[j].y=yc; ! } ! } else { ! p[j].x=xc; ! p[j].y=yc; ! } ! } else { ! p[i].x=xc; ! p[i].y=yc; } } ! ! if (uniq) ! return 1+j; ! ! return count; } --- 141,151 ---- if (yc > 0x7fff) yc=0x7fff; ! if (j == 0 || !(flags & 4) || p[j-1].x != xc || p[j-1].y != yc) { ! p[j].x=xc; ! p[j].y=yc; ! j++; } } ! return j; } *************** *** 221,226 **** xc=p->x; yc=p->y; ! xc-=t->width/2; ! yc-=t->height/2; xc=xc*t->scale/16; yc=-yc*t->scale/16; --- 156,161 ---- xc=p->x; yc=p->y; ! xc-=t->screen_center.x; ! yc-=t->screen_center.y; xc=xc*t->scale/16; yc=-yc*t->scale/16; *************** *** 232,237 **** yc=ycn; } ! c->x=t->center.x+xc; ! c->y=t->center.y+yc; } --- 167,172 ---- yc=ycn; } ! c->x=t->map_center.x+xc; ! c->y=t->map_center.y+yc; } *************** *** 274,292 **** } ! void ! transform_rect(struct transformation *this_, enum projection pro, struct coord_rect *r) { struct coord_geo g; ! if (0 && this_->pro == pro) { ! *r=this_->r; ! } else { ! transform_to_geo(this_->pro, &this_->r.lu, &g); ! transform_from_geo(pro, &g, &r->lu); ! dbg(1,"%f,%f", g.lat, g.lng); ! transform_to_geo(this_->pro, &this_->r.rl, &g); ! dbg(1,": - %f,%f\n", g.lat, g.lng); ! transform_from_geo(pro, &g, &r->rl); } ! dbg(1,"transform rect for %d is %d,%d - %d,%d\n", pro, r->lu.x, r->lu.y, r->rl.x, r->rl.y); } --- 209,239 ---- } ! struct map_selection * ! transform_get_selection(struct transformation *this_, enum projection pro, int order) { + + struct map_selection *ret,*curri,*curro; struct coord_geo g; ! int i; ! ! ret=map_selection_dup(this_->map_sel); ! curri=this_->map_sel; ! curro=ret; ! while (curri) { ! if (this_->pro != pro) { ! transform_to_geo(this_->pro, &curri->u.c_rect.lu, &g); ! transform_from_geo(pro, &g, &curro->u.c_rect.lu); ! dbg(1,"%f,%f", g.lat, g.lng); ! transform_to_geo(this_->pro, &curri->u.c_rect.rl, &g); ! transform_from_geo(pro, &g, &curro->u.c_rect.rl); ! dbg(1,": - %f,%f\n", g.lat, g.lng); ! } ! dbg(1,"transform rect for %d is %d,%d - %d,%d\n", pro, curro->u.c_rect.lu.x, curro->u.c_rect.lu.y, curro->u.c_rect.rl.x, curro->u.c_rect.rl.y); ! for (i = 0 ; i < layer_end ; i++) ! curro->order[i]+=order; ! curri=curri->next; ! curro=curro->next; } ! return ret; } *************** *** 294,314 **** transform_center(struct transformation *this_) { ! return &this_->center; ! } ! ! int ! transform_contains(struct transformation *this_, enum projection pro, struct coord_rect *r) ! { ! struct coord_geo g; ! struct coord_rect r1; ! if (this_->pro != pro) { ! transform_to_geo(pro, &r->lu, &g); ! transform_from_geo(this_->pro, &g, &r1.lu); ! transform_to_geo(pro, &r->rl, &g); ! transform_from_geo(this_->pro, &g, &r1.rl); ! r=&r1; ! } ! return coord_rect_overlap(&this_->r, r); ! } --- 241,245 ---- transform_center(struct transformation *this_) { ! return &this_->map_center; } *************** *** 328,331 **** --- 259,274 ---- void + transform_set_screen_selection(struct transformation *t, struct map_selection *sel) + { + map_selection_destroy(t->screen_sel); + t->screen_sel=map_selection_dup(sel); + if (sel) { + t->screen_center.x=(sel->u.p_rect.rl.x-sel->u.p_rect.lu.x)/2; + t->screen_center.y=(sel->u.p_rect.rl.y-sel->u.p_rect.lu.y)/2; + } + } + + #if 0 + void transform_set_size(struct transformation *t, int width, int height) { *************** *** 333,337 **** --- 276,282 ---- t->height=height; } + #endif + #if 0 void transform_get_size(struct transformation *t, int *width, int *height) *************** *** 340,343 **** --- 285,289 ---- *height=t->height; } + #endif void *************** *** 345,354 **** { t->pro=c->pro; ! t->center.x=c->x; ! t->center.y=c->y; t->scale=scale; transform_set_angle(t, angle); } void transform_setup_source_rect_limit(struct transformation *t, struct coord *center, int limit) --- 291,302 ---- { t->pro=c->pro; ! t->map_center.x=c->x; ! t->map_center.y=c->y; t->scale=scale; transform_set_angle(t, angle); } + #if 0 + void transform_setup_source_rect_limit(struct transformation *t, struct coord *center, int limit) *************** *** 362,365 **** --- 310,314 ---- t->r.lu.y=center->y+limit; } + #endif void *************** *** 369,388 **** struct coord screen[4]; struct point screen_pnt[4]; ! ! screen_pnt[0].x=0; ! screen_pnt[0].y=0; ! screen_pnt[1].x=t->width; ! screen_pnt[1].y=0; ! screen_pnt[2].x=0; ! screen_pnt[2].y=t->height; ! screen_pnt[3].x=t->width; ! screen_pnt[3].y=t->height; ! for (i = 0 ; i < 4 ; i++) { ! transform_reverse(t, &screen_pnt[i], &screen[i]); } - t->r.lu.x=min4(screen[0].x,screen[1].x,screen[2].x,screen[3].x); - t->r.rl.x=max4(screen[0].x,screen[1].x,screen[2].x,screen[3].x); - t->r.rl.y=min4(screen[0].y,screen[1].y,screen[2].y,screen[3].y); - t->r.lu.y=max4(screen[0].y,screen[1].y,screen[2].y,screen[3].y); } --- 318,354 ---- struct coord screen[4]; struct point screen_pnt[4]; ! struct point_rect *pr; ! struct map_selection *ms,*msm,*next,**msm_last; ! ms=t->map_sel; ! while (ms) { ! next=ms->next; ! g_free(ms); ! ms=next; ! } ! t->map_sel=NULL; ! msm_last=&t->map_sel; ! ms=t->screen_sel; ! while (ms) { ! msm=g_new0(struct map_selection, 1); ! pr=&ms->u.p_rect; ! screen_pnt[0].x=pr->lu.x; ! screen_pnt[0].y=pr->lu.y; ! screen_pnt[1].x=pr->rl.x; ! screen_pnt[1].y=pr->lu.y; ! screen_pnt[2].x=pr->lu.x; ! screen_pnt[2].y=pr->rl.y; ! screen_pnt[3].x=pr->rl.x; ! screen_pnt[3].y=pr->rl.y; ! for (i = 0 ; i < 4 ; i++) { ! transform_reverse(t, &screen_pnt[i], &screen[i]); ! } ! msm->u.c_rect.lu.x=min4(screen[0].x,screen[1].x,screen[2].x,screen[3].x); ! msm->u.c_rect.rl.x=max4(screen[0].x,screen[1].x,screen[2].x,screen[3].x); ! msm->u.c_rect.rl.y=min4(screen[0].y,screen[1].y,screen[2].y,screen[3].y); ! msm->u.c_rect.lu.y=max4(screen[0].y,screen[1].y,screen[2].y,screen[3].y); ! *msm_last=msm; ! msm_last=&msm->next; ! ms=ms->next; } } *************** *** 620,693 **** } - int - is_visible(struct transformation *t, struct coord *c) - { - struct coord_rect *r=&t->r; - - assert(c[0].x <= c[1].x); - assert(c[0].y >= c[1].y); - assert(r->lu.x <= r->rl.x); - assert(r->lu.y >= r->rl.y); - if (c[0].x > r->rl.x) - return 0; - if (c[1].x < r->lu.x) - return 0; - if (c[0].y < r->rl.y) - return 0; - if (c[1].y > r->lu.y) - return 0; - return 1; - } - - int - is_line_visible(struct transformation *t, struct coord *c) - { - struct coord_rect *r=&t->r; - - assert(r->lu.x <= r->rl.x); - assert(r->lu.y >= r->rl.y); - if (MIN(c[0].x,c[1].x) > r->rl.x) - return 0; - if (MAX(c[0].x,c[1].x) < r->lu.x) - return 0; - if (MAX(c[0].y,c[1].y) < r->rl.y) - return 0; - if (MIN(c[0].y,c[1].y) > r->lu.y) - return 0; - return 1; - } - - int - is_point_visible(struct transformation *t, struct coord *c) - { - struct coord_rect *r=&t->r; - - assert(r->lu.x <= r->rl.x); - assert(r->lu.y >= r->rl.y); - if (c->x > r->rl.x) - return 0; - if (c->x < r->lu.x) - return 0; - if (c->y < r->rl.y) - return 0; - if (c->y > r->lu.y) - return 0; - return 1; - } - - - int - is_too_small(struct transformation *t, struct coord *c, int limit) - { - return 0; - if ((c[1].x-c[0].x) < limit*t->scale/16) { - return 1; - } - if ((c[0].y-c[1].y) < limit*t->scale/16) { - return 1; - } - return 0; - } - #ifdef AVOID_FLOAT static int tab_atan[]={0,262,524,787,1051,1317,1584,1853,2126,2401,2679,2962,3249,3541,3839,4142,4452,4770,5095,5430,5774,6128,6494,6873,7265,7673,8098,8541,9004,9490,10000,10538}; --- 586,589 ---- *************** *** 766,772 **** transform_within_border(struct transformation *this_, struct point *p, int border) { ! if (p->x < border || p->x > this_->width-border || p->y < border || p->y > this_->height-border) ! return 0; ! return 1; } --- 662,674 ---- transform_within_border(struct transformation *this_, struct point *p, int border) { ! struct map_selection *ms=this_->screen_sel; ! while (ms) { ! struct point_rect *r=&ms->u.p_rect; ! if (p->x >= r->lu.x+border && p->x <= r->rl.x-border && ! p->y >= r->lu.y+border && p->y <= r->rl.y-border) ! return 1; ! ms=ms->next; ! } ! return 0; } Index: graphics.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** graphics.c 18 Dec 2007 19:36:56 -0000 1.23 --- graphics.c 20 Dec 2007 20:39:48 -0000 1.24 *************** *** 458,476 **** static void ! do_draw_map(struct displaylist *displaylist, struct transformation *t, struct map *m, struct map_selection *sel) { enum projection pro; struct map_rect *mr; struct item *item; ! struct coord c; ! int i, conv,count,max=16384; struct point pnt[max]; struct coord ca[max]; struct attr attr; ! struct coord_rect r; pro=map_projection(m); conv=map_requires_conversion(m); ! transform_rect(t, pro, &sel->u.c_rect); if (route_selection) mr=map_rect_new(m, route_selection); --- 458,475 ---- static void ! do_draw_map(struct displaylist *displaylist, struct transformation *t, struct map *m, int order) { enum projection pro; struct map_rect *mr; struct item *item; ! int conv,count,max=16384; struct point pnt[max]; struct coord ca[max]; struct attr attr; ! struct map_selection *sel; pro=map_projection(m); conv=map_requires_conversion(m); ! sel=transform_get_selection(t, pro, order); if (route_selection) mr=map_rect_new(m, route_selection); *************** *** 478,505 **** mr=map_rect_new(m, sel); while ((item=map_rect_get_item(mr))) { ! if (item->type < type_line) { ! item_coord_get(item, &c, 1); ! if (!transform(t, pro, &c, &pnt[0])) { ! dbg(1,"not visible\n"); ! continue; ! } ! count=1; ! } else { ! count = item_coord_get(item, ca, max); ! if (count < 2) ! continue; ! r.lu=ca[0]; ! r.rl=ca[0]; ! for (i=1; i < count; i++) { ! coord_rect_extend(&r, &ca[i]); ! } ! if (!transform_contains(t, pro, &r)) { ! dbg(1,"poly not visible\n"); ! continue; ! } ! count = transform_array(t, pro, ca, pnt, count, 1); ! if (count < 2) ! continue; ! g_assert(count < max); } if (!item_attr_get(item, attr_label, &attr)) --- 477,496 ---- mr=map_rect_new(m, sel); while ((item=map_rect_get_item(mr))) { ! count=item_coord_get(item, ca, item->type < type_line ? 1: max); ! if (item->type >= type_line && count < 2) { ! dbg(1,"poly from map has only %d points\n", count); ! continue; ! } ! count=transform(t, pro, ca, pnt, count, ! item->type < type_line ? 1 : (item->type < type_area ? 5 : 7)); ! if (!count) { ! dbg(1,"not visible\n"); ! continue; ! } ! if (count == max) ! dbg(0,"point count overflow\n", count); ! if (item->type >= type_line && count < 2) { ! dbg(1,"poly from transform has only %d points\n", count); ! continue; } if (!item_attr_get(item, attr_label, &attr)) *************** *** 513,516 **** --- 504,508 ---- } map_rect_destroy(mr); + map_selection_destroy(sel); } *************** *** 518,522 **** do_draw(struct displaylist *displaylist, struct transformation *t, GList *mapsets, int order, struct route *route) { - struct map_selection sel; struct mapset *ms; struct map *m; --- 510,513 ---- *************** *** 525,536 **** if (! mapsets) return; - sel.next=NULL; - sel.order[layer_town]=1*order; - sel.order[layer_street]=order; - sel.order[layer_poly]=1*order; ms=mapsets->data; h=mapset_open(ms); while ((m=mapset_next(h, 1))) { ! do_draw_map(displaylist, t, m, &sel); } mapset_close(h); --- 516,523 ---- if (! mapsets) return; ms=mapsets->data; h=mapset_open(ms); while ((m=mapset_next(h, 1))) { ! do_draw_map(displaylist, t, m, order); } mapset_close(h); *************** *** 538,542 **** m = route_get_map(route); if (m) ! do_draw_map(displaylist, t, m, &sel); } } --- 525,529 ---- m = route_get_map(route); if (m) ! do_draw_map(displaylist, t, m, order); } } Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** navit.c 18 Dec 2007 22:14:27 -0000 1.52 --- navit.c 20 Dec 2007 20:39:48 -0000 1.53 *************** *** 156,160 **** { struct navit *this_=data; ! transform_set_size(this_->trans, w, h); navit_draw(this_); } --- 156,166 ---- { struct navit *this_=data; ! struct map_selection sel; ! memset(&sel, 0, sizeof(sel)); ! sel.u.p_rect.lu.x=w/4; ! sel.u.p_rect.lu.y=h/4; ! sel.u.p_rect.rl.x=w*3/4; ! sel.u.p_rect.rl.y=h*3/4; ! transform_set_screen_selection(this_->trans, &sel); navit_draw(this_); } *************** *** 208,212 **** --- 214,220 ---- if (this_->moved) { struct point p; + #if 0 transform_get_size(this_->trans, &p.x, &p.y); + #endif p.x/=2; p.y/=2; *************** *** 1051,1054 **** --- 1059,1063 ---- navit_set_center_cursor(struct navit *this_, struct coord *cursor, int dir, int xpercent, int ypercent) { + #if 0 struct coord *c=transform_center(this_->trans); int width, height; *************** *** 1065,1068 **** --- 1074,1078 ---- if (this_->ready) navit_draw(this_); + #endif } *************** *** 1123,1127 **** else { pro=transform_get_projection(this_->trans); ! transform(this_->trans, pro, &nv->coord, &pnt2); } #if 1 --- 1133,1137 ---- else { pro=transform_get_projection(this_->trans); ! transform(this_->trans, pro, &nv->coord, &pnt2, 1, 0); } #if 1 *************** *** 1168,1172 **** } ! if ((!transform(this_->trans, pro, &nv->coord, &cursor_pnt) || !transform_within_border(this_->trans, &cursor_pnt, border))) { if (!this_->cursor_flag) return; --- 1178,1183 ---- } ! if ((!transform(this_->trans, pro, &nv->coord, &cursor_pnt, 1, 1) || ! !transform_within_border(this_->trans, &cursor_pnt, border))) { if (!this_->cursor_flag) return; Index: map.c =================================================================== RCS file: /cvsroot/navit/navit/src/map.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** map.c 22 Nov 2007 19:37:26 -0000 1.9 --- map.c 20 Dec 2007 20:39:48 -0000 1.10 *************** *** 42,78 **** char * ! map_get_filename(struct map *this) { ! return this->filename; } char * ! map_get_type(struct map *this) { ! return this->type; } int ! map_get_active(struct map *this) { ! return this->active; } void ! map_set_active(struct map *this, int active) { ! this->active=active; } int ! map_requires_conversion(struct map *this) { ! return (this->meth.charset != NULL); } char * ! map_convert_string(struct map *this, char *str) { ! return g_convert(str, -1,"utf-8",this->meth.charset,NULL,NULL,NULL); } --- 42,78 ---- char * ! map_get_filename(struct map *this_) { ! return this_->filename; } char * ! map_get_type(struct map *this_) { ! return this_->type; } int ! map_get_active(struct map *this_) { ! return this_->active; } void ! map_set_active(struct map *this_, int active) { ! this_->active=active; } int ! map_requires_conversion(struct map *this_) { ! return (this_->meth.charset != NULL); } char * ! map_convert_string(struct map *this_, char *str) { ! return g_convert(str, -1,"utf-8",this_->meth.charset,NULL,NULL,NULL); } *************** *** 84,90 **** enum projection ! map_projection(struct map *this) { ! return this->meth.pro; } --- 84,90 ---- enum projection ! map_projection(struct map *this_) { ! return this_->meth.pro; } *************** *** 153,205 **** map_search_new(struct map *m, struct item *item, struct attr *search_attr, int partial) { ! struct map_search *this; dbg(1,"enter(%p,%p,%p,%d)\n", m, item, search_attr, partial); dbg(1,"0x%x 0x%x 0x%x\n", attr_country_all, search_attr->type, attr_country_name); ! this=g_new0(struct map_search,1); ! this->m=m; ! this->search_attr=*search_attr; if (search_attr->type >= attr_country_all && search_attr->type <= attr_country_name) ! this->priv=country_search_new(&this->search_attr, partial); else { if (m->meth.map_search_new) { if (m->meth.charset) ! this->search_attr.u.str=g_convert(this->search_attr.u.str, -1,m->meth.charset,"utf-8",NULL,NULL,NULL); ! this->priv=m->meth.map_search_new(m->priv, item, &this->search_attr, partial); } else { ! g_free(this); ! this=NULL; } } ! return this; } struct item * ! map_search_get_item(struct map_search *this) { struct item *ret; ! if (! this) return NULL; ! if (this->search_attr.type >= attr_country_all && this->search_attr.type <= attr_country_name) ! return country_search_get_item(this->priv); ! ret=this->m->meth.map_search_get_item(this->priv); if (ret) ! ret->map=this->m; return ret; } void ! map_search_destroy(struct map_search *this) { ! if (! this) return; ! if (this->search_attr.type >= attr_country_all && this->search_attr.type <= attr_country_name) ! country_search_destroy(this->priv); else { ! if (this->m->meth.charset) ! g_free(this->search_attr.u.str); ! this->m->meth.map_search_destroy(this->priv); } ! g_free(this); } --- 153,220 ---- map_search_new(struct map *m, struct item *item, struct attr *search_attr, int partial) { ! struct map_search *this_; dbg(1,"enter(%p,%p,%p,%d)\n", m, item, search_attr, partial); dbg(1,"0x%x 0x%x 0x%x\n", attr_country_all, search_attr->type, attr_country_name); ! this_=g_new0(struct map_search,1); ! this_->m=m; ! this_->search_attr=*search_attr; if (search_attr->type >= attr_country_all && search_attr->type <= attr_country_name) ! this_->priv=country_search_new(&this_->search_attr, partial); else { if (m->meth.map_search_new) { if (m->meth.charset) ! this_->search_attr.u.str=g_convert(this_->search_attr.u.str, -1,m->meth.charset,"utf-8",NULL,NULL,NULL); ! this_->priv=m->meth.map_search_new(m->priv, item, &this_->search_attr, partial); } else { ! g_free(this_); ! this_=NULL; } } ! return this_; } struct item * ! map_search_get_item(struct map_search *this_) { struct item *ret; ! if (! this_) return NULL; ! if (this_->search_attr.type >= attr_country_all && this_->search_attr.type <= attr_country_name) ! return country_search_get_item(this_->priv); ! ret=this_->m->meth.map_search_get_item(this_->priv); if (ret) ! ret->map=this_->m; return ret; } void ! map_search_destroy(struct map_search *this_) { ! if (! this_) return; ! if (this_->search_attr.type >= attr_country_all && this_->search_attr.type <= attr_country_name) ! country_search_destroy(this_->priv); else { ! if (this_->m->meth.charset) ! g_free(this_->search_attr.u.str); ! this_->m->meth.map_search_destroy(this_->priv); } ! g_free(this_); ! } ! ! struct map_selection * ! map_selection_dup(struct map_selection *sel) ! { ! struct map_selection *next,**last; ! struct map_selection *ret=NULL; ! last=&ret; ! while (sel) { ! next = g_new(struct map_selection, 1); ! *next=*sel; ! *last=next; ! sel = sel->next; ! } ! return ret; } *************** *** 207,215 **** map_selection_destroy(struct map_selection *sel) { ! struct map_selection *ms; while (sel) { ! ms = sel->next; g_free(sel); ! sel = ms; } } --- 222,230 ---- map_selection_destroy(struct map_selection *sel) { ! struct map_selection *next; while (sel) { ! next = sel->next; g_free(sel); ! sel = next; } } Index: map.h =================================================================== RCS file: /cvsroot/navit/navit/src/map.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** map.h 6 Dec 2007 21:41:21 -0000 1.9 --- map.h 20 Dec 2007 20:39:48 -0000 1.10 *************** *** 38,41 **** --- 38,137 ---- }; + static inline int + map_selection_contains_point(struct map_selection *sel, struct coord *c) + { + struct map_selection *curr=sel; + while (curr) { + struct coord_rect *r=&curr->u.c_rect; + if (c->x >= r->lu.x && c->x <= r->rl.x && + c->y >= r->lu.y && c->y <= r->rl.y) + return 1; + curr=curr->next; + } + return sel ? 0:1; + } + + static inline int + map_selection_contains_polyline(struct map_selection *sel, struct coord *c, int count) + { + int i,x_mi,x_ma,y_mi,y_ma; + struct map_selection *curr; + + if (! sel) + return 1; + for (i = 0 ; i < count-1 ; i++) { + x_mi=c[i].x; + if (c[i+1].x < x_mi) + x_mi=c[i+1].x; + x_ma=c[i].x; + if (c[i+1].x > x_ma) + x_ma=c[i+1].x; + y_mi=c[i].y; + if (c[i+1].y < y_mi) + y_mi=c[i+1].y; + y_ma=c[i].y; + if (c[i+1].y > y_ma) + y_ma=c[i+1].y; + curr=sel; + while (curr) { + struct coord_rect *sr=&curr->u.c_rect; + if (x_mi <= sr->rl.x && x_ma >= sr->lu.x && + y_ma >= sr->rl.y && y_mi <= sr->lu.y) + return 1; + curr=curr->next; + } + } + return 0; + } + + static inline int + map_selection_contains_rect(struct map_selection *sel, struct coord_rect *r) + { + struct map_selection *curr; + + g_assert(r->lu.x <= r->rl.x); + g_assert(r->lu.y >= r->rl.y); + + if (! sel) + return 1; + curr=sel; + while (curr) { + struct coord_rect *sr=&curr->u.c_rect; + g_assert(sr->lu.x <= sr->rl.x); + g_assert(sr->lu.y >= sr->rl.y); + if (r->lu.x <= sr->rl.x && r->rl.x >= sr->lu.x && + r->lu.y >= sr->rl.y && r->rl.y <= sr->lu.y) + return 1; + curr=curr->next; + } + return 0; + } + + static inline int + map_selection_contains_polygon(struct map_selection *sel, struct coord *c, int count) + { + struct coord_rect r; + int i; + + if (! sel) + return 1; + if (! count) + return 0; + r.lu=c[0]; + r.rl=c[0]; + for (i = 1 ; i < count-1 ; i++) { + if (c[i].x < r.lu.x) + r.lu.x=c[i].x; + if (c[i].x > r.rl.x) + r.rl.x=c[i].x; + if (c[i].y < r.rl.y) + r.rl.y=c[i].y; + if (c[i].y > r.lu.y) + r.lu.y=c[i].y; + } + return map_selection_contains_rect(sel, &r); + } + + /* prototypes */ enum projection; *************** *** 47,58 **** struct map_selection; struct map *map_new(const char *type, struct attr **attrs); ! char *map_get_filename(struct map *this); ! char *map_get_type(struct map *this); ! int map_get_active(struct map *this); ! void map_set_active(struct map *this, int active); ! int map_requires_conversion(struct map *this); ! char *map_convert_string(struct map *this, char *str); void map_convert_free(char *str); ! enum projection map_projection(struct map *this); void map_destroy(struct map *m); struct map_rect *map_rect_new(struct map *m, struct map_selection *sel); --- 143,154 ---- struct map_selection; struct map *map_new(const char *type, struct attr **attrs); ! char *map_get_filename(struct map *this_); ! char *map_get_type(struct map *this_); ! int map_get_active(struct map *this_); ! void map_set_active(struct map *this_, int active); ! int map_requires_conversion(struct map *this_); ! char *map_convert_string(struct map *this_, char *str); void map_convert_free(char *str); ! enum projection map_projection(struct map *this_); void map_destroy(struct map *m); struct map_rect *map_rect_new(struct map *m, struct map_selection *sel); *************** *** 61,66 **** void map_rect_destroy(struct map_rect *mr); struct map_search *map_search_new(struct map *m, struct item *item, struct attr *search_attr, int partial); ! struct item *map_search_get_item(struct map_search *this); ! void map_search_destroy(struct map_search *this); void map_selection_destroy(struct map_selection *sel); /* end of prototypes */ --- 157,163 ---- void map_rect_destroy(struct map_rect *mr); struct map_search *map_search_new(struct map *m, struct item *item, struct attr *search_attr, int partial); ! struct item *map_search_get_item(struct map_search *this_); ! void map_search_destroy(struct map_search *this_); ! struct map_selection *map_selection_dup(struct map_selection *sel); void map_selection_destroy(struct map_selection *sel); /* end of prototypes */ |
|
From: Alexander A. <za...@us...> - 2007-12-19 23:46:36
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16663 Modified Files: transform.c Log Message: Faster transform distance for garmin projection Index: transform.c =================================================================== RCS file: /cvsroot/navit/navit/src/transform.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** transform.c 25 Nov 2007 01:43:04 -0000 1.12 --- transform.c 19 Dec 2007 23:46:36 -0000 1.13 *************** *** 444,447 **** --- 444,448 ---- transform_distance_garmin(struct coord *c1, struct coord *c2) { + #ifdef USE_HALVESINE static const int earth_radius = 6371*1000; //m change accordingly // static const int earth_radius = 3960; //miles *************** *** 469,472 **** --- 470,481 ---- return earth_radius*c; #endif + #else + #define GMETER 2.3887499999999999 + double dx,dy; + dx=c1->x-c2->x; + dy=c1->y-c2->y; + return sqrt(dx*dx+dy*dy)*GMETER; + #undef GMETER + #endif } |
|
From: Michael F. <ho...@us...> - 2007-12-19 10:21:25
|
Update of /cvsroot/navit/navit In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5487 Modified Files: configure.in Log Message: Fix warning Index: configure.in =================================================================== RCS file: /cvsroot/navit/navit/configure.in,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** configure.in 18 Dec 2007 19:36:56 -0000 1.61 --- configure.in 19 Dec 2007 10:21:25 -0000 1.62 *************** *** 5,8 **** --- 5,9 ---- AC_GNU_SOURCE + AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC |
|
From: KaZeR <ka...@us...> - 2007-12-19 09:57:14
|
Update of /cvsroot/navit/navit/src/vehicle/gpsd In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27651/vehicle/gpsd Modified Files: vehicle_gpsd.c Log Message: Fixed 'isgps30bits_t' undeclared here Index: vehicle_gpsd.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vehicle_gpsd.c 18 Dec 2007 19:36:58 -0000 1.2 --- vehicle_gpsd.c 19 Dec 2007 09:57:17 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + #include <config.h> #include <gps.h> #include <string.h> |
|
From: Martin S. <mar...@us...> - 2007-12-18 22:14:24
|
Update of /cvsroot/navit/navit/src/vehicle/demo In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7066/vehicle/demo Modified Files: vehicle_demo.c Log Message: Made demo vehicle modular, fixed some bugs Index: vehicle_demo.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/demo/vehicle_demo.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vehicle_demo.c 18 Dec 2007 19:40:39 -0000 1.1 --- vehicle_demo.c 18 Dec 2007 22:14:27 -0000 1.2 *************** *** 1,7 **** #include "debug.h" void plugin_init(void) { ! dbg(0,"enter\n"); } --- 1,150 ---- + #include <glib.h> #include "debug.h" + #include "coord.h" + #include "item.h" + #include "navit.h" + #include "route.h" + #include "callback.h" + #include "transform.h" + #include "plugin.h" + #include "vehicle.h" + + struct vehicle_priv { + struct callback_list *cbl; + struct navit *navit; + struct coord_geo geo; + struct coord last; + double speed; + double direction; + }; + + static void + vehicle_demo_destroy(struct vehicle_priv *priv) + { + g_free(priv); + } + + static int + vehicle_demo_position_attr_get(struct vehicle_priv *priv, + enum attr_type type, struct attr *attr) + { + switch (type) { + case attr_position_speed: + attr->u.numd = &priv->speed; + break; + case attr_position_direction: + attr->u.numd = &priv->direction; + break; + case attr_position_coord_geo: + dbg(1, "coord %f,%f\n", priv->geo.lat, priv->geo.lng); + attr->u.coord_geo = &priv->geo; + break; + default: + return 0; + } + attr->type = type; + return 1; + } + + static int + vehicle_demo_set_attr(struct vehicle_priv *priv, struct attr *attr, + struct attr **attrs) + { + if (attr->type == attr_navit) { + priv->navit = attr->u.navit; + return 1; + } + return 0; + } + + struct vehicle_methods vehicle_demo_methods = { + vehicle_demo_destroy, + vehicle_demo_position_attr_get, + vehicle_demo_set_attr, + }; + + static int + vehicle_demo_timer(struct vehicle_priv *priv) + { + struct route_path_coord_handle *h; + struct coord *c, *pos, ci; + int slen, len, dx, dy; + + priv->speed = 40; + len = priv->speed / 3.6; + dbg(1, "###### Entering simulation loop\n"); + if (!priv->navit) { + dbg(1, "vehicle->navit is not set. Can't simulate\n"); + return 1; + } + struct route *vehicle_route = navit_get_route(priv->navit); + if (!vehicle_route) { + dbg(1, "navit_get_route NOK\n"); + return 1; + } + + h = route_path_coord_open(vehicle_route); + if (!h) { + dbg(1, "navit_path_coord_open NOK\n"); + return 1; + } + pos = route_path_coord_get(h); + dbg(1, "current pos=%p\n", pos); + if (pos) { + dbg(1, "current pos=0x%x,0x%x\n", pos->x, pos->y); + if (priv->last.x == pos->x && priv->last.y == pos->y) { + dbg(1, "endless loop\n"); + } + priv->last = *pos; + for (;;) { + c = route_path_coord_get(h); + dbg(1, "next pos=%p\n", c); + if (!c) + break; + dbg(1, "next pos=0x%x,0x%x\n", c->x, c->y); + slen = transform_distance(projection_mg, pos, c); + dbg(1, "len=%d slen=%d\n", len, slen); + if (slen < len) { + len -= slen; + pos = c; + } else { + dx = c->x - pos->x; + dy = c->y - pos->y; + ci.x = pos->x + dx * len / slen; + ci.y = pos->y + dy * len / slen; + priv->direction = + transform_get_angle_delta(pos, c, 0); + dbg(1, "ci=0x%x,0x%x\n", ci.x, ci.y); + transform_to_geo(projection_mg, &ci, + &priv->geo); + callback_list_call_0(priv->cbl); + break; + } + } + } + return 1; + } + + + + static struct vehicle_priv * + vehicle_demo_new(struct vehicle_methods + *meth, struct callback_list + *cbl, struct attr **attrs) + { + struct vehicle_priv *ret; + + dbg(1, "enter\n"); + ret = g_new0(struct vehicle_priv, 1); + ret->cbl = cbl; + *meth = vehicle_demo_methods; + g_timeout_add(1000, (GSourceFunc) vehicle_demo_timer, ret); + return ret; + } void plugin_init(void) { ! dbg(1, "enter\n"); ! plugin_register_vehicle_type("demo", vehicle_demo_new); } |
|
From: Martin S. <mar...@us...> - 2007-12-18 22:14:24
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7066 Modified Files: navit.c vehicle.c vehicle.h Log Message: Made demo vehicle modular, fixed some bugs Index: vehicle.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** vehicle.c 18 Dec 2007 19:36:57 -0000 1.28 --- vehicle.c 18 Dec 2007 22:14:27 -0000 1.29 *************** *** 101,104 **** --- 101,106 ---- struct attr **attrs) { + if (this_->meth.set_attr) + return this_->meth.set_attr(this_->priv, attr, attrs); return 0; } Index: vehicle.h =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** vehicle.h 18 Dec 2007 19:36:57 -0000 1.17 --- vehicle.h 18 Dec 2007 22:14:27 -0000 1.18 *************** *** 10,13 **** --- 10,15 ---- void (*destroy)(struct vehicle_priv *priv); int (*position_attr_get)(struct vehicle_priv *priv, enum attr_type type, struct attr *attr); + int (*set_attr)(struct vehicle_priv *priv, struct attr *attr, struct attr **attrs); + }; Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** navit.c 18 Dec 2007 19:36:57 -0000 1.51 --- navit.c 18 Dec 2007 22:14:27 -0000 1.52 *************** *** 1238,1250 **** struct attr *name,*update,*follow,*color,*active; nv->vehicle=v; if ((name=attr_search(attrs, NULL, attr_name))) nv->name=g_strdup(name->u.str); if ((update=attr_search(attrs, NULL, attr_update))) ! nv->update_curr=nv->update=update->u.num; if ((follow=attr_search(attrs, NULL, attr_follow))) ! nv->follow_curr=nv->follow=follow->u.num; ! if ((color=attr_search(attrs, NULL, attr_color))) { nv->c=*(color->u.color); ! } this_->vehicles=g_list_append(this_->vehicles, nv); if ((active=attr_search(attrs, NULL, attr_active)) && active->u.num) --- 1238,1254 ---- struct attr *name,*update,*follow,*color,*active; nv->vehicle=v; + nv->update=1; + nv->follow=0; + nv->name="Noname"; if ((name=attr_search(attrs, NULL, attr_name))) nv->name=g_strdup(name->u.str); if ((update=attr_search(attrs, NULL, attr_update))) ! nv->update=nv->update=update->u.num; if ((follow=attr_search(attrs, NULL, attr_follow))) ! nv->follow=nv->follow=follow->u.num; ! if ((color=attr_search(attrs, NULL, attr_color))) nv->c=*(color->u.color); ! nv->update_curr=nv->update; ! nv->follow_curr=nv->follow; this_->vehicles=g_list_append(this_->vehicles, nv); if ((active=attr_search(attrs, NULL, attr_active)) && active->u.num) |
13 messages has been excluded from this view by a project administrator.
