navit-cvs-commit Mailing List for Navit (Page 20)

Status: Beta

Brought to you by: aerostitch, horwitz, jkoan, kazer_, and 2 others

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

Flat | Threaded

<< < 1 .. 18 19 20 21 22 .. 242 > >> (Page 20 of 242)

[Navit-cvs-commit] SF.net SVN: navit:[5656] trunk/navit/po/fr.po.in

From: <ka...@us...> - 2013-10-28 19:21:47

Revision: 5656
          http://sourceforge.net/p/navit/code/5656
Author:   kazer_
Date:     2013-10-28 19:21:46 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
Add:core:Updated French translation from launchpad, giving better credits

Modified Paths:
--------------
    trunk/navit/po/fr.po.in

Modified: trunk/navit/po/fr.po.in
===================================================================
--- trunk/navit/po/fr.po.in	2013-10-16 19:16:05 UTC (rev 5655)
+++ trunk/navit/po/fr.po.in	2013-10-28 19:21:46 UTC (rev 5656)
@@ -1,14 +1,30 @@
-# French translations for navit
-# Copyright (C) 2007, 2008 The Navit Team
+# French (fr)  translations for navit
+# Copyright (C) 2006-2013 The Navit Team
 # This file is distributed under the same license as the navit package.
-# 'KaZeR' <kazer altern.org>
-# 'Nekohayo' <nekohayo arobas gmail point com>
-#
+
+# Breizh_Punisher https://launchpad.net/~lemeura
+# Deuchnord https://launchpad.net/~jerome-logiciels-id
+# Elodie https://launchpad.net/~elodie
+# Fred https://launchpad.net/~jelk
+# Jérôme BLUM https://launchpad.net/~jblum
+# KaZeR https://launchpad.net/~kazer
+# Roadrunner IN https://launchpad.net/~online
+# Thibault Lemaitre https://launchpad.net/~thibault.lemaitre
+# alexb38 https://launchpad.net/~alexb38
+# alfred002 https://launchpad.net/~alfred002
+# boism https://launchpad.net/~boism
+# cyp https://launchpad.net/~cyprien-d
+# icaunais https://launchpad.net/~linux4cyril
+# kangooooooo https://launchpad.net/~kangooooooo-deactivatedaccount
+# mercier133 https://launchpad.net/~mercierdamien
+# metehyi https://launchpad.net/~metehyi
+# yannick56 https://launchpad.net/~yleny
+
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"POT-Creation-Date: 2013-10-10 21:46+0200\n"
 "PO-Revision-Date: 2013-10-01 22:24+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: KaZeR <ka...@al...>\n"
@@ -16,8 +32,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
-"X-Generator: Launchpad (build 16799)\n"
+"X-Launchpad-Export-Date: 2013-10-26 21:49+0000\n"
+"X-Generator: Launchpad (build 16810)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -2427,6 +2443,9 @@
 msgid "About"
 msgstr "À propos"
 
+msgid "Quit"
+msgstr "Quitter"
+
 msgid "Actions"
 msgstr "Actions"
 
@@ -2437,8 +2456,8 @@
 "Destinations\n"
 "précédentes"
 
-msgid "Quit"
-msgstr "Quitter"
+msgid "Coordinates"
+msgstr ""
 
 msgid ""
 "Stop\n"
@@ -2515,6 +2534,3 @@
 #. 
 msgid "Truck"
 msgstr "Camion"
-
-msgid "Cancel"
-msgstr ""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5655] trunk/navit/navit/maptool/osm.c

From: <md...@us...> - 2013-10-16 19:16:10

Revision: 5655
          http://sourceforge.net/p/navit/code/5655
Author:   mdankov
Date:     2013-10-16 19:16:05 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
Add:maptool:Convert admin_level=8 boundary levels of Switzerland to town polygons 

Modified Paths:
--------------
    trunk/navit/navit/maptool/osm.c

Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c	2013-10-13 18:58:14 UTC (rev 5654)
+++ trunk/navit/navit/maptool/osm.c	2013-10-16 19:16:05 UTC (rev 5655)
@@ -348,7 +348,7 @@
 	{ 744,"Svalbard and Jan Mayen"},
 	{ 748,"Swaziland"},
 	{ 752,"Sweden,Sverige,Konungariket Sverige,SE"},
-	{ 756,"Switzerland,Schweiz"},
+	{ 756,"Switzerland,Schweiz","3s5c7M"},
 	{ 760,"Syrian Arab Republic"},
 	{ 762,"Tajikistan"},
 	{ 764,"Thailand"},

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5654] trunk/navit

From: <md...@us...> - 2013-10-13 18:58:20

Revision: 5654
          http://sourceforge.net/p/navit/code/5654
Author:   mdankov
Date:     2013-10-13 18:58:14 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Add:port_android:Cancel button for the "route to here" popup, fixes #991.|Thank you Kamikaaze

Modified Paths:
--------------
    trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
    trunk/navit/po/af.po.in
    trunk/navit/po/ar.po.in
    trunk/navit/po/ast.po.in
    trunk/navit/po/bg.po.in
    trunk/navit/po/ca.po.in
    trunk/navit/po/cs.po.in
    trunk/navit/po/da.po.in
    trunk/navit/po/de.po.in
    trunk/navit/po/de_CH.po.in
    trunk/navit/po/el.po.in
    trunk/navit/po/en_AU.po.in
    trunk/navit/po/en_GB.po.in
    trunk/navit/po/eo.po.in
    trunk/navit/po/es.po.in
    trunk/navit/po/et.po.in
    trunk/navit/po/eu.po.in
    trunk/navit/po/fi.po.in
    trunk/navit/po/fo.po.in
    trunk/navit/po/fr.po.in
    trunk/navit/po/fr_CH.po.in
    trunk/navit/po/gl.po.in
    trunk/navit/po/he.po.in
    trunk/navit/po/hr.po.in
    trunk/navit/po/hu.po.in
    trunk/navit/po/id.po.in
    trunk/navit/po/it.po.in
    trunk/navit/po/ja.po.in
    trunk/navit/po/jv.po.in
    trunk/navit/po/kk.po.in
    trunk/navit/po/lt.po.in
    trunk/navit/po/lv.po.in
    trunk/navit/po/mk.po.in
    trunk/navit/po/nb.po.in
    trunk/navit/po/nds.po.in
    trunk/navit/po/nl.po.in
    trunk/navit/po/nn.po.in
    trunk/navit/po/pl.po.in
    trunk/navit/po/pt.po.in
    trunk/navit/po/pt_BR.po.in
    trunk/navit/po/ro.po.in
    trunk/navit/po/ru.po.in
    trunk/navit/po/sk.po.in
    trunk/navit/po/sl.po.in
    trunk/navit/po/sr.po.in
    trunk/navit/po/sv.po.in
    trunk/navit/po/ta.po.in
    trunk/navit/po/te.po.in
    trunk/navit/po/th.po.in
    trunk/navit/po/tr.po.in
    trunk/navit/po/uk.po.in
    trunk/navit/po/ur.po.in
    trunk/navit/po/vi.po.in
    trunk/navit/po/zh_CN.po.in
    trunk/navit/po/zh_HK.po.in

Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java	2013-10-13 18:58:14 UTC (rev 5654)
@@ -137,9 +137,10 @@
 			
 			menu.setHeaderTitle("Position...");
 			menu.add(1, 1, NONE, Navit._("Route to here")).setOnMenuItemClickListener(this);
-//			menu.add(1, 2, NONE, Navit._("Add to contacts")).setOnMenuItemClickListener(this);
+			menu.add(1, 2, NONE, Navit._("Cancel")).setOnMenuItemClickListener(this);
 		}
 
+		@Override
 		public boolean onMenuItemClick(MenuItem item) {
 			switch(item.getItemId()) {
 			case 1:
@@ -147,8 +148,6 @@
 				   , (int)mPressedPosition.x, (int)mPressedPosition.y);
 				msg.sendToTarget();
 				break;
-			case 2:
-				break;
 			}
 			return false;
 		}

Modified: trunk/navit/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/af.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ar.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2494,3 +2494,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ast.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/bg.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ca.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/cs.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2518,3 +2518,6 @@
 #. 
 msgid "Truck"
 msgstr "kamión"
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/da.po.in
===================================================================
--- trunk/navit/po/da.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/da.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/de.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2519,3 +2519,6 @@
 #. 
 msgid "Truck"
 msgstr "LKW"
+
+msgid "Cancel"
+msgstr "Abbrechen"

Modified: trunk/navit/po/de_CH.po.in
===================================================================
--- trunk/navit/po/de_CH.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/de_CH.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2483,3 +2483,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/el.po.in
===================================================================
--- trunk/navit/po/el.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/el.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2485,3 +2485,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/en_AU.po.in
===================================================================
--- trunk/navit/po/en_AU.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/en_AU.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr "Cancel"

Modified: trunk/navit/po/en_GB.po.in
===================================================================
--- trunk/navit/po/en_GB.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/en_GB.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2483,3 +2483,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr "Cancel"

Modified: trunk/navit/po/eo.po.in
===================================================================
--- trunk/navit/po/eo.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/eo.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/es.po.in
===================================================================
--- trunk/navit/po/es.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/es.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2494,3 +2494,6 @@
 #. 
 msgid "Truck"
 msgstr "Camión"
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/et.po.in
===================================================================
--- trunk/navit/po/et.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/et.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2483,3 +2483,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/eu.po.in
===================================================================
--- trunk/navit/po/eu.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/eu.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/fi.po.in
===================================================================
--- trunk/navit/po/fi.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/fi.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2492,3 +2492,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/fo.po.in
===================================================================
--- trunk/navit/po/fo.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/fo.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2484,3 +2484,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/fr.po.in
===================================================================
--- trunk/navit/po/fr.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/fr.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2515,3 +2515,6 @@
 #. 
 msgid "Truck"
 msgstr "Camion"
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/fr_CH.po.in
===================================================================
--- trunk/navit/po/fr_CH.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/fr_CH.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2494,3 +2494,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/gl.po.in
===================================================================
--- trunk/navit/po/gl.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/gl.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2486,3 +2486,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/he.po.in
===================================================================
--- trunk/navit/po/he.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/he.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/hr.po.in
===================================================================
--- trunk/navit/po/hr.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/hr.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2490,3 +2490,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/hu.po.in
===================================================================
--- trunk/navit/po/hu.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/hu.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/id.po.in
===================================================================
--- trunk/navit/po/id.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/id.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2486,3 +2486,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/it.po.in
===================================================================
--- trunk/navit/po/it.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/it.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ja.po.in
===================================================================
--- trunk/navit/po/ja.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ja.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2484,3 +2484,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/jv.po.in
===================================================================
--- trunk/navit/po/jv.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/jv.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2483,3 +2483,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/kk.po.in
===================================================================
--- trunk/navit/po/kk.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/kk.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2483,3 +2483,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/lt.po.in
===================================================================
--- trunk/navit/po/lt.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/lt.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2490,3 +2490,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/lv.po.in
===================================================================
--- trunk/navit/po/lv.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/lv.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/mk.po.in
===================================================================
--- trunk/navit/po/mk.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/mk.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2487,3 +2487,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/nb.po.in
===================================================================
--- trunk/navit/po/nb.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/nb.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/nds.po.in
===================================================================
--- trunk/navit/po/nds.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/nds.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/nl.po.in
===================================================================
--- trunk/navit/po/nl.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/nl.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2503,3 +2503,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/nn.po.in
===================================================================
--- trunk/navit/po/nn.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/nn.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/pl.po.in
===================================================================
--- trunk/navit/po/pl.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/pl.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2510,3 +2510,6 @@
 #. 
 msgid "Truck"
 msgstr "Ciężarówka"
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/pt.po.in
===================================================================
--- trunk/navit/po/pt.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/pt.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/pt_BR.po.in
===================================================================
--- trunk/navit/po/pt_BR.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/pt_BR.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2489,3 +2489,6 @@
 #. 
 msgid "Truck"
 msgstr "Caminhão"
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ro.po.in
===================================================================
--- trunk/navit/po/ro.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ro.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2490,3 +2490,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ru.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2503,3 +2503,6 @@
 #. 
 msgid "Truck"
 msgstr "Грузовик"
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/sk.po.in
===================================================================
--- trunk/navit/po/sk.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/sk.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2489,3 +2489,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/sl.po.in
===================================================================
--- trunk/navit/po/sl.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/sl.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2489,3 +2489,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/sr.po.in
===================================================================
--- trunk/navit/po/sr.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/sr.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2489,3 +2489,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/sv.po.in
===================================================================
--- trunk/navit/po/sv.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/sv.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ta.po.in
===================================================================
--- trunk/navit/po/ta.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ta.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2483,3 +2483,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/te.po.in
===================================================================
--- trunk/navit/po/te.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/te.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2484,3 +2484,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/th.po.in
===================================================================
--- trunk/navit/po/th.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/th.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2482,3 +2482,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/tr.po.in
===================================================================
--- trunk/navit/po/tr.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/tr.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2493,3 +2493,6 @@
 
 #~ msgid "%d.%d kilometer"
 #~ msgstr "%d.%d kilometre"
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/uk.po.in
===================================================================
--- trunk/navit/po/uk.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/uk.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2490,3 +2490,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/ur.po.in
===================================================================
--- trunk/navit/po/ur.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/ur.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2488,3 +2488,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/vi.po.in
===================================================================
--- trunk/navit/po/vi.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/vi.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2481,3 +2481,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/zh_CN.po.in
===================================================================
--- trunk/navit/po/zh_CN.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/zh_CN.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2481,3 +2481,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

Modified: trunk/navit/po/zh_HK.po.in
===================================================================
--- trunk/navit/po/zh_HK.po.in	2013-10-09 22:00:42 UTC (rev 5653)
+++ trunk/navit/po/zh_HK.po.in	2013-10-13 18:58:14 UTC (rev 5654)
@@ -2486,3 +2486,6 @@
 #. 
 msgid "Truck"
 msgstr ""
+
+msgid "Cancel"
+msgstr ""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5653] trunk/navit/navit/navit_shipped.xml

From: <sl...@us...> - 2013-10-09 22:00:45

Revision: 5653
          http://sourceforge.net/p/navit/code/5653
Author:   sleske
Date:     2013-10-09 22:00:42 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Fix:xml:Add entry for coordinate input, move Quit to top level.|Fixes #951

Modified Paths:
--------------
    trunk/navit/navit/navit_shipped.xml

Modified: trunk/navit/navit/navit_shipped.xml
===================================================================
--- trunk/navit/navit/navit_shipped.xml	2013-10-08 17:50:42 UTC (rev 5652)
+++ trunk/navit/navit/navit_shipped.xml	2013-10-09 22:00:42 UTC (rev 5653)
@@ -55,7 +55,8 @@
 					<a href='#Settings'><img src='gui_settings'><text>Settings</text></img></a>
 				<a href='#Tools'><img src='gui_tools'><text>Tools</text></img></a>
 				<a href='#Route'><img src='gui_settings'><text>Route</text></img></a>
-                <img src='gui_about'  onclick='about()'><text>About</text></img>
+				<img src='gui_about' onclick='about()'><text>About</text></img>
+				<img src='gui_quit' onclick='quit()'><text>Quit</text></img>
 				</a>
 			<a name='Actions'><text>Actions</text>
 				<img src='gui_bookmark' onclick='bookmarks()'><text>Bookmarks</text></img>
@@ -64,7 +65,7 @@
 				<img cond='click_coord_geo' src='gui_map' onclick='position(click_coord_geo,_("Map Point"),8|16|32|64|256)'><script>write(click_coord_geo)</script></img>
 				<img cond='position_coord_geo' src='gui_vehicle' onclick='position(position_coord_geo,_("Vehicle Position"),8|32|64|128|256)'><script>write(position_coord_geo)</script></img>
 				<img src='gui_town' onclick='town()'><text>Town</text></img>
-				<img src='gui_quit' onclick='quit()'><text>Quit</text></img>
+				<img src='gui_map' onclick='enter_coord()'><text>Coordinates</text></img>
 				<img cond='navit.route.route_status&amp;1' src='gui_stop' onclick='abort_navigation();refresh()'><text>Stop
 Navigation</text></img>
 			</a>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5652] trunk/navit/po

From: <ka...@us...> - 2013-10-08 17:50:48

Revision: 5652
          http://sourceforge.net/p/navit/code/5652
Author:   kazer_
Date:     2013-10-08 17:50:42 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Add:core:Updated German translations from launchpad

Modified Paths:
--------------
    trunk/navit/po/af.po.in
    trunk/navit/po/ar.po.in
    trunk/navit/po/ast.po.in
    trunk/navit/po/bg.po.in
    trunk/navit/po/ca.po.in
    trunk/navit/po/cs.po.in
    trunk/navit/po/da.po.in
    trunk/navit/po/de_CH.po.in
    trunk/navit/po/el.po.in
    trunk/navit/po/en_AU.po.in
    trunk/navit/po/en_GB.po.in
    trunk/navit/po/eo.po.in
    trunk/navit/po/es.po.in
    trunk/navit/po/et.po.in
    trunk/navit/po/eu.po.in
    trunk/navit/po/fi.po.in
    trunk/navit/po/fo.po.in
    trunk/navit/po/fr.po.in
    trunk/navit/po/fr_CH.po.in
    trunk/navit/po/gl.po.in
    trunk/navit/po/he.po.in
    trunk/navit/po/hr.po.in
    trunk/navit/po/hu.po.in
    trunk/navit/po/id.po.in
    trunk/navit/po/it.po.in
    trunk/navit/po/ja.po.in
    trunk/navit/po/jv.po.in
    trunk/navit/po/kk.po.in
    trunk/navit/po/lt.po.in
    trunk/navit/po/lv.po.in
    trunk/navit/po/mk.po.in
    trunk/navit/po/nb.po.in
    trunk/navit/po/nds.po.in
    trunk/navit/po/nl.po.in
    trunk/navit/po/nn.po.in
    trunk/navit/po/pl.po.in
    trunk/navit/po/pt.po.in
    trunk/navit/po/pt_BR.po.in
    trunk/navit/po/ro.po.in
    trunk/navit/po/ru.po.in
    trunk/navit/po/sk.po.in
    trunk/navit/po/sl.po.in
    trunk/navit/po/sr.po.in
    trunk/navit/po/sv.po.in
    trunk/navit/po/ta.po.in
    trunk/navit/po/te.po.in
    trunk/navit/po/th.po.in
    trunk/navit/po/uk.po.in
    trunk/navit/po/ur.po.in
    trunk/navit/po/vi.po.in
    trunk/navit/po/zh_CN.po.in
    trunk/navit/po/zh_HK.po.in

Modified: trunk/navit/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/af.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2009-12-20 20:36+0000\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Afrikaans <af...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: af\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -104,7 +104,7 @@
 
 #, c-format
 msgid "%d.%d kilometers"
-msgstr ""
+msgstr "%d, %d kilometer"
 
 #, c-format
 msgid "in %d.%d kilometers"
@@ -848,8 +848,8 @@
 msgstr "Letland"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Libië"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1423,19 +1423,19 @@
 msgstr "ZoomUit"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "Verminder zoom vlak"
 
 msgid "Zoom_In"
 msgstr "ZoomIn"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "Vermeerder zoom vlak"
 
 msgid "_Recalculate"
 msgstr "Herbereken"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Teken kaart oor"
 
 msgid "_Info"
 msgstr "Inligting"
@@ -1444,7 +1444,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Toon adres soek skerm"
 
 msgid "_Stop Navigation"
 msgstr "Stop Navigasie"
@@ -1468,19 +1468,19 @@
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Skakel kaart orientasie na noord of voertuig"
 
 msgid "_Roadbook"
 msgstr "Padkaart"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Toon/verskuil roete beskrywing"
 
 msgid "_Autozoom"
 msgstr "Outozoom"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Skakel Aan/af outomatiese zoom vlak verandering"
 
 msgid "_Fullscreen"
 msgstr "Volskerm"
@@ -1574,19 +1574,19 @@
 msgstr ""
 
 msgid "Cut Bookmark"
-msgstr ""
+msgstr "Sny Boekmerk"
 
 msgid "Copy Bookmark"
-msgstr ""
+msgstr "Kopieer Boekmerk"
 
 msgid "Rename Bookmark"
-msgstr ""
+msgstr "Hernoem Boekmerk"
 
 msgid "Paste Bookmark"
-msgstr ""
+msgstr "Plaas Boekmerk"
 
 msgid "Delete Bookmark"
-msgstr ""
+msgstr "Verwyder Boekmerk"
 
 msgid "Delete waypoint"
 msgstr ""
@@ -1608,11 +1608,11 @@
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
-msgstr ""
+msgstr "Voeg Boekmerk Leger by"
 
 #. Pastes the Bookmark
 msgid "Paste bookmark"
-msgstr ""
+msgstr "Plaas boekmerk"
 
 #, c-format
 msgid "Bookmark %s"
@@ -1638,10 +1638,10 @@
 msgstr "Wys Satelliet Inligting"
 
 msgid " Elevation "
-msgstr ""
+msgstr " Hoogte "
 
 msgid " Azimuth "
-msgstr ""
+msgstr " Rigting "
 
 msgid "Show NMEA Data"
 msgstr "Wys NMEA data"
@@ -1673,24 +1673,24 @@
 msgstr "Wys NMEA data"
 
 msgid "Add Bookmark"
-msgstr ""
+msgstr "Voeg Boekmerk by"
 
 msgid "Rename"
-msgstr ""
+msgstr "Hernoem"
 
 msgid "About Navit"
-msgstr ""
+msgstr "Rakende Navit"
 
 #. Authors
 msgid "By"
-msgstr ""
+msgstr "Skrywers"
 
 #. Contributors
 msgid "And all the Navit Team"
-msgstr ""
+msgstr "En die hele Navit Span"
 
 msgid "members and contributors."
-msgstr ""
+msgstr "lede en bydraers"
 
 msgid "Waypoints"
 msgstr ""
@@ -1698,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1738,10 +1738,10 @@
 msgstr "Hoë profiel"
 
 msgid "Route Description"
-msgstr ""
+msgstr "Roete Beskrywing"
 
 msgid "Show Locale"
-msgstr ""
+msgstr "Toon Lokalisering"
 
 msgid "Former Destinations"
 msgstr "Voorige bestemmings"
@@ -1811,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2406,7 +2403,7 @@
 msgstr "Roete"
 
 msgid "About"
-msgstr ""
+msgstr "Rakende"
 
 msgid "Actions"
 msgstr "Aksies"
@@ -2464,7 +2461,7 @@
 msgstr ""
 
 msgid "horse"
-msgstr ""
+msgstr "perd"
 
 #. chr:
 #. flags used for a truck: (first flag number is 0)
@@ -2487,15 +2484,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "In %s, gaan in die sirkel in"
-
-#~ msgid "Cursor"
-#~ msgstr "Plekaanduier"
-
-#~ msgid "%d.%d kilometer"
-#~ msgstr "%d.%d kilometer"

Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/ar.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,17 +7,17 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-02-01 17:37+0000\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Arabic <ar...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -116,20 +116,12 @@
 msgid_plural "%d miles"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #, c-format
 msgid "one kilometer"
@@ -865,8 +857,8 @@
 msgstr "لاتفيا"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "الجماهيريّة العربيّة اللّيبيّة"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1440,19 +1432,19 @@
 msgstr "صغّر الروئية"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "خفض مستوى التكبير"
 
 msgid "Zoom_In"
 msgstr "كبّر الروئية"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "إرفع مستوى التكبير"
 
 msgid "_Recalculate"
 msgstr "إعادة الحساب"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "أرسم الخريطو مجددا"
 
 msgid "_Info"
 msgstr "معلومات"
@@ -1461,7 +1453,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "إفتح حوار البحث عن عنوان"
 
 msgid "_Stop Navigation"
 msgstr "قف الملاحة"
@@ -1473,7 +1465,7 @@
 msgstr "_إنهاء"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "أنهِ التطبيق"
 
 msgid "Show position _cursor"
 msgstr ""
@@ -1485,19 +1477,19 @@
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "تبديل اتجاه الخريطة إلى الشمال أو إلى السيارة"
 
 msgid "_Roadbook"
 msgstr "سجل خريطة الطريق"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "أعرض/خبئ وصف الطريق"
 
 msgid "_Autozoom"
 msgstr "تكبير/تصغير تلقائي"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "فعل\\عطل تغيير مستوى التقريب تلقائياً"
 
 msgid "_Fullscreen"
 msgstr "ملء الشاشة"
@@ -1591,19 +1583,19 @@
 msgstr ""
 
 msgid "Cut Bookmark"
-msgstr ""
+msgstr "قص العلامة"
 
 msgid "Copy Bookmark"
-msgstr ""
+msgstr "انسخ علامة القرائة"
 
 msgid "Rename Bookmark"
-msgstr ""
+msgstr "إعادة تسمية العلامة"
 
 msgid "Paste Bookmark"
-msgstr ""
+msgstr "لصق العلامة"
 
 msgid "Delete Bookmark"
-msgstr ""
+msgstr "إحذف العلامة"
 
 msgid "Delete waypoint"
 msgstr ""
@@ -1625,11 +1617,11 @@
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
-msgstr ""
+msgstr "إضافة علامة على المجلد"
 
 #. Pastes the Bookmark
 msgid "Paste bookmark"
-msgstr ""
+msgstr "لصق العلامة"
 
 #, c-format
 msgid "Bookmark %s"
@@ -1693,21 +1685,21 @@
 msgstr "أضف إشارة مرجعية"
 
 msgid "Rename"
-msgstr ""
+msgstr "إعادة التسمية"
 
 msgid "About Navit"
-msgstr ""
+msgstr "عن Navit"
 
 #. Authors
 msgid "By"
-msgstr ""
+msgstr "حسب الكُتاب"
 
 #. Contributors
 msgid "And all the Navit Team"
-msgstr ""
+msgstr "وجميع فريق Navit"
 
 msgid "members and contributors."
-msgstr ""
+msgstr "الأعضاء والمساهمين ."
 
 msgid "Waypoints"
 msgstr ""
@@ -1715,10 +1707,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1828,9 +1820,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2423,7 +2412,7 @@
 msgstr "الطريق"
 
 msgid "About"
-msgstr ""
+msgstr "حوْل"
 
 msgid "Actions"
 msgstr "أفعال"
@@ -2502,15 +2491,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "بعد %s ، أدخل المسستديرة"
-
-#~ msgid "Cursor"
-#~ msgstr "المزلاق"
-
-#~ msgid "%d.%d kilometer"
-#~ msgstr "%d.%d كلم"

Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/ast.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-05-21 17:35+0000\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: Xuacu Saturio <xua...@gm...>\n"
 "Language-Team: Asturian <as...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ast\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -848,8 +848,8 @@
 msgstr "Letonia"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Jamahiriya Árabe Libia"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1423,19 +1423,19 @@
 msgstr "Amenorgar"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "Amenorgar el nivel d'ampliación"
 
 msgid "Zoom_In"
 msgstr "Aumentar"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "Aumentar el nivel d'ampliación"
 
 msgid "_Recalculate"
 msgstr "Recalcular"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Redibuxar el mapa"
 
 msgid "_Info"
 msgstr "Info"
@@ -1444,7 +1444,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Abre'l diálogu de guetar direición"
 
 msgid "_Stop Navigation"
 msgstr "Parar navegación"
@@ -1456,7 +1456,7 @@
 msgstr "_Colar"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "Colar de l'aplicación"
 
 msgid "Show position _cursor"
 msgstr ""
@@ -1468,19 +1468,19 @@
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Conmuta la orientación del mapa al norte o al vehículu"
 
 msgid "_Roadbook"
 msgstr "Llibru de ruta"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Amosar/anubrir la descripción de la ruta"
 
 msgid "_Autozoom"
 msgstr "Autozoom"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Activar/desactivar el cambéu automáticu del nivel d'ampliación"
 
 msgid "_Fullscreen"
 msgstr "Pantalla completa"
@@ -1698,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1811,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2487,12 +2484,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "En %s, entre na rotonda"
-
-#~ msgid "Cursor"
-#~ msgstr "Cursor"

Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/bg.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,17 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2009-12-20 20:36+0000\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: Alex Stanev <al...@st...>\n"
 "Language-Team: Bulgarian <bg...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:20+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "Language: bg\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -104,7 +105,7 @@
 
 #, c-format
 msgid "%d.%d kilometers"
-msgstr ""
+msgstr "%d.%d километра"
 
 #, c-format
 msgid "in %d.%d kilometers"
@@ -143,7 +144,7 @@
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto the street %s%s%s"
-msgstr ""
+msgstr "%sпо улица %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
 #, c-format
@@ -183,11 +184,11 @@
 
 #. TRANSLATORS: Don't forget the ending space
 msgid "really strongly "
-msgstr ""
+msgstr "наистина силно "
 
 #. TRANSLATORS: Don't forget the ending space
 msgid "unknown "
-msgstr ""
+msgstr "непознат "
 
 msgid "When possible, please turn around"
 msgstr "Когато е възможно обърнете"
@@ -218,7 +219,7 @@
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
-msgstr ""
+msgstr "Тръгнете по %1$s път към %2$s"
 
 #, c-format
 msgid "after %i roads"
@@ -848,8 +849,8 @@
 msgstr "Латвия"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Либийска Арабска Джамахирия"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1304,7 +1305,7 @@
 msgstr "Зимбабве"
 
 msgid "* Unknown, add is_in tags to those cities"
-msgstr ""
+msgstr "* Неизвестен, добавете is_in осм тагове за тези градове"
 
 msgid ""
 "navit usage:\n"
@@ -1435,7 +1436,7 @@
 msgstr "Преизчисляване"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Опресни картата"
 
 msgid "_Info"
 msgstr "Информация"
@@ -1444,7 +1445,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Отваря прозорец Търсене на адрес"
 
 msgid "_Stop Navigation"
 msgstr "Спри Навигацията"
@@ -1456,7 +1457,7 @@
 msgstr "_Изход"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "Изход от приложението"
 
 msgid "Show position _cursor"
 msgstr ""
@@ -1474,13 +1475,13 @@
 msgstr "Пътна книга"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Покажи/скрий детайлите на маршрута"
 
 msgid "_Autozoom"
 msgstr ""
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Разреши/забрани смяната на нивото на увеличение"
 
 msgid "_Fullscreen"
 msgstr "Цял екран"
@@ -1517,20 +1518,20 @@
 msgstr ""
 
 msgid "2D"
-msgstr ""
+msgstr "2D"
 
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 msgid "OT"
 msgstr ""
 
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr ""
+msgstr "Маршрут %4.0fкм %02d:%02d ОВП"
 
 msgid "Route 0000km  0+00:00 ETA"
-msgstr ""
+msgstr "Маршрут 0000fкм 0+00:00 ОВП"
 
 msgid "Help"
 msgstr "Помощ"
@@ -1638,30 +1639,30 @@
 msgstr "Покажи Състояние на Сателити"
 
 msgid " Elevation "
-msgstr ""
+msgstr " Височина "
 
 msgid " Azimuth "
-msgstr ""
+msgstr " Азимут "
 
 msgid "Show NMEA Data"
 msgstr "Покажи NMEA Данни"
 
 msgid "car"
-msgstr ""
+msgstr "автомобил"
 
 msgid "bike"
-msgstr ""
+msgstr "колело"
 
 msgid "pedestrian"
-msgstr ""
+msgstr "пешеходец"
 
 #, c-format
 msgid "Current profile: %s"
-msgstr ""
+msgstr "Текущ профил: %s"
 
 #, c-format
 msgid "Change profile to: %s"
-msgstr ""
+msgstr "Смени профил на: %s"
 
 msgid "Set as active"
 msgstr "Укажи като активен"
@@ -1673,13 +1674,13 @@
 msgstr "Покажи NMEA Данни"
 
 msgid "Add Bookmark"
-msgstr ""
+msgstr "Добави отметка"
 
 msgid "Rename"
-msgstr ""
+msgstr "Преименувай"
 
 msgid "About Navit"
-msgstr ""
+msgstr "За Navit"
 
 #. Authors
 msgid "By"
@@ -1698,10 +1699,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1717,7 +1718,7 @@
 msgstr "Правила"
 
 msgid "Lock on road"
-msgstr ""
+msgstr "Показвай на пътя"
 
 msgid "Northing"
 msgstr ""
@@ -1735,10 +1736,10 @@
 msgstr "Изглед"
 
 msgid "Height Profile"
-msgstr ""
+msgstr "Височинен профил"
 
 msgid "Route Description"
-msgstr ""
+msgstr "Описание на маршрута"
 
 msgid "Show Locale"
 msgstr ""
@@ -1750,7 +1751,7 @@
 msgstr ""
 
 msgid "Message"
-msgstr ""
+msgstr "Съобщение"
 
 msgid "Back"
 msgstr "Назад"
@@ -1811,9 +1812,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2406,7 +2404,7 @@
 msgstr "Маршрут"
 
 msgid "About"
-msgstr ""
+msgstr "Относно"
 
 msgid "Actions"
 msgstr "Действия"
@@ -2436,7 +2434,7 @@
 msgstr "Режим Прозорец"
 
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 msgid ""
 "Drop last \n"
@@ -2464,7 +2462,7 @@
 msgstr ""
 
 msgid "horse"
-msgstr ""
+msgstr "кон"
 
 #. chr:
 #. flags used for a truck: (first flag number is 0)
@@ -2487,15 +2485,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "След %s влезте в кръговото"
-
-#~ msgid "Cursor"
-#~ msgstr "Курсор"
-
-#~ msgid "%d.%d kilometer"
-#~ msgstr "%d.%d километра"

Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/ca.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-05-18 09:31+0000\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Catalan <ca...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -28,7 +28,7 @@
 
 #. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
-msgstr ""
+msgstr "zeroèssim"
 
 msgid "first"
 msgstr "primera"
@@ -50,7 +50,7 @@
 
 #. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
-msgstr ""
+msgstr "sortida zero"
 
 msgid "first exit"
 msgstr "primera sortida"
@@ -138,7 +138,7 @@
 msgstr "surt"
 
 msgid "into the ramp"
-msgstr ""
+msgstr "a la sortida"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -148,22 +148,22 @@
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto the %s%s%s|male form"
-msgstr ""
+msgstr "%s al %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto the %s%s%s|female form"
-msgstr ""
+msgstr "%s a la %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto the %s%s%s|neutral form"
-msgstr ""
+msgstr "%s a %s %s %s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr ""
+msgstr "%s cap a la %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
 msgid "right"
@@ -210,19 +210,19 @@
 
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr ""
+msgstr "Seguiu per la carretera durant els propers %s"
 
 msgid "soon"
-msgstr ""
+msgstr "aviat"
 
 #. TRANSLATORS: First argument is the how manieth street to take, second the direction
 #, c-format
 msgid "Take the %1$s road to the %2$s"
-msgstr ""
+msgstr "Preneu el %1$s carrer a la %2$s"
 
 #, c-format
 msgid "after %i roads"
-msgstr ""
+msgstr "després de %i carrers"
 
 msgid "now"
 msgstr "ara"
@@ -237,12 +237,12 @@
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
 #, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "Gireu %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr ""
+msgstr "després, gireu %1$s%2$s%3$s%4$s"
 
 #, c-format
 msgid "You have reached your destination %s"
@@ -271,13 +271,13 @@
 msgstr "Temps"
 
 msgid "Destination Length"
-msgstr ""
+msgstr "Distància fins a destinació"
 
 msgid "Destination Time"
-msgstr ""
+msgstr "Temps fins a destinació"
 
 msgid "Roadbook"
-msgstr ""
+msgstr "Full de ruta"
 
 #, c-format
 msgid "Waypoint %d"
@@ -287,13 +287,13 @@
 msgstr ""
 
 msgid "Set as position"
-msgstr ""
+msgstr "Estableix com a posició"
 
 msgid "Set as destination"
-msgstr ""
+msgstr "Estableix com a destinació"
 
 msgid "Add as bookmark"
-msgstr ""
+msgstr "Afegeix a les adreces d'interès"
 
 #, c-format
 msgid "Point 0x%x 0x%x"
@@ -301,7 +301,7 @@
 
 #, c-format
 msgid "Screen coord : %d %d"
-msgstr ""
+msgstr "Coordenades de pantalla : %d %d"
 
 #. 020
 msgid "Andorra"
@@ -321,7 +321,7 @@
 
 #. 660
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #. 008
 msgid "Albania"
@@ -369,7 +369,7 @@
 
 #. 031
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaitjan"
 
 #. 070
 msgid "Bosnia and Herzegovina"
@@ -389,7 +389,7 @@
 
 #. 854
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. 100
 msgid "Bulgaria"
@@ -405,11 +405,11 @@
 
 #. 204
 msgid "Benin"
-msgstr ""
+msgstr "Benín"
 
 #. 652
 msgid "Saint Barthelemy"
-msgstr ""
+msgstr "Saint Barthélemy"
 
 #. 060
 msgid "Bermuda"
@@ -433,7 +433,7 @@
 
 #. 044
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahames"
 
 #. 064
 msgid "Bhutan"
@@ -441,7 +441,7 @@
 
 #. 074
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Illa Bouvet"
 
 #. 072
 msgid "Botswana"
@@ -453,7 +453,7 @@
 
 #. 084
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #. 124
 msgid "Canada"
@@ -461,7 +461,7 @@
 
 #. 166
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Illes Cocos (Keeling)"
 
 #. 180
 msgid "Congo, Democratic Republic of the"
@@ -469,7 +469,7 @@
 
 #. 140
 msgid "Central African Republic"
-msgstr ""
+msgstr "República Centreafricana"
 
 #. 178
 msgid "Congo"
@@ -493,7 +493,7 @@
 
 #. 120
 msgid "Cameroon"
-msgstr ""
+msgstr "Camerun"
 
 #. 156
 msgid "China"
@@ -521,7 +521,7 @@
 
 #. 162
 msgid "Christmas Island"
-msgstr ""
+msgstr "Illa Christmas"
 
 #. 196
 msgid "Cyprus"
@@ -537,7 +537,7 @@
 
 #. 262
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #. 208
 msgid "Denmark"
@@ -589,11 +589,11 @@
 
 #. 242
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #. 238
 msgid "Falkland Islands (Malvinas)"
-msgstr ""
+msgstr "Illes Malvines"
 
 #. 583
 msgid "Micronesia, Federated States of"
@@ -601,7 +601,7 @@
 
 #. 234
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Illes Fèroe"
 
 #. 250
 msgid "France"
@@ -609,7 +609,7 @@
 
 #. 266
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #. 826
 msgid "United Kingdom"
@@ -617,7 +617,7 @@
 
 #. 308
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #. 268
 msgid "Georgia"
@@ -625,7 +625,7 @@
 
 #. 254
 msgid "French Guiana"
-msgstr ""
+msgstr "Guaiana Francesa"
 
 #. 831
 msgid "Guernsey"
@@ -641,7 +641,7 @@
 
 #. 304
 msgid "Greenland"
-msgstr ""
+msgstr "Groenlàndia"
 
 #. 270
 msgid "Gambia"
@@ -653,7 +653,7 @@
 
 #. 312
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadalupe"
 
 #. 226
 msgid "Equatorial Guinea"
@@ -665,7 +665,7 @@
 
 #. 239
 msgid "South Georgia and the South Sandwich Islands"
-msgstr ""
+msgstr "Illes Geòrgia del Sud i Sandwich del Sud"
 
 #. 320
 msgid "Guatemala"
@@ -677,11 +677,11 @@
 
 #. 624
 msgid "Guinea-Bissau"
-msgstr ""
+msgstr "Guinea Bissau"
 
 #. 328
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #. 344
 msgid "Hong Kong"
@@ -693,7 +693,7 @@
 
 #. 340
 msgid "Honduras"
-msgstr ""
+msgstr "Hondures"
 
 #. 191
 msgid "Croatia"
@@ -701,7 +701,7 @@
 
 #. 332
 msgid "Haiti"
-msgstr ""
+msgstr "Haití"
 
 #. 348
 msgid "Hungary"
@@ -729,7 +729,7 @@
 
 #. 086
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Territori britànic de l'oceà Índic"
 
 #. 368
 msgid "Iraq"
@@ -737,7 +737,7 @@
 
 #. 364
 msgid "Iran, Islamic Republic of"
-msgstr ""
+msgstr "Iran"
 
 #. 352
 msgid "Iceland"
@@ -749,7 +749,7 @@
 
 #. 832
 msgid "Jersey"
-msgstr ""
+msgstr "Jersey"
 
 #. 388
 msgid "Jamaica"
@@ -757,7 +757,7 @@
 
 #. 400
 msgid "Jordan"
-msgstr ""
+msgstr "Jordània"
 
 #. 392
 msgid "Japan"
@@ -769,31 +769,31 @@
 
 #. 417
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kirguizistan"
 
 #. 116
 msgid "Cambodia"
-msgstr ""
+msgstr "Cambodja"
 
 #. 296
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #. 174
 msgid "Comoros"
-msgstr ""
+msgstr "Comores"
 
 #. 659
 msgid "Saint Kitts and Nevis"
-msgstr ""
+msgstr "Saint Kitts i Nevis"
 
 #. 408
 msgid "Korea, Democratic People's Republic of"
-msgstr ""
+msgstr "Corea del Nord"
 
 #. 410
 msgid "Korea, Republic of"
-msgstr ""
+msgstr "Corea del Sud"
 
 #. 414
 msgid "Kuwait"
@@ -801,23 +801,23 @@
 
 #. 136
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Illes Caiman"
 
 #. 398
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
 
 #. 418
 msgid "Lao People's Democratic Republic"
-msgstr ""
+msgstr "Laos"
 
 #. 422
 msgid "Lebanon"
-msgstr ""
+msgstr "Líban"
 
 #. 662
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #. 438
 msgid "Liechtenstein"
@@ -833,7 +833,7 @@
 
 #. 426
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #. 440
 msgid "Lithuania"
@@ -845,10 +845,10 @@
 
 #. 428
 msgid "Latvia"
-msgstr ""
+msgstr "Letònia"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
+msgid "Libya"
 msgstr ""
 
 #. 504
@@ -869,7 +869,7 @@
 
 #. 663
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Saint-Martin (zona francesa)"
 
 #. 450
 msgid "Madagascar"
@@ -877,19 +877,19 @@
 
 #. 584
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Illes Marshall"
 
 #. 807
 msgid "Macedonia, the former Yugoslav Republic of"
-msgstr ""
+msgstr "Macedònia"
 
 #. 466
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. 104
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #. 496
 msgid "Mongolia"
@@ -897,15 +897,15 @@
 
 #. 446
 msgid "Macao"
-msgstr ""
+msgstr "Macau"
 
 #. 580
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Illes Marianes del nord"
 
 #. 474
 msgid "Martinique"
-msgstr ""
+msgstr "Martinica"
 
 #. 478
 msgid "Mauritania"
@@ -921,11 +921,11 @@
 
 #. 480
 msgid "Mauritius"
-msgstr ""
+msgstr "Maurici"
 
 #. 462
 msgid "Maldives"
-msgstr ""
+msgstr "Maldives"
 
 #. 454
 msgid "Malawi"
@@ -953,11 +953,11 @@
 
 #. 562
 msgid "Niger"
-msgstr ""
+msgstr "Níger"
 
 #. 574
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Illa Norfolk"
 
 #. 566
 msgid "Nigeria"
@@ -969,7 +969,7 @@
 
 #. 528
 msgid "Netherlands"
-msgstr ""
+msgstr "Països Baixos"
 
 #. 578
 msgid "Norway"
@@ -981,11 +981,11 @@
 
 #. 520
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. 570
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #. 554
 msgid "New Zealand"
@@ -993,7 +993,7 @@
 
 #. 512
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #. 591
 msgid "Panama"
@@ -1005,19 +1005,19 @@
 
 #. 258
 msgid "French Polynesia"
-msgstr ""
+msgstr "Polinèsia francesa"
 
 #. 598
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nova Guinea"
 
 #. 608
 msgid "Philippines"
-msgstr ""
+msgstr "Filipines"
 
 #. 586
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #. 616
 msgid "Poland"
@@ -1037,7 +1037,7 @@
 
 #. 275
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Palestina (territori ocupat)"
 
 #. 620
 msgid "Portugal"
@@ -1049,7 +1049,7 @@
 
 #. 600
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguai"
 
 #. 634
 msgid "Qatar"
@@ -1057,7 +1057,7 @@
 
 #. 638
 msgid "Reunion"
-msgstr ""
+msgstr "Illa de la Reunió"
 
 #. 642
 msgid "Romania"
@@ -1077,11 +1077,11 @@
 
 #. 682
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Aràbia Saudita"
 
 #. 090
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Illes Salomó"
 
 #. 690
 msgid "Seychelles"
@@ -1101,7 +1101,7 @@
 
 #. 654
 msgid "Saint Helena"
-msgstr ""
+msgstr "Santa Helena"
 
 #. 705
 msgid "Slovenia"
@@ -1121,7 +1121,7 @@
 
 #. 674
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #. 686
 msgid "Senegal"
@@ -1133,7 +1133,7 @@
 
 #. 740
 msgid "Suriname"
-msgstr ""
+msgstr "Surinam"
 
 #. 728
 msgid "South Sudan"
@@ -1141,7 +1141,7 @@
 
 #. 678
 msgid "Sao Tome and Principe"
-msgstr ""
+msgstr "São Tomé i Príncipe"
 
 #. 222
 msgid "El Salvador"
@@ -1157,11 +1157,11 @@
 
 #. 748
 msgid "Swaziland"
-msgstr ""
+msgstr "Swazilàndia"
 
 #. 796
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "Illes Turks i Caicos"
 
 #. 148
 msgid "Chad"
@@ -1169,7 +1169,7 @@
 
 #. 260
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Territoris francesos del sud"
 
 #. 768
 msgid "Togo"
@@ -1181,11 +1181,11 @@
 
 #. 762
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tadjikistan"
 
 #. 772
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #. 626
 msgid "Timor-Leste"
@@ -1193,11 +1193,11 @@
 
 #. 795
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #. 788
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunísia"
 
 #. 776
 msgid "Tonga"
@@ -1209,7 +1209,7 @@
 
 #. 780
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "Trinitat i Tobago"
 
 #. 798
 msgid "Tuvalu"
@@ -1217,7 +1217,7 @@
 
 #. 158
 msgid "Taiwan, Province of China"
-msgstr ""
+msgstr "Taiwan"
 
 #. 834
 msgid "Tanzania, United Republic of"
@@ -1233,7 +1233,7 @@
 
 #. 581
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Illes perifèriques menors dels Estats Units"
 
 #. 840
 msgid "United States"
@@ -1245,7 +1245,7 @@
 
 #. 860
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #. 336
 msgid "Holy See (Vatican City State)"
@@ -1261,15 +1261,15 @@
 
 #. 092
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Illes Verges Britàniques"
 
 #. 850
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Illes Verges Nord-americanes"
 
 #. 704
 msgid "Viet Nam"
-msgstr ""
+msgstr "Vietnam"
 
 #. 548
 msgid "Vanuatu"
@@ -1285,7 +1285,7 @@
 
 #. 887
 msgid "Yemen"
-msgstr ""
+msgstr "Iemen"
 
 #. 175
 msgid "Mayotte"
@@ -1293,7 +1293,7 @@
 
 #. 710
 msgid "South Africa"
-msgstr ""
+msgstr "Sud-àfrica"
 
 #. 894
 msgid "Zambia"
@@ -1301,7 +1301,7 @@
 
 #. 716
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 msgid "* Unknown, add is_in tags to those cities"
 msgstr "* Desconegut, afegiu etiquetes is_in a aquestes ciutats"
@@ -1383,13 +1383,13 @@
 msgstr "Ciutat"
 
 msgid "District/Township"
-msgstr ""
+msgstr "Districte/Municipi"
 
 msgid "Map"
 msgstr "Mapa"
 
 msgid "Bookmark"
-msgstr ""
+msgstr "Adreça d'interès"
 
 msgid "Destination"
 msgstr "Destinació"
@@ -1423,19 +1423,19 @@
 msgstr "Allunya"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "Allunya el zoom"
 
 msgid "Zoom_In"
 msgstr "Apropa"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "Apropa el zoom"
 
 msgid "_Recalculate"
 msgstr "Recalcula"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Torna a dibuixar el mapa"
 
 msgid "_Info"
 msgstr "Informació"
@@ -1444,7 +1444,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Obre el diàleg de cercar adreces"
 
 msgid "_Stop Navigation"
 msgstr "Atura la navegació"
@@ -1456,7 +1456,7 @@
 msgstr "_Surt"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "Surt de l'aplicació"
 
 msgid "Show position _cursor"
 msgstr ""
@@ -1468,19 +1468,19 @@
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Alterna l'orientació del mapa cap al nord o cap al vehicle"
 
 msgid "_Roadbook"
 msgstr ""
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Mostra/amaga la descripció de la ruta"
 
 msgid "_Autozoom"
 msgstr "Zoom automàtic"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Activar/desactivar zoom automàtic"
 
 msgid "_Fullscreen"
 msgstr "Pantalla completa"
@@ -1527,10 +1527,10 @@
 
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr ""
+msgstr "Ruta %4.0fkm    %02d:%02d TEA"
 
 msgid "Route 0000km  0+00:00 ETA"
-msgstr ""
+msgstr "Ruta 0000km 0+00:00 TEA"
 
 msgid "Help"
 msgstr "Ajuda"
@@ -1553,7 +1553,7 @@
 msgstr "Carrers"
 
 msgid "House numbers"
-msgstr ""
+msgstr "Números de casa/portal"
 
 msgid "View Attributes"
 msgstr "Visualitza els atributs"
@@ -1574,25 +1574,25 @@
 msgstr ""
 
 msgid "Cut Bookmark"
-msgstr ""
+msgstr "Retalla el punt"
 
 msgid "Copy Bookmark"
-msgstr ""
+msgstr "Copia el punt"
 
 msgid "Rename Bookmark"
-msgstr ""
+msgstr "Canvia el nom de l'adreça d'interès"
 
 msgid "Paste Bookmark"
-msgstr ""
+msgstr "Enganxa el punt"
 
 msgid "Delete Bookmark"
-msgstr ""
+msgstr "Elimina l'adreça d'interès"
 
 msgid "Delete waypoint"
 msgstr ""
 
 msgid "Bookmarks"
-msgstr ""
+msgstr "Adreces d'interés"
 
 msgid "Bookmarks as waypoints"
 msgstr ""
@@ -1608,11 +1608,11 @@
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
-msgstr ""
+msgstr "Afegeix carpeta de punts"
 
 #. Pastes the Bookmark
 msgid "Paste bookmark"
-msgstr ""
+msgstr "Enganxa el punt"
 
 #, c-format
 msgid "Bookmark %s"
@@ -1664,7 +1664,7 @@
 msgstr "Canvia el perfil a: %s"
 
 msgid "Set as active"
-msgstr ""
+msgstr "Habilita"
 
 msgid "Show Satellite status"
 msgstr "Mostra l'estat del satèl·lit"
@@ -1673,24 +1673,24 @@
 msgstr "Mostra les dades NMEA"
 
 msgid "Add Bookmark"
-msgstr ""
+msgstr "Afegeix a les adreces d'interès"
 
 msgid "Rename"
-msgstr ""
+msgstr "Reanomena"
 
 msgid "About Navit"
-msgstr ""
+msgstr "Quant a Navit"
 
 #. Authors
 msgid "By"
-msgstr ""
+msgstr "Per"
 
 #. Contributors
 msgid "And all the Navit Team"
-msgstr ""
+msgstr "I tots els membres i col·laboradors"
 
 msgid "members and contributors."
-msgstr ""
+msgstr "de l'equip del Navit."
 
 msgid "Waypoints"
 msgstr ""
@@ -1698,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1717,10 +1717,10 @@
 msgstr "Regles"
 
 msgid "Lock on road"
-msgstr ""
+msgstr "Centra't a la carretera"
 
 msgid "Northing"
-msgstr ""
+msgstr "Orientació sempre al nord"
 
 msgid "Map follows Vehicle"
 msgstr "El mapa segueix el vehicle"
@@ -1735,13 +1735,13 @@
 msgstr "Disposició"
 
 msgid "Height Profile"
-msgstr ""
+msgstr "Perfil d'alçada"
 
 msgid "Route Description"
 msgstr "Descripció de la ruta"
 
 msgid "Show Locale"
-msgstr ""
+msgstr "Mostra la localitat"
 
 msgid "Former Destinations"
 msgstr "Destinacions anteriors"
@@ -1811,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2406,7 +2403,7 @@
 msgstr "Ruta"
 
 msgid "About"
-msgstr ""
+msgstr "Quant a..."
 
 msgid "Actions"
 msgstr "Accions"
@@ -2487,9 +2484,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "Cursor"
-#~ msgstr "Cursor"

Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/cs.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,15 +7,17 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-29 00:13+0400\n"
-"PO-Revision-Date: 2013-08-30 08:53+0100\n"
-"Last-Translator: lenochod <len...@ti...>\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:40+0000\n"
+"Last-Translator: lenochod <Unknown>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
+"Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1601,7 +1603,7 @@
 msgstr "Smazat záložku"
 
 msgid "Delete waypoint"
-msgstr "Smazat bod trasy "
+msgstr "Smazat bod trasy"
 
 msgid "Bookmarks"
 msgstr "Záložky"
@@ -1710,10 +1712,10 @@
 msgid "Enter Coordinates"
 msgstr "Zadejte souřadnice"
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -2082,7 +2084,7 @@
 msgstr "USA"
 
 msgid " (except Alaska and Hawaii)"
-msgstr "(mimo Aljašky a Havaje)"
+msgstr " (mimo Aljašky a Havaje)"
 
 msgid "Midwest"
 msgstr ""
@@ -2169,7 +2171,7 @@
 msgstr "Utah"
 
 msgid "Washington State"
-msgstr "Stát Washington "
+msgstr "Stát Washington"
 
 msgid "South+Middle America"
 msgstr "Jižní+Střední Amerika"
@@ -2513,18 +2515,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr "kamión"
-
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Libyjská arabská džamáhíríje"
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "Za %s, najeďte na kruhový objezd"
-
-#~ msgid "Cursor"
-#~ msgstr "Kurzor"
-
-#~ msgid "%d.%d kilometer"
-#~ msgstr "%d.%d kilometrů"

Modified: trunk/navit/po/da.po.in
===================================================================
--- trunk/navit/po/da.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/da.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-05-18 09:31+0000\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:40+0000\n"
 "Last-Translator: Lasse Luttermann <lut...@si...>\n"
 "Language-Team: Glenn Sommer <gl...@gm...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -848,8 +848,8 @@
 msgstr "Letland"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Libysk-arabisk Jamahiriya"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1423,19 +1423,19 @@
 msgstr "Zoom ud"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "Sænk zoom niveau"
 
 msgid "Zoom_In"
 msgstr "Zoom ind"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "Øg zoom niveau"
 
 msgid "_Recalculate"
 msgstr "Genberegn"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Gentegn kort"
 
 msgid "_Info"
 msgstr "Info"
@@ -1444,7 +1444,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Åbner adressesøgning"
 
 msgid "_Stop Navigation"
 msgstr "Stop Navigation"
@@ -1456,7 +1456,7 @@
 msgstr "_Afslut"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "Afslut programmet"
 
 msgid "Show position _cursor"
 msgstr ""
@@ -1468,19 +1468,19 @@
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Skifter kort-orientering mellem nord og følg køretøjet"
 
 msgid "_Roadbook"
 msgstr "Vejbog"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Vis/gem rute-beskrivelse"
 
 msgid "_Autozoom"
 msgstr "Autozoom"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Aktivér/deaktivér automatisk zoom niveauændring"
 
 msgid "_Fullscreen"
 msgstr "Fuldskærm"
@@ -1523,7 +1523,7 @@
 msgstr "3D"
 
 msgid "OT"
-msgstr ""
+msgstr "OT"
 
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
@@ -1574,19 +1574,19 @@
 msgstr ""
 
 msgid "Cut Bookmark"
-msgstr ""
+msgstr "Klip bogmærke"
 
 msgid "Copy Bookmark"
-msgstr ""
+msgstr "Kopiér bogmærke"
 
 msgid "Rename Bookmark"
-msgstr ""
+msgstr "Omdøb bogmærke"
 
 msgid "Paste Bookmark"
-msgstr ""
+msgstr "Indsæt bogmærke"
 
 msgid "Delete Bookmark"
-msgstr ""
+msgstr "Slet bogmærke"
 
 msgid "Delete waypoint"
 msgstr ""
@@ -1608,11 +1608,11 @@
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
-msgstr ""
+msgstr "Tilføj bogmærkemappe"
 
 #. Pastes the Bookmark
 msgid "Paste bookmark"
-msgstr ""
+msgstr "Indsæt bogmærke"
 
 #, c-format
 msgid "Bookmark %s"
@@ -1638,10 +1638,10 @@
 msgstr "Vis satellit status"
 
 msgid " Elevation "
-msgstr ""
+msgstr " højde "
 
 msgid " Azimuth "
-msgstr ""
+msgstr " azimut "
 
 msgid "Show NMEA Data"
 msgstr "Vis NMEA data"
@@ -1676,21 +1676,21 @@
 msgstr "Tilføj Bogmærke"
 
 msgid "Rename"
-msgstr ""
+msgstr "Omdøb"
 
 msgid "About Navit"
-msgstr ""
+msgstr "Om Navit"
 
 #. Authors
 msgid "By"
-msgstr ""
+msgstr "Af"
 
 #. Contributors
 msgid "And all the Navit Team"
-msgstr ""
+msgstr "Og hele Navit-holdets"
 
 msgid "members and contributors."
-msgstr ""
+msgstr "medlemmer og bidragsydere."
 
 msgid "Waypoints"
 msgstr ""
@@ -1698,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1811,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2406,7 +2403,7 @@
 msgstr "Rute"
 
 msgid "About"
-msgstr ""
+msgstr "Om"
 
 msgid "Actions"
 msgstr "Funktioner"
@@ -2487,15 +2484,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "Om %s, kør ind i rundkørslen"
-
-#~ msgid "Cursor"
-#~ msgstr "Markør"
-
-#~ msgid "%d.%d kilometer"
-#~ msgstr "%d.%d kilometer"

Modified: trunk/navit/po/de_CH.po.in
===================================================================
--- trunk/navit/po/de_CH.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/de_CH.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -6,16 +6,17 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
 "PO-Revision-Date: 2010-05-18 08:49+0000\n"
 "Last-Translator: \n"
 "Language-Team: German (Switzerland) <de...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "Language: \n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -847,7 +848,7 @@
 msgstr ""
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
+msgid "Libya"
 msgstr ""
 
 #. 504
@@ -1697,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1810,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2482,6 +2480,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""

Modified: trunk/navit/po/el.po.in
===================================================================
--- trunk/navit/po/el.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/el.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-05-24 14:51+0000\n"
-"Last-Translator: aitolos <Unknown>\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:41+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Greek <el...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -848,8 +848,8 @@
 msgstr "Λεττονία"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Λυβική Αραβική Τζαμαχιρία"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1423,19 +1423,19 @@
 msgstr "Σμίκρυνση"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "Μείωση κλίμακας εστίασης"
 
 msgid "Zoom_In"
 msgstr "Μεγέθυνση"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "Αυξηση κλίμακας εστίασης"
 
 msgid "_Recalculate"
 msgstr "Επαναϋπολογισμός"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Επανασχεδίαση χάρτη"
 
 msgid "_Info"
 msgstr "Πληροφορίες"
@@ -1444,7 +1444,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Ανοιγμα διαλόγου αναζήτησης διεύθυνσης"
 
 msgid "_Stop Navigation"
 msgstr "Διακοπή πλοήγησης"
@@ -1456,7 +1456,7 @@
 msgstr "_Έξοδος"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "Έξοδος από την εφαρμογή"
 
 msgid "Show position _cursor"
 msgstr ""
@@ -1468,19 +1468,19 @@
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Εναλάσει το προσανατολισμό του χάρτη στο βορά ή στο αυτοκίνητο"
 
 msgid "_Roadbook"
 msgstr "Οδηγίες Διαδρομής"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Εμφάνιση/απόκρυψη περιγραφής δρομολογίου"
 
 msgid "_Autozoom"
 msgstr "Αυτόματο Ζουμ"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "(Απ)ενεργοποίηση αυτόματης αλλαγής εστίασης"
 
 msgid "_Fullscreen"
 msgstr "Πλήρης Οθόνη"
@@ -1698,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1811,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2485,21 +2482,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "Σε %s, μπες σε κυκλική πορεία"
-
-#~ msgid "Cursor"
-#~ msgstr "Δρομέας"
-
-#~ msgid "%d.%d kilometer"
-#~ msgstr "%d %d χιλιόμετρα"
-
-#~ msgid " PRN "
-#~ msgstr " PRN "
-
-#~ msgid " SNR "
-#~ msgstr " SNR "

Modified: trunk/navit/po/en_AU.po.in
===================================================================
--- trunk/navit/po/en_AU.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/en_AU.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-09-12 05:53+0000\n"
-"Last-Translator: Athol Mullen <Unknown>\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:41+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: English (Australia) <en...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -848,8 +848,8 @@
 msgstr "Latvia"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Libyan Arab Jamahiriya"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1698,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1811,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2487,12 +2484,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "Enter the roundabout soon and leave it at the %s"
-#~ msgstr "Enter the roundabout soon and leave it at the %s"
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "In %s, enter the roundabout"

Modified: trunk/navit/po/en_GB.po.in
===================================================================
--- trunk/navit/po/en_GB.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/en_GB.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-05-29 13:38+0000\n"
-"Last-Translator: Matthew Gall <mat...@gm...>\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-28 01:41+0000\n"
+"Last-Translator: Matthew Gall <Unknown>\n"
 "Language-Team: English (United Kingdom) <en...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -848,8 +848,8 @@
 msgstr "Latvia"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Libyan Arab Jamahiriya"
+msgid "Libya"
+msgstr ""
 
 #. 504
 msgid "Morocco"
@@ -1423,19 +1423,19 @@
 msgstr "ZoomOut"
 
 msgid "Decrease zoom level"
-msgstr ""
+msgstr "Decrease zoom level"
 
 msgid "Zoom_In"
 msgstr "ZoomIn"
 
 msgid "Increase zoom level"
-msgstr ""
+msgstr "Increase zoom level"
 
 msgid "_Recalculate"
 msgstr "Recalculate"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Redraw map"
 
 msgid "_Info"
 msgstr "Info"
@@ -1444,7 +1444,7 @@
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Opens address search dialogue"
 
 msgid "_Stop Navigation"
 msgstr "Stop navigation"
@@ -1456,31 +1456,31 @@
 msgstr "_Quit"
 
 msgid "Quit the application"
-msgstr ""
+msgstr "Quit the application"
 
 msgid "Show position _cursor"
 msgstr ""
 
 msgid "_Lock on Road"
-msgstr " Lock on road"
+msgstr "Lock on road"
 
 msgid "_Keep orientation to the North"
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Switches map orientation to the north or the vehicle"
 
 msgid "_Roadbook"
 msgstr "Roadbook"
 
 msgid "Show/hide route description"
-msgstr ""
+msgstr "Show/hide route description"
 
 msgid "_Autozoom"
 msgstr "Autozoom"
 
 msgid "Enable/disable automatic zoom level changing"
-msgstr ""
+msgstr "Enable/disable automatic zoom level changing"
 
 msgid "_Fullscreen"
 msgstr "Fullscreen"
@@ -1698,10 +1698,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1720,10 +1720,10 @@
 msgstr "Lock on road"
 
 msgid "Northing"
-msgstr " Orient map North"
+msgstr "Orient map North"
 
 msgid "Map follows Vehicle"
-msgstr " Map follows vehicle"
+msgstr "Map follows vehicle"
 
 msgid "Plan with Waypoints"
 msgstr ""
@@ -1811,9 +1811,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2483,21 +2480,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr ""
-
-#~ msgid "In %s, enter the roundabout"
-#~ msgstr "In %s, enter the roundabout"
-
-#~ msgid "Cursor"
-#~ msgstr "Cursor"
-
-#~ msgid "%d.%d kilometer"
-#~ msgstr "%d.%d kilometre"
-
-#~ msgid " SNR "
-#~ msgstr " SNR "
-
-#~ msgid " PRN "
-#~ msgstr " PRN "

Modified: trunk/navit/po/eo.po.in
===================================================================
--- trunk/navit/po/eo.po.in	2013-10-08 17:24:41 UTC (rev 5651)
+++ trunk/navit/po/eo.po.in	2013-10-08 17:50:42 UTC (rev 5652)
@@ -7,24 +7,25 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2009-12-20 20:37+0000\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-09-27 21:43+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Esperanto <eo...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
-msgstr ""
+msgstr "Rulanta el fontdosierujo\n"
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
-msgstr ""
+msgstr "agordanta '%s' kiel '%s'\n"
 
 #. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
@@ -50,33 +51,33 @@
 
 #. TRANSLATORS: the following counts refer to roundabout exits
 msgid "zeroth exit"
-msgstr ""
+msgstr "nula eliro"
 
 msgid "first exit"
-msgstr ""
+msgstr "unua eliro"
 
 msgid "second exit"
-msgstr ""
+msgstr "dua eliro"
 
 msgid "third exit"
-msgstr ""
+msgstr "tria eliro"
 
 msgid "fourth exit"
-msgstr ""
+msgstr "kvara eliro"
 
 msgid "fifth exit"
-msgstr ""
+msgstr "kvina eliro"
 
 msgid "sixth exit"
-msgstr ""
+msgstr "sesa eliro"
 
 #, c-format
 msgid "%d m"
-msgstr ""
+msgstr "%d m"
 
 #, c-format
 msgid "in %d m"
-msgstr ""
+msgstr "en %d m"
 
 #, c-format
 msgid "%d feet"
@@ -92,7 +93,7 @@
 
 #, c-format
 msgid "in %d meters"
-msgstr ""
+msgstr "en %d metrojn"
 
 #, c-format
 msgid "%d.%d miles"
@@ -104,11 +105,11 @@
 
 #, c-format
 msgid "%d.%d kilometers"
-msgstr ""
+msgstr "%d.%d kilometrojn"
 
 #, c-format
 msgid "in %d.%d kilometers"
-msgstr ""
+msgstr "en %d.%d kilometrojn"
 
 #, c-format
 msgid "one mile"
@@ -131,39 +132,39 @@
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "en unu kilometron"
+msgstr[1] "en %d kilometrojn"
 
 msgid "exit"
-msgstr ""
+msgstr "eliro"
 
 msgid "into the ramp"
-msgstr ""
+msgstr "al la ramplon"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto the street %s%s%s"
-msgstr ""
+msgstr "%sal la straton %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) ...
 
[truncated message content]

[Navit-cvs-commit] SF.net SVN: navit:[5651] trunk/navit/po/de.po.in

From: <ka...@us...> - 2013-10-08 17:24:46

Revision: 5651
          http://sourceforge.net/p/navit/code/5651
Author:   kazer_
Date:     2013-10-08 17:24:41 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Add:core:Updated German translations from launchpa, thanks Usul

Modified Paths:
--------------
    trunk/navit/po/de.po.in

Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in	2013-10-01 22:10:16 UTC (rev 5650)
+++ trunk/navit/po/de.po.in	2013-10-08 17:24:41 UTC (rev 5651)
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-06-01 22:09+0000\n"
-"Last-Translator: Achim Behrens <Unknown>\n"
+"POT-Creation-Date: 2013-10-08 04:21+0200\n"
+"PO-Revision-Date: 2013-10-08 10:15+0000\n"
+"Last-Translator: Usul <Unknown>\n"
 "Language-Team: Martin Schaller <mar...@so...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-08 16:21+0000\n"
+"X-Generator: Launchpad (build 16799)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -851,8 +851,8 @@
 msgstr "Lettland"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
-msgstr "Libysch-Arabische Dschamahirija"
+msgid "Libya"
+msgstr "Lybien"
 
 #. 504
 msgid "Morocco"
@@ -1713,10 +1713,10 @@
 msgid "Enter Coordinates"
 msgstr "Koordinaten eingeben"
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1812,103 +1812,100 @@
 msgstr "Ziel setzen"
 
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgstr "Kartendaten (c) von OpenStreetMap unter ODbL"
 
 msgid "Downloaded maps"
 msgstr "Heruntergeladene Karten"
 
 msgid "Whole Planet"
-msgstr ""
+msgstr "Ganze Welt"
 
 msgid "Africa"
-msgstr ""
+msgstr "Afrika"
 
 msgid "Canary Islands"
-msgstr ""
+msgstr "Kanarische Inseln"
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
-msgstr ""
+msgstr "Asien"
 
 msgid "Korea"
-msgstr ""
+msgstr "Korea"
 
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 msgid "UAE+Other"
-msgstr ""
+msgstr "Vereinigte Arabische Emirate+weitere"
 
 msgid "Oceania"
-msgstr ""
+msgstr "Ozeanien"
 
 msgid "Tasmania"
-msgstr ""
+msgstr "Tasmanien"
 
 msgid "Victoria"
-msgstr ""
+msgstr "Victoria"
 
 msgid "New South Wales"
-msgstr ""
+msgstr "New South Wales"
 
 msgid "Europe"
-msgstr ""
+msgstr "Europa"
 
 msgid "Western Europe"
-msgstr ""
+msgstr "West-Europa"
 
 msgid "Azores"
-msgstr ""
+msgstr "Azoren"
 
 msgid "BeNeLux"
-msgstr ""
+msgstr "Beneluxländer"
 
 msgid "Alsace"
-msgstr ""
+msgstr "Elsass"
 
 msgid "Aquitaine"
-msgstr ""
+msgstr "Aquitanien"
 
 msgid "Auvergne"
-msgstr ""
+msgstr "Auvergne"
 
 msgid "Basse-Normandie"
-msgstr ""
+msgstr "Basse-Normandie"
 
 msgid "Bourgogne"
-msgstr ""
+msgstr "Burgund"
 
 msgid "Bretagne"
-msgstr ""
+msgstr "Bretagne"
 
 msgid "Centre"
 msgstr ""
 
 msgid "Champagne-Ardenne"
-msgstr ""
+msgstr "Champagne-Ardenne"
 
 msgid "Corse"
-msgstr ""
+msgstr "Korsika"
 
 msgid "Franche-Comte"
 msgstr ""
 
 msgid "Haute-Normandie"
-msgstr ""
+msgstr "Haute Normandie"
 
 msgid "Ile-de-France"
 msgstr ""
 
 msgid "Languedoc-Roussillon"
-msgstr ""
+msgstr "Languedoc-Roussillon"
 
 msgid "Limousin"
-msgstr ""
+msgstr "Limousin"
 
 msgid "Lorraine"
-msgstr ""
+msgstr "Lothringen"
 
 msgid "Midi-Pyrenees"
 msgstr ""
@@ -1920,10 +1917,10 @@
 msgstr ""
 
 msgid "Picardie"
-msgstr ""
+msgstr "Picardie"
 
 msgid "Poitou-Charentes"
-msgstr ""
+msgstr "Poitou-Charentes"
 
 msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
@@ -1932,259 +1929,259 @@
 msgstr ""
 
 msgid "Baden-Wuerttemberg"
-msgstr ""
+msgstr "Baden-Württemberg"
 
 msgid "Bayern"
-msgstr ""
+msgstr "Bayern"
 
 msgid "Mittelfranken"
-msgstr ""
+msgstr "Mittelfranken"
 
 msgid "Niederbayern"
-msgstr ""
+msgstr "Niederbayern"
 
 msgid "Oberbayern"
-msgstr ""
+msgstr "Oberbayern"
 
 msgid "Oberfranken"
-msgstr ""
+msgstr "Oberfranken"
 
 msgid "Oberpfalz"
-msgstr ""
+msgstr "Oberpfalz"
 
 msgid "Schwaben"
-msgstr ""
+msgstr "Schwaben"
 
 msgid "Unterfranken"
-msgstr ""
+msgstr "Unterfranken"
 
 msgid "Berlin"
-msgstr ""
+msgstr "Berlin"
 
 msgid "Brandenburg"
-msgstr ""
+msgstr "Brandenburg"
 
 msgid "Bremen"
-msgstr ""
+msgstr "Bremen"
 
 msgid "Hamburg"
-msgstr ""
+msgstr "Hamburg"
 
 msgid "Hessen"
-msgstr ""
+msgstr "Hessen"
 
 msgid "Mecklenburg-Vorpommern"
-msgstr ""
+msgstr "Mecklenburg-Vorpommern"
 
 msgid "Niedersachsen"
-msgstr ""
+msgstr "Niedersachsen"
 
 msgid "Nordrhein-westfalen"
-msgstr ""
+msgstr "Nordrhein-Westfalen"
 
 msgid "Rheinland-Pfalz"
-msgstr ""
+msgstr "Rheinland-Pfalz"
 
 msgid "Saarland"
-msgstr ""
+msgstr "Saarland"
 
 msgid "Sachsen-Anhalt"
-msgstr ""
+msgstr "Sachsen-Anhalt"
 
 msgid "Sachsen"
-msgstr ""
+msgstr "Sachsen"
 
 msgid "Schleswig-Holstein"
-msgstr ""
+msgstr "Schleswig-Holstein"
 
 msgid "Thueringen"
-msgstr ""
+msgstr "Thüringen"
 
 msgid "Mallorca"
-msgstr ""
+msgstr "Mallorca"
 
 msgid "Galicia"
-msgstr ""
+msgstr "Galicien"
 
 msgid "Scandinavia"
-msgstr ""
+msgstr "Skandinavien"
 
 msgid "England"
-msgstr ""
+msgstr "England"
 
 msgid "Buckinghamshire"
-msgstr ""
+msgstr "Buckinghamshire"
 
 msgid "Cambridgeshire"
-msgstr ""
+msgstr "Cambridgeshire"
 
 msgid "Cumbria"
-msgstr ""
+msgstr "Cumbria"
 
 msgid "East yorkshire with hull"
 msgstr ""
 
 msgid "Essex"
-msgstr ""
+msgstr "Essex"
 
 msgid "Herefordshire"
-msgstr ""
+msgstr "Herefordshire"
 
 msgid "Kent"
-msgstr ""
+msgstr "Kent"
 
 msgid "Lancashire"
-msgstr ""
+msgstr "Lancashire"
 
 msgid "Leicestershire"
-msgstr ""
+msgstr "Leicestershire"
 
 msgid "Norfolk"
-msgstr ""
+msgstr "Norfolk"
 
 msgid "Nottinghamshire"
-msgstr ""
+msgstr "Nottinghamshire"
 
 msgid "Oxfordshire"
-msgstr ""
+msgstr "Oxfordshire"
 
 msgid "Shropshire"
-msgstr ""
+msgstr "Shropshire"
 
 msgid "Somerset"
-msgstr ""
+msgstr "Somerset"
 
 msgid "South yorkshire"
-msgstr ""
+msgstr "South yorkshire"
 
 msgid "Suffolk"
-msgstr ""
+msgstr "Suffolk"
 
 msgid "Surrey"
-msgstr ""
+msgstr "Surrey"
 
 msgid "Wiltshire"
-msgstr ""
+msgstr "Wiltshire"
 
 msgid "Scotland"
-msgstr ""
+msgstr "Schottland"
 
 msgid "Wales"
-msgstr ""
+msgstr "Wales"
 
 msgid "Crete"
-msgstr ""
+msgstr "Kreta"
 
 msgid "North America"
-msgstr ""
+msgstr "Nordamerika"
 
 msgid "Alaska"
-msgstr ""
+msgstr "Alaska"
 
 msgid "Hawaii"
-msgstr ""
+msgstr "Hawaii"
 
 msgid "USA"
-msgstr ""
+msgstr "USA"
 
 msgid " (except Alaska and Hawaii)"
-msgstr ""
+msgstr " (außer Alaska und Hawaii)"
 
 msgid "Midwest"
-msgstr ""
+msgstr "Mittlerer Westen"
 
 msgid "Michigan"
-msgstr ""
+msgstr "Michigan"
 
 msgid "Ohio"
-msgstr ""
+msgstr "Ohio"
 
 msgid "Northeast"
-msgstr ""
+msgstr "Nordosten"
 
 msgid "Massachusetts"
-msgstr ""
+msgstr "Massachusetts"
 
 msgid "Vermont"
-msgstr ""
+msgstr "Vermont"
 
 msgid "Pacific"
-msgstr ""
+msgstr "Pazifik"
 
 msgid "South"
-msgstr ""
+msgstr "Süd"
 
 msgid "Arkansas"
-msgstr ""
+msgstr "Arkansas"
 
 msgid "District of Columbia"
-msgstr ""
+msgstr "District of Columbia"
 
 msgid "Florida"
-msgstr ""
+msgstr "Florida"
 
 msgid "Louisiana"
-msgstr ""
+msgstr "Louisiana"
 
 msgid "Maryland"
-msgstr ""
+msgstr "Maryland"
 
 msgid "Mississippi"
-msgstr ""
+msgstr "Mississippi"
 
 msgid "Oklahoma"
-msgstr ""
+msgstr "Oklahoma"
 
 msgid "Texas"
-msgstr ""
+msgstr "Texas"
 
 msgid "Virginia"
-msgstr ""
+msgstr "Virginia"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "West Virginia"
 
 msgid "West"
-msgstr ""
+msgstr "West"
 
 msgid "Arizona"
-msgstr ""
+msgstr "Arizona"
 
 msgid "California"
-msgstr ""
+msgstr "Kalifornien"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Colorado"
 
 msgid "Idaho"
-msgstr ""
+msgstr "Idaho"
 
 msgid "Montana"
-msgstr ""
+msgstr "Montana"
 
 msgid "New Mexico"
-msgstr ""
+msgstr "New Mexico"
 
 msgid "Nevada"
-msgstr ""
+msgstr "Nevada"
 
 msgid "Oregon"
-msgstr ""
+msgstr "Oregon"
 
 msgid "Utah"
-msgstr ""
+msgstr "Utah"
 
 msgid "Washington State"
-msgstr ""
+msgstr "Washington State"
 
 msgid "South+Middle America"
-msgstr ""
+msgstr "Süd+Mittel-Amerika"
 
 msgid "Guyane Francaise"
 msgstr ""
 
 msgid "downloading"
-msgstr ""
+msgstr "wird heruntergeladen"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
@@ -2198,10 +2195,10 @@
 msgstr "Nicht genug freier Speicher"
 
 msgid "Error writing map!"
-msgstr ""
+msgstr "Fehler beim speichern der Karte!"
 
 msgid "Map download aborted!"
-msgstr ""
+msgstr "Kartendownload abgebrochen!"
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
@@ -2217,7 +2214,7 @@
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
@@ -2254,7 +2251,7 @@
 
 #. Android resource: @strings/initial_info_box_OK
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. Android resource: @strings/initial_info_box_more_info
 msgid "More info"
@@ -2362,7 +2359,7 @@
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr ""
+msgstr "Wiederherstellung läuft …"
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
@@ -2519,6 +2516,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr "LKW"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5650] trunk/navit/po/fr.po.in

From: <ka...@us...> - 2013-10-01 22:10:19

Revision: 5650
          http://sourceforge.net/p/navit/code/5650
Author:   kazer_
Date:     2013-10-01 22:10:16 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
Add:core:Updated French translations

Modified Paths:
--------------
    trunk/navit/po/fr.po.in

Modified: trunk/navit/po/fr.po.in
===================================================================
--- trunk/navit/po/fr.po.in	2013-09-29 22:57:48 UTC (rev 5649)
+++ trunk/navit/po/fr.po.in	2013-10-01 22:10:16 UTC (rev 5650)
@@ -8,16 +8,16 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 00:37+0400\n"
-"PO-Revision-Date: 2010-06-18 19:16+0000\n"
-"Last-Translator: yannick56 <Unknown>\n"
+"POT-Creation-Date: 2013-09-27 20:29+0000\n"
+"PO-Revision-Date: 2013-09-27 23:58+0000\n"
+"Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: KaZeR <ka...@al...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-10-01 21:48+0000\n"
+"X-Generator: Launchpad (build 16774)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -287,10 +287,10 @@
 
 #, c-format
 msgid "Waypoint %d"
-msgstr ""
+msgstr "Etape %d"
 
 msgid "Visit before..."
-msgstr ""
+msgstr "Visiter d'abord..."
 
 msgid "Set as position"
 msgstr "Définir comme position"
@@ -431,7 +431,7 @@
 
 #. 535
 msgid "Bonaire, Sint Eustatius and Saba"
-msgstr ""
+msgstr "Bonaire, Saint-Eustache et Saba"
 
 #. 076
 msgid "Brazil"
@@ -523,7 +523,7 @@
 
 #. 531
 msgid "Curacao"
-msgstr ""
+msgstr "Curaçao"
 
 #. 162
 msgid "Christmas Island"
@@ -854,7 +854,7 @@
 msgstr "Lettonie"
 
 #. 434
-msgid "Libyan Arab Jamahiriya"
+msgid "Libya"
 msgstr "Libye"
 
 #. 504
@@ -1143,7 +1143,7 @@
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "Soudan du Sud"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1155,7 +1155,7 @@
 
 #. 534
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Saint-Martin (partie néerlandaise)"
 
 #. 760
 msgid "Syrian Arab Republic"
@@ -1321,22 +1321,29 @@
 "\t-h: print this usage info and exit.\n"
 "\t-v: Print the version and exit.\n"
 msgstr ""
+"Utilisation de navit;\n"
+"navit [options] [fichier de configuration]\n"
+"\t-c <fichier>: utiliser <fichier> comme fichier de configuration\n"
+"\t-h: afficher les informations d'utilisation et quitter\n"
+"\t-v: afficher la version et quitter\n"
 
 #. We have not found an existing config file from all possibilities
 msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr ""
+msgstr "Pas de fichier de configuration navit.xml, navit.xml.local trouvé\n"
 
 #, c-format
 msgid "Error parsing config file '%s': %s\n"
-msgstr ""
+msgstr "erreur d'analyse du fichier de configuration '%s': %s\n"
 
 #, c-format
 msgid "Using config file '%s'\n"
-msgstr ""
+msgstr "utilisation du fichier '%s'\n"
 
 msgid ""
 "Internal initialization failed, exiting. Check previous error messages.\n"
 msgstr ""
+"initialisation interne échouée, arrêt de l'exécution. Vérifiez les messages "
+"d'erreurs précédents.\n"
 
 msgid "unknown street"
 msgstr ""
@@ -1704,10 +1711,10 @@
 msgid "Enter Coordinates"
 msgstr ""
 
-#.
+#. 
 #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill)
 #. gui_internal_widget_append(wb, w)
-#.
+#. 
 #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill)
 #. gui_internal_widget_append(w, we)
 msgid "Longitude Latitude"
@@ -1817,9 +1824,6 @@
 msgid "Canary Islands"
 msgstr ""
 
-msgid "Libya"
-msgstr ""
-
 msgid "Asia"
 msgstr ""
 
@@ -2508,9 +2512,6 @@
 #. vehicle_length= 70    feet,  2134 cm
 #. vehicle_weight= 80000 lbs,  36287 kg
 #. vehicle_axle_weight= 34000 lbs,  15422 kg
-#.
+#. 
 msgid "Truck"
 msgstr "Camion"
-
-#~ msgid "Replace Waypoints"
-#~ msgstr "Remplacer les points de passage"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5649] trunk/navit/CMakeLists.txt

From: <sl...@us...> - 2013-09-29 22:57:52

Revision: 5649
          http://sourceforge.net/p/navit/code/5649
Author:   sleske
Date:     2013-09-29 22:57:48 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
Fix:build/cmake:Handle "support/gettext_intl" like the other support libs.

Modified Paths:
--------------
    trunk/navit/CMakeLists.txt

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-09-27 21:31:22 UTC (rev 5648)
+++ trunk/navit/CMakeLists.txt	2013-09-29 22:57:48 UTC (rev 5649)
@@ -75,6 +75,7 @@
 add_plugin(support/zlib "native zlib found" FALSE)
 add_plugin(support/libpng "native libpng found" FALSE)
 add_plugin(support/wordexp "native wordexp found" FALSE)
+add_plugin(support/gettext_intl "native libintl found" FALSE)
 add_module(font/freetype "freetype not found" FALSE)
 add_module(graphics/android "FreeType library not found" FALSE)
 add_module(graphics/gd "FreeType library not found" FALSE)
@@ -174,7 +175,7 @@
 ### Configure build
 #Required libraries, supplied with navit
 if (NOT HAVE_LIBINTL)
-   add_plugin(support/gettext_intl "native libintl missing" TRUE)
+   set_with_reason(support/gettext_intl "native libintl missing" TRUE)
    set(USE_LIBGNUINTL TRUE)
 else()
    CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL)
@@ -184,7 +185,6 @@
    endif(NEEDS_LIBINTL)
 endif(NOT HAVE_LIBINTL)
 
-
 if (CMAKE_USE_PTHREADS_INIT)
    if (NOT ANDROID)
       list(APPEND NAVIT_LIBS pthread)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5648] trunk/navit

From: <sl...@us...> - 2013-09-27 21:31:27

Revision: 5648
          http://sourceforge.net/p/navit/code/5648
Author:   sleske
Date:     2013-09-27 21:31:22 +0000 (Fri, 27 Sep 2013)
Log Message:
-----------
Refactor:build/cmake:Rename dir intl_cmake to support/gettext_intl for consistency.|Fixes #1119.

Modified Paths:
--------------
    trunk/navit/CMakeLists.txt
    trunk/navit/navit/CMakeLists.txt
    trunk/navit/navit/support/gettext_intl/CMakeLists.txt

Added Paths:
-----------
    trunk/navit/navit/support/gettext_intl/

Removed Paths:
-------------
    trunk/navit/navit/intl_cmake/

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-09-25 22:04:02 UTC (rev 5647)
+++ trunk/navit/CMakeLists.txt	2013-09-27 21:31:22 UTC (rev 5648)
@@ -174,7 +174,7 @@
 ### Configure build
 #Required libraries, supplied with navit
 if (NOT HAVE_LIBINTL)
-   add_plugin(intl_cmake "native libintl missing" TRUE)
+   add_plugin(support/gettext_intl "native libintl missing" TRUE)
    set(USE_LIBGNUINTL TRUE)
 else()
    CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL)

Modified: trunk/navit/navit/CMakeLists.txt
===================================================================
--- trunk/navit/navit/CMakeLists.txt	2013-09-25 22:04:02 UTC (rev 5647)
+++ trunk/navit/navit/CMakeLists.txt	2013-09-27 21:31:22 UTC (rev 5648)
@@ -152,7 +152,7 @@
 
 ADD_DEPENDENCIES(${NAVIT_LIBNAME} version)
 if (USE_LIBGNUINTL AND NOT HAVE_GLIB)
-   ADD_DEPENDENCIES(support_glib intl_cmake)
+   ADD_DEPENDENCIES(support_glib support_gettext_intl)
 endif()
 
 

Modified: trunk/navit/navit/support/gettext_intl/CMakeLists.txt
===================================================================
--- trunk/navit/navit/intl_cmake/CMakeLists.txt	2013-09-25 22:04:02 UTC (rev 5647)
+++ trunk/navit/navit/support/gettext_intl/CMakeLists.txt	2013-09-27 21:31:22 UTC (rev 5648)
@@ -1,4 +1,4 @@
 add_definitions(-DLOCALE_ALIAS_PATH=LOCALEDIR -DIN_LIBINTL=1 -DHAVE_CONFIG_H=1 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DLIBDIR=\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}\")
-supportlib_add_library(intl_cmake bindtextdom.c dcgettext.c dcigettext.c dcngettext.c dgettext.c dngettext.c explodename.c finddomain.c gettext.c intl-compat.c l10nflist.c loadmsgcat.c localcharset.c localealias.c localename.c log.c ngettext.c osdep.c plural-exp.c plural.c printf-args.c printf.c relocatable.c textdomain.c vasnprintf.c)
+supportlib_add_library(support_gettext_intl bindtextdom.c dcgettext.c dcigettext.c dcngettext.c dgettext.c dngettext.c explodename.c finddomain.c gettext.c intl-compat.c l10nflist.c loadmsgcat.c localcharset.c localealias.c localename.c log.c ngettext.c osdep.c plural-exp.c plural.c printf-args.c printf.c relocatable.c textdomain.c vasnprintf.c)
 ADD_CUSTOM_TARGET(libintl.h DEPENDS libgnuintl.h COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libintl.h)
-ADD_DEPENDENCIES(intl_cmake libintl.h)
+ADD_DEPENDENCIES(support_gettext_intl libintl.h)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5647] trunk/navit/navit/gui/internal/gui_internal.c

From: <sl...@us...> - 2013-09-25 22:04:05

Revision: 5647
          http://sourceforge.net/p/navit/code/5647
Author:   sleske
Date:     2013-09-25 22:04:02 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Fix:gui_internal:Teach gui_internal_get_attr about attr_fullscreen, so condition 'fullscreen==0' works again (broken by rev 5190).

Revision Links:
--------------
    http://sourceforge.net/p/navit/code/5190

Modified Paths:
--------------
    trunk/navit/navit/gui/internal/gui_internal.c

Modified: trunk/navit/navit/gui/internal/gui_internal.c
===================================================================
--- trunk/navit/navit/gui/internal/gui_internal.c	2013-09-25 22:03:49 UTC (rev 5646)
+++ trunk/navit/navit/gui/internal/gui_internal.c	2013-09-25 22:04:02 UTC (rev 5647)
@@ -2331,6 +2331,9 @@
 	case attr_navit:
 		attr->u.navit=this->nav;
 		break;
+	case attr_fullscreen:
+		attr->u.num=(this->fullscreen > 0);
+		break;
 	default:
 		return 0;
 	}
@@ -2371,7 +2374,7 @@
 		this->on_map_click=g_strdup(attr->u.str);
 		return 1;
 	default:
-		dbg(2,"%s\n",attr_to_name(attr->type));
+		dbg(0,"Unknown attribute: %s\n",attr_to_name(attr->type));
 		return 1;
 	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5646] trunk/navit/navit/command.c

From: <sl...@us...> - 2013-09-25 22:03:55

Revision: 5646
          http://sourceforge.net/p/navit/code/5646
Author:   sleske
Date:     2013-09-25 22:03:49 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Refactor:core:Remove unused parameter from resolve.

Modified Paths:
--------------
    trunk/navit/navit/command.c

Modified: trunk/navit/navit/command.c
===================================================================
--- trunk/navit/navit/command.c	2013-09-25 22:03:38 UTC (rev 5645)
+++ trunk/navit/navit/command.c	2013-09-25 22:03:49 UTC (rev 5646)
@@ -264,7 +264,7 @@
 }
 
 static void
-resolve(struct context *ctx, struct result *res, struct attr *parent) //FIXME What is that parent for?
+resolve(struct context *ctx, struct result *res)
 {
 	resolve_object(ctx, res);
 	if (res->attrn)
@@ -274,7 +274,7 @@
 static double
 get_double(struct context *ctx, struct result *res)
 {
-	resolve(ctx, res, NULL);
+	resolve(ctx, res);
 	return res->val;
 }
 
@@ -283,7 +283,7 @@
 static int
 get_int_bool(struct context *ctx, int is_bool, struct result *res)
 {
-	resolve(ctx, res, NULL);
+	resolve(ctx, res);
 	if (res->attr.type == attr_none)
 		return 0;
 	if (res->attr.type >= attr_type_int_begin && res->attr.type <= attr_type_int_end) {
@@ -317,7 +317,7 @@
 static char *
 get_string(struct context *ctx, struct result *res)
 {
-	resolve(ctx, res, NULL);
+	resolve(ctx, res);
 	return attr_to_text(&res->attr, NULL, 0);
 }
 
@@ -355,8 +355,8 @@
 		}
 		break;
 	case op_type_binary:
-		resolve(ctx, inout, NULL);
-		resolve(ctx, in, NULL);
+		resolve(ctx, inout);
+		resolve(ctx, in);
 		switch ((op[0] << 8) | op[1]) {
 		case ('=' << 8)|'=':
 			if (inout->attr.type == attr_none || in->attr.type == attr_none) {
@@ -723,7 +723,7 @@
 		if (op[0] == '.') {
     			eval_brace(ctx, &tmp);
 			if (ctx->error) return;
-			resolve(ctx, res,NULL);
+			resolve(ctx, res);
 			if (ctx->error) return;
 			res->attrn=tmp.var;
 			res->attrnlen=tmp.varlen;
@@ -990,7 +990,7 @@
 		result_free(&tmp);
 		return;
 	}
-	resolve(ctx, &tmp, NULL);
+	resolve(ctx, &tmp);
 	if (ctx->error) {
 		result_free(&tmp);
 		return;
@@ -1029,7 +1029,7 @@
 			attr_list_free(ret);
 			return NULL;
 		}
-		resolve(ctx, &tmp, NULL);
+		resolve(ctx, &tmp);
 		ret=attr_generic_add_attr(ret, &tmp.attr);
 		result_free(&tmp);
 		if (!get_op(ctx,0,",",NULL)) return ret;
@@ -1052,7 +1052,7 @@
 	printf("err=%d %s\n", ctx.error, ctx.expr);
 	dump(&res);
 	printf("***\n");
-	resolve(&ctx, &res, NULL);
+	resolve(&ctx, &res);
 	dump(&res);
 	printf("%s\n", get_string(&ctx, &res));
 }
@@ -1090,7 +1090,7 @@
 	struct context ctx;
 	command_evaluate_to(attr, expr, &ctx, &res);
 	if (!ctx.error)
-		resolve(&ctx, &res, NULL);
+		resolve(&ctx, &res);
 	if (error)
 		*error=ctx.error;
 	result_free(&res);
@@ -1106,7 +1106,7 @@
 
 	command_evaluate_to(attr, expr, &ctx, &res);
 	if (!ctx.error)
-		resolve(&ctx, &res, NULL);
+		resolve(&ctx, &res);
 	if (!ctx.error)
 		ret=get_string(&ctx, &res);
 	if (error)
@@ -1129,7 +1129,7 @@
 
 	command_evaluate_to(attr, expr, &ctx, &res);
 	if (!ctx.error)
-		resolve(&ctx, &res, NULL);
+		resolve(&ctx, &res);
 	if (!ctx.error)
 		ret=get_int(&ctx, &res);
 	if (error)
@@ -1152,7 +1152,7 @@
 
 	command_evaluate_to(attr, expr, &ctx, &res);
 	if (!ctx.error)
-		resolve(&ctx, &res, NULL);
+		resolve(&ctx, &res);
 	if (!ctx.error) {
 		if (res.attr.type == attr_none)
 			ret=0;
@@ -1207,7 +1207,7 @@
 		eval_comma(ctx,&res);
 		if (ctx->error)
 			return 0;
-		resolve(ctx, &res, NULL);
+		resolve(ctx, &res);
 		result_free(&res);
 		if (ctx->error)
 			return 0;
@@ -1266,7 +1266,7 @@
     			eval_conditional(ctx, &res);
 			resolve_object(ctx, &res);
 			tmp.attr=attr;
-			resolve(ctx, &tmp, NULL);
+			resolve(ctx, &tmp);
 			if (ctx->error) {
 				result_free(&tmp);
 				return 0;
@@ -1502,7 +1502,7 @@
 	prev = cs->context_attr;
 
 	while ((status = get_next_object(&cs->ctx, &cs->res)) != 0) {
-		resolve(&cs->ctx, &cs->res, NULL);
+		resolve(&cs->ctx, &cs->res);
 
 		if (cs->ctx.error || (cs->res.attr.type == attr_none)) {
 			// We could not resolve an object, perhaps because it has not been created

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5645] trunk/navit/navit/command.c

From: <sl...@us...> - 2013-09-25 22:03:42

Revision: 5645
          http://sourceforge.net/p/navit/code/5645
Author:   sleske
Date:     2013-09-25 22:03:38 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
Refactor:core:Remove unused parameter from set_int.

Modified Paths:
--------------
    trunk/navit/navit/command.c

Modified: trunk/navit/navit/command.c
===================================================================
--- trunk/navit/navit/command.c	2013-09-23 19:51:49 UTC (rev 5644)
+++ trunk/navit/navit/command.c	2013-09-25 22:03:38 UTC (rev 5645)
@@ -322,7 +322,7 @@
 }
 
 static void
-set_double(struct context *ctx, struct result *res, double val)
+set_double(struct result *res, double val)
 {
 	result_free(res);
 	res->attr.type=attr_type_double_begin;
@@ -331,7 +331,7 @@
 }
 
 static void
-set_int(struct context *ctx, struct result *res, int val)
+set_int(struct result *res, int val)
 {
 	result_free(res);
 	res->attr.type=attr_type_int_begin;
@@ -347,10 +347,10 @@
 	case op_type_prefix:
 		switch ((op[0] << 8) | op[1]) {
 		case ('!' << 8):
-			set_int(ctx, inout, !get_bool(ctx, inout));
+			set_int(inout, !get_bool(ctx, inout));
 			return;
 		case ('~' << 8):
-			set_int(ctx, inout, ~get_int(ctx, inout));
+			set_int(inout, ~get_int(ctx, inout));
 			return;
 		}
 		break;
@@ -360,60 +360,60 @@
 		switch ((op[0] << 8) | op[1]) {
 		case ('=' << 8)|'=':
 			if (inout->attr.type == attr_none || in->attr.type == attr_none) {
-				set_int(ctx, inout, 0);
+				set_int(inout, 0);
 			} else if (ATTR_IS_STRING(inout->attr.type) && ATTR_IS_STRING(in->attr.type)) {
 				char *s1=get_string(ctx, inout),*s2=get_string(ctx, in);
-				set_int(ctx, inout, (!strcmp(s1,s2)));
+				set_int(inout, (!strcmp(s1,s2)));
 				g_free(s1);
 				g_free(s2);
 			} else if (ATTR_IS_OBJECT(inout->attr.type) && ATTR_IS_OBJECT(in->attr.type)) {
-				set_int(ctx, inout, inout->attr.u.data == in->attr.u.data);
+				set_int(inout, inout->attr.u.data == in->attr.u.data);
 			} else
-				set_int(ctx, inout, (get_int(ctx, inout) == get_int(ctx, in)));
+				set_int(inout, (get_int(ctx, inout) == get_int(ctx, in)));
 			return;
 		case ('!' << 8)|'=':
 			if (inout->attr.type == attr_none || in->attr.type == attr_none) {
-				set_int(ctx, inout, 1);
+				set_int(inout, 1);
 			} else if (ATTR_IS_STRING(inout->attr.type) && ATTR_IS_STRING(in->attr.type)) {
 				char *s1=get_string(ctx, inout),*s2=get_string(ctx, in);
-				set_int(ctx, inout, (!!strcmp(s1,s2)));
+				set_int(inout, (!!strcmp(s1,s2)));
 				g_free(s1);
 				g_free(s2);
 			} else if (ATTR_IS_OBJECT(inout->attr.type) && ATTR_IS_OBJECT(in->attr.type)) {
-				set_int(ctx, inout, inout->attr.u.data != in->attr.u.data);
+				set_int(inout, inout->attr.u.data != in->attr.u.data);
 			} else
-				set_int(ctx, inout, (get_int(ctx, inout) != get_int(ctx, in)));
+				set_int(inout, (get_int(ctx, inout) != get_int(ctx, in)));
 			return;
 		case ('<' << 8):
-			set_int(ctx, inout, (get_int(ctx, inout) < get_int(ctx, in)));
+			set_int(inout, (get_int(ctx, inout) < get_int(ctx, in)));
 			return;
 		case ('<' << 8)|'=':
-			set_int(ctx, inout, (get_int(ctx, inout) <= get_int(ctx, in)));
+			set_int(inout, (get_int(ctx, inout) <= get_int(ctx, in)));
 			return;
 		case ('>' << 8):
-			set_int(ctx, inout, (get_int(ctx, inout) > get_int(ctx, in)));
+			set_int(inout, (get_int(ctx, inout) > get_int(ctx, in)));
 			return;
 		case ('>' << 8)|'=':
-			set_int(ctx, inout, (get_int(ctx, inout) >= get_int(ctx, in)));
+			set_int(inout, (get_int(ctx, inout) >= get_int(ctx, in)));
 			return;
 		case ('*' << 8):
 			if (is_double(inout) || is_double(in)) 
-				set_double(ctx, inout, get_double(ctx, inout) * get_double(ctx, in));
+				set_double(inout, get_double(ctx, inout) * get_double(ctx, in));
 			else
-				set_int(ctx, inout, get_int(ctx, inout) * get_int(ctx, in));
+				set_int(inout, get_int(ctx, inout) * get_int(ctx, in));
 			return;
 		case ('/' << 8):
 			if (is_double(inout) || is_double(in)) 
-				set_double(ctx, inout, get_double(ctx, inout) * get_double(ctx, in));
+				set_double(inout, get_double(ctx, inout) * get_double(ctx, in));
 			else
-				set_int(ctx, inout, get_int(ctx, inout) * get_int(ctx, in));
+				set_int(inout, get_int(ctx, inout) * get_int(ctx, in));
 			return;
 		case ('%' << 8):
-			set_int(ctx, inout, get_int(ctx, inout) % get_int(ctx, in));
+			set_int(inout, get_int(ctx, inout) % get_int(ctx, in));
 			return;
 		case ('+' << 8):
 			if (is_double(inout) || is_double(in)) 
-				set_double(ctx, inout, get_double(ctx, inout) + get_double(ctx, in));
+				set_double(inout, get_double(ctx, inout) + get_double(ctx, in));
 			else if (ATTR_IS_STRING(inout->attr.type) && ATTR_IS_STRING(in->attr.type)) {
 				char *str=g_strdup_printf("%s%s",inout->attr.u.str,in->attr.u.str);
 				result_free(inout);
@@ -421,28 +421,28 @@
 				inout->attr.u.str=str;
 				inout->allocated=1;
 			} else
-				set_int(ctx, inout, get_int(ctx, inout) + get_int(ctx, in));
+				set_int(inout, get_int(ctx, inout) + get_int(ctx, in));
 			return;
 		case ('-' << 8):
 			if (is_double(inout) || is_double(in)) 
-				set_int(ctx, inout, get_int(ctx, inout) - get_int(ctx, in));
+				set_int(inout, get_int(ctx, inout) - get_int(ctx, in));
 			else
-				set_double(ctx, inout, get_double(ctx, inout) - get_double(ctx, in));
+				set_double(inout, get_double(ctx, inout) - get_double(ctx, in));
 			return;
 		case ('&' << 8):
-			set_int(ctx, inout, get_int(ctx, inout) & get_int(ctx, in));
+			set_int(inout, get_int(ctx, inout) & get_int(ctx, in));
 			return;
 		case ('^' << 8):
-			set_int(ctx, inout, get_int(ctx, inout) ^ get_int(ctx, in));
+			set_int(inout, get_int(ctx, inout) ^ get_int(ctx, in));
 			return;
 		case ('|' << 8):
-			set_int(ctx, inout, get_int(ctx, inout) | get_int(ctx, in));
+			set_int(inout, get_int(ctx, inout) | get_int(ctx, in));
 			return;
 		case (('&' << 8) | '&'):
-			set_int(ctx, inout, get_int(ctx, inout) && get_int(ctx, in));
+			set_int(inout, get_int(ctx, inout) && get_int(ctx, in));
 			return;
 		case (('|' << 8) | '|'):
-			set_int(ctx, inout, get_int(ctx, inout) || get_int(ctx, in));
+			set_int(inout, get_int(ctx, inout) || get_int(ctx, in));
 			return;
 		default:
 			break;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5644] trunk/navit/navit/maptool

From: <md...@us...> - 2013-09-23 19:51:51

Revision: 5644
          http://sourceforge.net/p/navit/code/5644
Author:   mdankov
Date:     2013-09-23 19:51:49 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Add:maptool:Move experimental associatedStreet feature into production.

Modified Paths:
--------------
    trunk/navit/navit/maptool/maptool.c
    trunk/navit/navit/maptool/osm.c

Modified: trunk/navit/navit/maptool/maptool.c
===================================================================
--- trunk/navit/navit/maptool/maptool.c	2013-09-16 13:02:29 UTC (rev 5643)
+++ trunk/navit/navit/maptool/maptool.c	2013-09-23 19:51:49 UTC (rev 5644)
@@ -442,8 +442,7 @@
 	}
 	if (p->process_relations) {
 		p->osm.boundaries=tempfile(suffix,"boundaries",1);
-		if(experimental)
-			p->osm.associated_streets=tempfile(suffix,"associated_streets",1);
+		p->osm.associated_streets=tempfile(suffix,"associated_streets",1);
 	}
 #ifdef HAVE_POSTGRESQL
 	if (p->dbstr)
@@ -841,7 +840,7 @@
 			exit(0);
 		}
 	}
-#if 0
+#if 1
 	if (experimental) {
 		fprintf(stderr,"No experimental features available\n");
 		exit(0);
@@ -924,7 +923,7 @@
 		if(!p.keep_tmpfiles)
 			tempfile_unlink(suffix,"ways_split_index");
 	}
-	if (experimental && p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing associated street relations")) {
+	if (p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing associated street relations")) {
 		FILE *ways_in=tempfile(suffix,"ways_split",0);
 		FILE *ways_out=tempfile(suffix,"ways_split_as",1);
 		FILE *nodes_in=tempfile(suffix,"nodes",0);
@@ -953,10 +952,10 @@
 			tempfile_rename(suffix,"way2poi_result","way2poi_result_pre_as");
 			tempfile_rename(suffix,"way2poi_result_as","way2poi_result");
 		}
+		tempfile_unlink(suffix,"ways_split_pre_as");
+		tempfile_unlink(suffix,"nodes_pre_as");
+		tempfile_unlink(suffix,"way2poi_result_pre_as");
 		if(!p.keep_tmpfiles) {
-			tempfile_unlink(suffix,"ways_split__pre_as");
-			tempfile_unlink(suffix,"nodes_pre_as");
-			tempfile_unlink(suffix,"way2poi_result_pre_as");
 			tempfile_unlink(suffix,"associated_streets");
 		}
 	}

Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c	2013-09-16 13:02:29 UTC (rev 5643)
+++ trunk/navit/navit/maptool/osm.c	2013-09-23 19:51:49 UTC (rev 5644)
@@ -1577,7 +1577,7 @@
 	if (!strcmp(relation_type, "restriction") && (item_bin->type == type_street_turn_restriction_no || item_bin->type == type_street_turn_restriction_only))
 		item_bin_write(item_bin, osm->turn_restrictions);
 
-	if (experimental && !strcmp(relation_type, "associatedStreet") )
+	if (!strcmp(relation_type, "associatedStreet") )
 		item_bin_write(item_bin, osm->associated_streets);
 		
 	attr_longest_match_clear();
@@ -2302,27 +2302,21 @@
 			rel->name=(char*)(rel+1);
 			g_strlcpy(rel->name,name,namelen);
 		}
-		fprintf(stderr,"name=%s\n",rel->name);
 		min_count=0;
 		while(search_relation_member(ib, "street",&relm,&min_count)) {
 			if(relm.type==2)
 				relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
-			fprintf(stderr,"street type=%d(should be 2) id="LONGLONG_FMT "\n",relm.type,relm.id);
-
 		}
 		min_count=0;
 		while(search_relation_member(ib, "house",&relm,&min_count)) {
-			fprintf(stderr,"house type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 		min_count=0;
 		while(search_relation_member(ib, "addr:houselink",&relm,&min_count)) {
-			fprintf(stderr,"houselink type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 		min_count=0;
 		while(search_relation_member(ib, "address",&relm,&min_count)) {
-			fprintf(stderr,"address type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5643] trunk/navit/configure.in

From: <sl...@us...> - 2013-09-16 13:02:32

Revision: 5643
          http://sourceforge.net/p/navit/code/5643
Author:   sleske
Date:     2013-09-16 13:02:29 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Fix:vehicle_gpsd:Fix version check for autoconf build.|Hopefully concludes fix for #850. It's time we ditch autoconf...

Modified Paths:
--------------
    trunk/navit/configure.in

Modified: trunk/navit/configure.in
===================================================================
--- trunk/navit/configure.in	2013-09-15 18:58:31 UTC (rev 5642)
+++ trunk/navit/configure.in	2013-09-16 13:02:29 UTC (rev 5643)
@@ -1059,12 +1059,7 @@
 AC_ARG_ENABLE(vehicle-gpsd, [  --disable-vehicle-gpsd              disable vehicle type gpsd], vehicle_gpsd=$enableval;vehicle_gpsd_reason="configure parameter")
 if test "x${vehicle_gpsd}" = xyes
 then
-	PKG_CHECK_MODULES([GPSD], [libgps], have_libgps="yes", have_libgps="no")
-	if test "x$have_libgps" = "xyes"; then
-		AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have libgps.)
-	else
-		AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h and no gpsd pkgconfig" )
-	fi
+	PKG_CHECK_MODULES([GPSD], [libgps >= 3.10], ,vehicle_gpsd="no";vehicle_gpsd_reason="package libgps >=V3.1 missing")
 fi
 AC_SUBST(GPSD_CFLAGS)
 AC_SUBST(GPSD_LIBS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5642] trunk/navit

From: <sl...@us...> - 2013-09-15 18:58:35

Revision: 5642
          http://sourceforge.net/p/navit/code/5642
Author:   sleske
Date:     2013-09-15 18:58:31 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Fix:vehicle_gpsd:Require libgps V3.1+, drop compatibility #ifdefs and warning about LC_ALL.|Fixes #850.

Modified Paths:
--------------
    trunk/navit/CMakeLists.txt
    trunk/navit/configure.in
    trunk/navit/navit/main.c
    trunk/navit/navit/vehicle/gpsd/CMakeLists.txt
    trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2013-09-15 18:58:20 UTC (rev 5641)
+++ trunk/navit/CMakeLists.txt	2013-09-15 18:58:31 UTC (rev 5642)
@@ -131,10 +131,9 @@
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
    pkg_check_modules(QUESOGLC quesoglc)
-   pkg_check_modules(LIBGPS libgps)
    pkg_check_modules(LIBLOCATION liblocation)
    pkg_check_modules(LIBOSSO libosso)
-   pkg_check_modules(LIBGPS19 libgps>=2.90)
+   pkg_check_modules(LIBGPS libgps>=3.1) # libgpsd<V3.1 is buggy if LC_ALL is set.
    pkg_check_modules(LIBGARMIN libgarmin)
    pkg_check_modules(IMLIB2 imlib2)
    if(IMLIB2_FOUND)

Modified: trunk/navit/configure.in
===================================================================
--- trunk/navit/configure.in	2013-09-15 18:58:20 UTC (rev 5641)
+++ trunk/navit/configure.in	2013-09-15 18:58:31 UTC (rev 5642)
@@ -1062,10 +1062,6 @@
 	PKG_CHECK_MODULES([GPSD], [libgps], have_libgps="yes", have_libgps="no")
 	if test "x$have_libgps" = "xyes"; then
 		AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have libgps.)
-		PKG_CHECK_MODULES([LIBGPS19], [libgps >= 2.90], have_libgps19="yes", have_libgps19="no")
-		if test "x$have_libgps19" = "xyes"; then
-			AC_DEFINE([HAVE_LIBGPS19],[],Define to 1 if you have libgps19.)
-		fi
 	else
 		AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h and no gpsd pkgconfig" )
 	fi

Modified: trunk/navit/navit/main.c
===================================================================
--- trunk/navit/navit/main.c	2013-09-15 18:58:20 UTC (rev 5641)
+++ trunk/navit/navit/main.c	2013-09-15 18:58:31 UTC (rev 5642)
@@ -404,8 +404,6 @@
 	main_setup_environment(2);
 #endif	/* _WIN32 || _WIN32_WCE */
 
-	if (getenv("LC_ALL"))
-		dbg(0,"Warning: LC_ALL is set, this might lead to problems (e.g. strange positions from GPS)\n");
 	s = getenv("NAVIT_WID");
 	if (s) {
 		setenv("SDL_WINDOWID", s, 0);

Modified: trunk/navit/navit/vehicle/gpsd/CMakeLists.txt
===================================================================
--- trunk/navit/navit/vehicle/gpsd/CMakeLists.txt	2013-09-15 18:58:20 UTC (rev 5641)
+++ trunk/navit/navit/vehicle/gpsd/CMakeLists.txt	2013-09-15 18:58:31 UTC (rev 5642)
@@ -1,8 +1 @@
 module_add_library(vehicle_gpsd vehicle_gpsd.c)
-if (LIBGPS19_FOUND)
-   set_property(
-      TARGET vehicle_gpsd
-      APPEND PROPERTY COMPILE_DEFINITIONS HAVE_LIBGPS19=1
-   )
-endif (LIBGPS19_FOUND)
-

Modified: trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c
===================================================================
--- trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c	2013-09-15 18:58:20 UTC (rev 5641)
+++ trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c	2013-09-15 18:58:31 UTC (rev 5642)
@@ -70,12 +70,7 @@
 static void vehicle_gpsd_io(struct vehicle_priv *priv);
 
 static void
-#ifdef HAVE_LIBGPS19
 vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len)
-#else
-vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
-		      int level)
-#endif
 {
 	char *pos,*nmea_data_buf;
         int i=0,sats_signal=0;
@@ -117,32 +112,16 @@
 		data->set &= ~ALTITUDE_SET;
 	}
 	if (data->set & SATELLITE_SET) {
-#ifdef HAVE_LIBGPS19
                 if(data->satellites_visible > 0) {
-#else
-                if(data->satellites > 0) {
-#endif
                         sats_signal=0;
-#ifdef HAVE_LIBGPS19
                         for( i=0;i<data->satellites_visible;i++) {
-#else
-                        for( i=0;i<data->satellites;i++) {
-#endif
                                if (data->ss[i] > 0)
                                         sats_signal++;
                         }
                 }
-#ifdef HAVE_LIBGPS19
 		if (priv->sats_used != data->satellites_used || priv->sats != data->satellites_visible || priv->sats_signal != sats_signal ) {
-#else
-		if (priv->sats_used != data->satellites_used || priv->sats != data->satellites || priv->sats_signal != sats_signal ) {
-#endif
 			priv->sats_used = data->satellites_used;
-#ifdef HAVE_LIBGPS19
 			priv->sats = data->satellites_visible;
-#else
-			priv->sats = data->satellites;
-#endif
                         priv->sats_signal = sats_signal;
 			callback_list_call_attr_0(priv->cbl, attr_position_sats);
 		}
@@ -160,17 +139,10 @@
 		priv->fix_time = data->fix.time;
 		data->set &= ~TIME_SET;
 	}
-#ifdef HAVE_LIBGPS19
 	if (data->set & DOP_SET) {
 		dbg(1, "pdop : %g\n", data->dop.pdop);
 		priv->hdop = data->dop.pdop;
 		data->set &= ~DOP_SET;
-#else
-	if (data->set & PDOP_SET) {
-		dbg(1, "pdop : %g\n", data->pdop);
-		priv->hdop = data->hdop;
-		data->set &= ~PDOP_SET;
-#endif
 	}
 	if (data->set & LATLON_SET) {
 		priv->geo.lat = data->fix.latitude;
@@ -205,31 +177,19 @@
 	}
 	dbg(0,"Trying to connect to %s:%s\n",source+7,port?port:"default");
 
-#if GPSD_API_MAJOR_VERSION >= 5
         /* gps_open returns 0 on success */
 	if (gps_open(source + 7, port, priv->gps)) {
-#else
-	priv->gps = gps_open(source + 7, port);
-	if(!priv->gps) {
-#endif
 		dbg(0,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?\n", priv->source, priv->retry_interval);
                 g_free(source);
 		return TRUE;
 	}
 	g_free(source);
 
-#ifdef HAVE_LIBGPS19
 	if (strchr(priv->gpsd_query,'r'))
 		gps_stream(priv->gps, WATCH_ENABLE|WATCH_NMEA|WATCH_JSON, NULL);
 	else
 		gps_stream(priv->gps, WATCH_ENABLE|WATCH_JSON, NULL);
-#else
-	gps_query(priv->gps, priv->gpsd_query);
-#endif
 
-#if GPSD_API_MAJOR_VERSION < 5
-	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
-#endif
 	priv->cb = callback_new_1(callback_cast(vehicle_gpsd_io), priv);
 	priv->cbt = callback_new_1(callback_cast(vehicle_gpsd_try_open), priv);
 	priv->evwatch = event_add_watch((void *)priv->gps->gps_fd, event_watch_cond_read, priv->cb);
@@ -291,9 +251,7 @@
 	}
 	if (priv->gps) {
 		gps_close(priv->gps);
-#if GPSD_API_MAJOR_VERSION >= 5
                 g_free(priv->gps);
-#endif
 		priv->gps = NULL;
 	}
 #ifdef HAVE_GPSBT
@@ -311,7 +269,6 @@
 	dbg(1, "enter\n");
 	if (priv->gps) {
 	 	vehicle_last = priv;
-#if GPSD_API_MAJOR_VERSION >= 5
                 if(gps_read(priv->gps)==-1) {
                   dbg(0,"gps_poll failed\n");
                   vehicle_gpsd_close(priv);
@@ -322,13 +279,6 @@
                   buf = gps_data(priv->gps);
   	          vehicle_gpsd_callback(priv->gps,buf,strlen(buf));
                 }
-#else
-                if (gps_poll(priv->gps)) {
-			dbg(0,"gps_poll failed\n");
-			vehicle_gpsd_close(priv);
-			vehicle_gpsd_open(priv);
-                }
-#endif
 	}
 }
 
@@ -340,9 +290,7 @@
 		g_free(priv->source);
 	if (priv->gpsd_query)
 		g_free(priv->gpsd_query);
-#if GPSD_API_MAJOR_VERSION >= 5
         g_free(priv->gps);
-#endif
 	g_free(priv);
 }
 
@@ -428,9 +376,7 @@
 	dbg(1, "enter\n");
 	source = attr_search(attrs, NULL, attr_source);
 	ret = g_new0(struct vehicle_priv, 1);
-#if GPSD_API_MAJOR_VERSION >= 5
 	ret->gps = g_new0(struct gps_data_t, 1);
-#endif
 	ret->source = g_strdup(source->u.str);
 	query = attr_search(attrs, NULL, attr_gpsd_query);
 	if (query) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5641] trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c

From: <sl...@us...> - 2013-09-15 18:58:23

Revision: 5641
          http://sourceforge.net/p/navit/code/5641
Author:   sleske
Date:     2013-09-15 18:58:20 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
Fix:vehicle_gpsd:Fix compiler warnings.

Modified Paths:
--------------
    trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c

Modified: trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c
===================================================================
--- trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c	2013-09-11 15:35:49 UTC (rev 5640)
+++ trunk/navit/navit/vehicle/gpsd/vehicle_gpsd.c	2013-09-15 18:58:20 UTC (rev 5641)
@@ -33,6 +33,7 @@
 #include "item.h"
 #include "vehicle.h"
 #include "event.h"
+#include "types.h"
 
 static struct vehicle_priv {
 	char *source;
@@ -70,9 +71,9 @@
 
 static void
 #ifdef HAVE_LIBGPS19
-vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len)
+vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len)
 #else
-vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len,
+vehicle_gpsd_callback(struct gps_data_t *data, const char *buf, size_t len,
 		      int level)
 #endif
 {
@@ -100,7 +101,7 @@
 			}
 		}
 	}	
-	dbg(1,"data->set=0x%x\n", data->set);
+	dbg(1,"data->set="LONGLONG_HEX_FMT"\n", data->set);
 	if (data->set & SPEED_SET) {
 		priv->speed = data->fix.speed * 3.6;
 		if(!isnan(data->fix.speed))
@@ -317,7 +318,7 @@
                   vehicle_gpsd_open(priv);
                 }
                 else {
-                  char *buf;
+                  const char *buf;
                   buf = gps_data(priv->gps);
   	          vehicle_gpsd_callback(priv->gps,buf,strlen(buf));
                 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5640] trunk/navit/navit/navigation.c

From: <mar...@us...> - 2013-09-11 15:35:53

Revision: 5640
          http://sourceforge.net/p/navit/code/5640
Author:   martin-s
Date:     2013-09-11 15:35:49 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
Add:Core:Possibility to query next street more convenient

Modified Paths:
--------------
    trunk/navit/navit/navigation.c

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2013-09-10 20:44:43 UTC (rev 5639)
+++ trunk/navit/navit/navigation.c	2013-09-11 15:35:49 UTC (rev 5640)
@@ -152,6 +152,8 @@
 	case attr_item_type:
 	case attr_length:
 	case attr_navigation_speech:
+	case attr_street_name:
+	case attr_street_name_systematic:
 		mr=map_rect_new(this_->map, NULL);
 		while ((item=map_rect_get_item(mr))) {
 			if (item->type != type_nav_none && item->type != type_nav_position) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5639] trunk/navit/navit/maptool

From: <md...@us...> - 2013-09-10 20:44:48

Revision: 5639
          http://sourceforge.net/p/navit/code/5639
Author:   mdankov
Date:     2013-09-10 20:44:43 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Add:maptool:Improve experimental feature to support associatedStreet relations.

Modified Paths:
--------------
    trunk/navit/navit/maptool/maptool.c
    trunk/navit/navit/maptool/maptool.h
    trunk/navit/navit/maptool/osm.c

Modified: trunk/navit/navit/maptool/maptool.c
===================================================================
--- trunk/navit/navit/maptool/maptool.c	2013-09-10 18:35:21 UTC (rev 5638)
+++ trunk/navit/navit/maptool/maptool.c	2013-09-10 20:44:43 UTC (rev 5639)
@@ -871,30 +871,6 @@
 			osm_collect_data(&p, suffix);
 			p.node_table_loaded=1;
 		}
-		if (experimental && p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing associated street relations")) {
-			FILE *ways_in=tempfile(suffix,"ways",0);
-			FILE *ways_out=tempfile(suffix,"ways_as",1);
-			FILE *nodes_in=tempfile(suffix,"nodes",0);
-			FILE *nodes_out=tempfile(suffix,"nodes_as",1);
-			
-			p.osm.associated_streets=tempfile(suffix,"associated_streets",0);
-			
-			process_associated_street(p.osm.associated_streets, ways_in, ways_out, nodes_in, nodes_out);
-			fclose(ways_in);
-			fclose(nodes_in);
-			fclose(ways_out);
-			fclose(nodes_out);
-			fclose(p.osm.associated_streets);
-			tempfile_rename(suffix,"ways","ways_pre_as");
-			tempfile_rename(suffix,"nodes","nodes_pre_as");
-			tempfile_rename(suffix,"ways_as","ways");
-			tempfile_rename(suffix,"nodes_as","nodes");
-			if(!p.keep_tmpfiles) {
-				tempfile_unlink(suffix,"ways_pre_as");
-				tempfile_unlink(suffix,"nodes_pre_as");
-				tempfile_unlink(suffix,"associated_streets");
-			}
-		}
 		if (start_phase(&p, "counting references and resolving ways")) {
 			maptool_load_node_table(&p,1);
 			osm_count_references(&p, suffix, p.start == phase);
@@ -948,6 +924,42 @@
 		if(!p.keep_tmpfiles)
 			tempfile_unlink(suffix,"ways_split_index");
 	}
+	if (experimental && p.process_relations && p.process_ways && p.process_nodes && start_phase(&p,"processing associated street relations")) {
+		FILE *ways_in=tempfile(suffix,"ways_split",0);
+		FILE *ways_out=tempfile(suffix,"ways_split_as",1);
+		FILE *nodes_in=tempfile(suffix,"nodes",0);
+		FILE *nodes_out=tempfile(suffix,"nodes_as",1);
+		FILE *nodes2_in=NULL;
+		FILE *nodes2_out=NULL;
+		if(p.osm.line2poi) {
+			nodes2_in=tempfile(suffix,"way2poi_result",0);
+			nodes2_out=tempfile(suffix,"way2poi_result_as",1);
+		}
+		p.osm.associated_streets=tempfile(suffix,"associated_streets",0);
+		
+		process_associated_streets(p.osm.associated_streets, ways_in, ways_out, nodes_in, nodes_out, nodes2_in, nodes2_out);
+		fclose(ways_in);
+		fclose(nodes_in);
+		fclose(ways_out);
+		fclose(nodes_out);
+		fclose(p.osm.associated_streets);
+		tempfile_rename(suffix,"ways_split","ways_split_pre_as");
+		tempfile_rename(suffix,"nodes","nodes_pre_as");
+		tempfile_rename(suffix,"ways_split_as","ways_split");
+		tempfile_rename(suffix,"nodes_as","nodes");
+		if(p.osm.line2poi) {
+			fclose(nodes2_in);
+			fclose(nodes2_out);
+			tempfile_rename(suffix,"way2poi_result","way2poi_result_pre_as");
+			tempfile_rename(suffix,"way2poi_result_as","way2poi_result");
+		}
+		if(!p.keep_tmpfiles) {
+			tempfile_unlink(suffix,"ways_split__pre_as");
+			tempfile_unlink(suffix,"nodes_pre_as");
+			tempfile_unlink(suffix,"way2poi_result_pre_as");
+			tempfile_unlink(suffix,"associated_streets");
+		}
+	}
 	if (p.output == 1 && start_phase(&p,"dumping")) {
 		maptool_dump(&p, suffix);
 		exit(0);

Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h	2013-09-10 18:35:21 UTC (rev 5638)
+++ trunk/navit/navit/maptool/maptool.h	2013-09-10 20:44:43 UTC (rev 5639)
@@ -261,7 +261,7 @@
 long long item_bin_get_id(struct item_bin *ib);
 void flush_nodes(int final);
 void sort_countries(int keep_tmpfiles);
-void process_associated_street(FILE *in, FILE *ways_in, FILE *ways_out, FILE *nodes_in, FILE *nodes_out);
+void process_associated_streets(FILE *in, FILE *ways_in, FILE *ways_out, FILE *nodes_in, FILE *nodes_out, FILE *nodes2_in, FILE *nodes2_out);
 void process_turn_restrictions(FILE *in, FILE *coords, FILE *ways, FILE *ways_index, FILE *out);
 void process_turn_restrictions_old(FILE *in, FILE *coords, FILE *ways, FILE *ways_index, FILE *out);
 void clear_node_item_buffer(void);

Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c	2013-09-10 18:35:21 UTC (rev 5638)
+++ trunk/navit/navit/maptool/osm.c	2013-09-10 20:44:43 UTC (rev 5639)
@@ -2241,23 +2241,34 @@
 	char *name;
 };
 
+struct associated_street_member_func_priv {
+	FILE *out;
+	GList *allocations;
+};
+
 static void
 process_associated_street_member(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv)
 {
-	FILE *out=*(FILE **)func_priv;
+	struct associated_street_member_func_priv *fp=func_priv;
 	struct associated_street *rel=relation_priv;
-	if(!out) {
+	if(!fp->out) {
 		/* Pass 1, fill associated street names in relation_priv */
 		char *name;
 		if(!rel->name && item_is_street(*member) && (name=item_bin_get_attr(member,attr_street_name,NULL))!=NULL ) {
 			rel->name=g_strdup(name);
+			fp->allocations=g_list_prepend(fp->allocations, rel->name);
 		}
 	} else {
 		/* Pass 2, add associated street names to relation members which do not have street name attr defined but 
 		   have house number defined or are streets */
-		if(rel->name && !item_bin_get_attr(member,attr_street_name,NULL) && (item_bin_get_attr(member,attr_house_number,NULL) || item_is_street(*member)))
+		int type_implies_streetname=item_is_street(*member) ||
+			member->type==type_house_number_interpolation_even ||
+			member->type==type_house_number_interpolation_odd || 
+			member->type==type_house_number_interpolation_all ||
+			member->type==type_house_number_interpolation_alphabetic;
+		if(rel->name && !item_bin_get_attr(member,attr_street_name,NULL) && (type_implies_streetname || item_bin_get_attr(member,attr_house_number,NULL)))
 			item_bin_add_attr_string(member, attr_street_name, rel->name);
-		item_bin_write(member,out);
+		item_bin_write(member,fp->out);
 	}
 }
 
@@ -2271,7 +2282,7 @@
 
 
 static void
-process_associated_street_setup(FILE *in, struct relations *relations, FILE **out)
+process_associated_streets_setup(FILE *in, struct relations *relations, struct associated_street_member_func_priv *fp)
 {
 	struct relation_member relm;
 	long long relid;
@@ -2280,60 +2291,75 @@
 	int min_count;
 	
 	fseek(in, 0, SEEK_SET);
-	relations_func=relations_func_new(process_associated_street_member, out);
+	relations_func=relations_func_new(process_associated_street_member, fp);
 	while ((ib=read_item(in))) {
-		struct associated_street *rel=g_new0(struct associated_street, 1);
+		char *name=osm_tag_value(ib, "name");
+		int namelen=name?strlen(name)+1:0;
+		struct associated_street *rel=g_malloc0(sizeof(struct associated_street)+namelen);
 		relid=item_bin_get_relationid(ib);
 		rel->relid=relid;
-		rel->name=g_strdup(osm_tag_value(ib, "name"));
-		dbg(0,"name=%s\n",rel->name);
+		if(name) {
+			rel->name=(char*)(rel+1);
+			g_strlcpy(rel->name,name,namelen);
+		}
+		fprintf(stderr,"name=%s\n",rel->name);
 		min_count=0;
 		while(search_relation_member(ib, "street",&relm,&min_count)) {
 			if(relm.type==2)
 				relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
-			dbg(0,"street type=%d(should be 2) id="LONGLONG_FMT "\n",relm.type,relm.id);
+			fprintf(stderr,"street type=%d(should be 2) id="LONGLONG_FMT "\n",relm.type,relm.id);
 
 		}
 		min_count=0;
 		while(search_relation_member(ib, "house",&relm,&min_count)) {
-			dbg(0,"house type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
+			fprintf(stderr,"house type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 		min_count=0;
 		while(search_relation_member(ib, "addr:houselink",&relm,&min_count)) {
-			dbg(0,"houselink type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
+			fprintf(stderr,"houselink type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 		min_count=0;
 		while(search_relation_member(ib, "address",&relm,&min_count)) {
-			dbg(0,"address type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
+			fprintf(stderr,"address type=%d id="LONGLONG_FMT"\n",relm.type,relm.id);
 			relations_add_func(relations, relations_func, rel, NULL, relm.type, relm.id);
 		}
 	}
-	relations_func=relations_func_new(relation_func_writethrough, out);
+	relations_func=relations_func_new(relation_func_writethrough, &fp->out);
 	relations_add_func(relations, relations_func, NULL, NULL, -1, 0);
 }
 
 void
-process_associated_street(FILE *in, FILE *ways_in, FILE *ways_out, FILE *nodes_in, FILE *nodes_out)
+process_associated_streets(FILE *in, FILE *ways_in, FILE *ways_out, FILE *nodes_in, FILE *nodes_out, FILE *nodes2_in, FILE *nodes2_out)
 {
 	struct relations *relations=relations_new();
-	FILE *out=NULL;
+	struct associated_street_member_func_priv fp={NULL,NULL};
 	fseek(in, 0, SEEK_SET);
- 	process_associated_street_setup(in, relations, &out);
+ 	process_associated_streets_setup(in, relations, &fp);
 
 	/* Set noname relations names from their street members */
 	fseek(ways_in, 0, SEEK_SET);
 	relations_process(relations, NULL, ways_in, NULL);
 
 	/* Set street names on all members */
-	out=ways_out;
+	fp.out=ways_out;
 	fseek(ways_in, 0, SEEK_SET);
 	relations_process(relations, NULL, ways_in, NULL);
 
-	out=nodes_out;
+	fp.out=nodes_out;
 	fseek(nodes_in, 0, SEEK_SET);
 	relations_process(relations, NULL, nodes_in, NULL);
+
+	if(nodes2_in) {
+		fp.out=nodes2_out;
+		fseek(nodes2_in, 0, SEEK_SET);
+		relations_process(relations, NULL, nodes2_in, NULL);
+	}
+
+	relations_destroy(relations);
+	g_list_foreach(fp.allocations, (GFunc)free, NULL);
+	g_list_free(fp.allocations);
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5638] trunk/navit/navit/maptool

From: <md...@us...> - 2013-09-10 18:35:23

Revision: 5638
          http://sourceforge.net/p/navit/code/5638
Author:   mdankov
Date:     2013-09-10 18:35:21 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Fix:maptool:Avoid turn restrictions skipping on long routes. Do not allow turn restrictions to be stored deeper in the tile structure than their corresponding roads.

Modified Paths:
--------------
    trunk/navit/navit/maptool/maptool.h
    trunk/navit/navit/maptool/misc.c
    trunk/navit/navit/maptool/osm.c

Modified: trunk/navit/navit/maptool/maptool.h
===================================================================
--- trunk/navit/navit/maptool/maptool.h	2013-09-08 22:55:55 UTC (rev 5637)
+++ trunk/navit/navit/maptool/maptool.h	2013-09-10 18:35:21 UTC (rev 5638)
@@ -232,6 +232,7 @@
 void process_binfile(FILE *in, FILE *out);
 void add_aux_tiles(char *name, struct zip_info *info);
 void cat(FILE *in, FILE *out);
+int item_order_by_type(enum item_type type);
 
 
 /* osm.c */

Modified: trunk/navit/navit/maptool/misc.c
===================================================================
--- trunk/navit/navit/maptool/misc.c	2013-09-08 22:55:55 UTC (rev 5637)
+++ trunk/navit/navit/maptool/misc.c	2013-09-10 18:35:21 UTC (rev 5638)
@@ -166,19 +166,11 @@
 	}
 }
 
-static void
-phase34_process_file(struct tile_info *info, FILE *in, FILE *reference)
+int
+item_order_by_type(enum item_type type)
 {
-	struct item_bin *ib;
-	int max;
-
-	while ((ib=read_item(in))) {
-		if (ib->type < 0x80000000)
-			processed_nodes++;
-		else
-			processed_ways++;
-		max=14;
-		switch (ib->type) {
+	int max=14;
+	switch (type) {
 		case type_town_label_1e7:
 		case type_town_label_5e6:
 		case type_town_label_2e6:
@@ -225,6 +217,28 @@
 			break;
 		default:
 			break;
+	}
+	return max;
+}
+
+static void
+phase34_process_file(struct tile_info *info, FILE *in, FILE *reference)
+{
+	struct item_bin *ib;
+	struct attr_bin *a;
+	int max;
+
+	while ((ib=read_item(in))) {
+		if (ib->type < 0x80000000)
+			processed_nodes++;
+		else
+			processed_ways++;
+		max=item_order_by_type(ib->type);
+		a=item_bin_get_attr_bin(ib, attr_order, NULL);
+		if(a) {
+			int max2=((struct range *)(a+1))->max;
+			if(max>max2)
+				max=max2;
 		}
 		tile_write_item_minmax(info, ib, reference, 0, max);
 	}

Modified: trunk/navit/navit/maptool/osm.c
===================================================================
--- trunk/navit/navit/maptool/osm.c	2013-09-08 22:55:55 UTC (rev 5637)
+++ trunk/navit/navit/maptool/osm.c	2013-09-10 18:35:21 UTC (rev 5638)
@@ -2342,12 +2342,14 @@
 	enum item_type type;
 	struct coord *c[3];
 	int c_count[3];
+	struct rect r;
+	int order;
 };
 
 static void
 process_turn_restrictions_member(void *func_priv, void *relation_priv, struct item_bin *member, void *member_priv)
 {
-	int count,type=(long)member_priv;
+	int i,count,type=(long)member_priv;
 	struct turn_restriction *turn_restriction=relation_priv;
 	struct coord *c=(struct coord *)(member+1);
 	int ccount=member->clen/2;
@@ -2360,6 +2362,19 @@
 	turn_restriction->c[type][turn_restriction->c_count[type]++]=c[0];
 	if (count > 1) 
 		turn_restriction->c[type][turn_restriction->c_count[type]++]=c[ccount-1];
+	if(IS_REF(turn_restriction->r.l)) {
+		turn_restriction->r.l=c[0];
+		turn_restriction->r.h=c[0];
+		i=1;
+	} else
+		i=0;
+	for(;i<ccount;i++)
+		bbox_extend(&c[i], &turn_restriction->r);
+
+	i=item_order_by_type(member->type);
+	if(i<turn_restriction->order)
+		turn_restriction->order=i;
+
 }
 
 static void
@@ -2426,12 +2441,20 @@
 				fprintf(stderr,"\n");
 			} else {
 				if (t->c_count[1] <= 2) {
+					int order;
+					char tilebuf[20]="";
 					item_bin_init(ib,t->type);
 					item_bin_add_coord(ib, c[0], 1);
 					item_bin_add_coord(ib, c[1], 1);
 					if (t->c_count[1] > 1) 
 						item_bin_add_coord(ib, c[3], 1);
 					item_bin_add_coord(ib, c[2], 1);
+
+					order=tile(&t->r,"",tilebuf,sizeof(tilebuf)-1,overlap,NULL);
+					if(order > t->order)
+						order=t->order;
+					item_bin_add_attr_range(ib,attr_order,0,order);
+					
 					item_bin_write(ib, out);
 				}
 				
@@ -2503,6 +2526,8 @@
 		turn_restriction=g_new0(struct turn_restriction, 1);
 		turn_restriction->relid=relid;
 		turn_restriction->type=ib->type;
+		turn_restriction->r.l.x=1<<30;
+		turn_restriction->order=255;
 		relations_add_func(relations, relations_func, turn_restriction, (gpointer) 0, fromm.type, fromm.id);
 		relations_add_func(relations, relations_func, turn_restriction, (gpointer) 1, viam.type, viam.id);
 		relations_add_func(relations, relations_func, turn_restriction, (gpointer) 2, tom.type, tom.id);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5637] trunk/navit/navit/navit_shipped.xml

From: <sl...@us...> - 2013-09-08 22:55:58

Revision: 5637
          http://sourceforge.net/p/navit/code/5637
Author:   sleske
Date:     2013-09-08 22:55:55 +0000 (Sun, 08 Sep 2013)
Log Message:
-----------
Add:speech_cmdline:Sample configuration in navit_shipped.xml.

Modified Paths:
--------------
    trunk/navit/navit/navit_shipped.xml

Modified: trunk/navit/navit/navit_shipped.xml
===================================================================
--- trunk/navit/navit/navit_shipped.xml	2013-09-08 22:55:46 UTC (rev 5636)
+++ trunk/navit/navit/navit_shipped.xml	2013-09-08 22:55:55 UTC (rev 5637)
@@ -718,8 +718,15 @@
 			If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
 			The default is text output to the shell -->
 		<speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/>
-		<!-- <speech type="cmdline" data="flite -t '%s'"/> -->
+		<!--
+		Instead of using a speech synthesizer, navit can also play pre-recorded samples for each word.
+		See http://wiki.navit-project.org/index.php/Configuration for details.
 
+		<speech type="cmdline" data="aplay -q %s"
+		sample_dir="/path/to/sampledir" sample_suffix=".wav" flags="1"
+		vocabulary_name="0" vocabulary_name_systematic="0" vocabulary_distances="0"/>
+                -->
+
 		<!-- You can only have enabled only one mapset at time, but with as much maps enabled as you want -->
 
 		<!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly -->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5636] trunk/navit/navit/speech/cmdline/speech_cmdline.c

From: <sl...@us...> - 2013-09-08 22:55:49

Revision: 5636
          http://sourceforge.net/p/navit/code/5636
Author:   sleske
Date:     2013-09-08 22:55:46 +0000 (Sun, 08 Sep 2013)
Log Message:
-----------
Fix:speech_cmdline:Log warning if speech output failed because of missing samples.

Modified Paths:
--------------
    trunk/navit/navit/speech/cmdline/speech_cmdline.c

Modified: trunk/navit/navit/speech/cmdline/speech_cmdline.c
===================================================================
--- trunk/navit/navit/speech/cmdline/speech_cmdline.c	2013-09-08 22:55:38 UTC (rev 5635)
+++ trunk/navit/navit/speech/cmdline/speech_cmdline.c	2013-09-08 22:55:46 UTC (rev 5636)
@@ -139,14 +139,17 @@
 	
 	if (this->sample_dir && this->sample_suffix)  {
 		argl=speech_cmdline_search(this->samples, strlen(this->sample_suffix), text, !!(this->flags & 1));
-		dbg(1,"For text: '%s', found %d samples.\n",text,g_list_length(argl));
 		samplesmode=1;
 		listlen=g_list_length(argl);
+		dbg(1,"For text: '%s', found %d samples.\n",text,listlen);
+		if (!listlen){
+			dbg(0,"No matching samples found. Cannot speak text: '%s'\n",text);
+		}
 	} else {
 		listlen=1;
 	}
-	dbg(1,"Speaking text '%s'\n",text);
 	if(listlen>0) {
+		dbg(1,"Speaking text '%s'\n",text);
 		int argc;
 		char**argv;
 		int j;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5635] trunk/navit/navit

From: <sl...@us...> - 2013-09-08 22:55:40

Revision: 5635
          http://sourceforge.net/p/navit/code/5635
Author:   sleske
Date:     2013-09-08 22:55:38 +0000 (Sun, 08 Sep 2013)
Log Message:
-----------
Fix:speech_cmdline:Improve debug messages, don't use level 0.

Modified Paths:
--------------
    trunk/navit/navit/speech/cmdline/speech_cmdline.c
    trunk/navit/navit/util.c

Modified: trunk/navit/navit/speech/cmdline/speech_cmdline.c
===================================================================
--- trunk/navit/navit/speech/cmdline/speech_cmdline.c	2013-09-08 22:55:26 UTC (rev 5634)
+++ trunk/navit/navit/speech/cmdline/speech_cmdline.c	2013-09-08 22:55:38 UTC (rev 5635)
@@ -63,6 +63,7 @@
 {
 	GList *loop_samples=samples,*result=NULL,*recursion_result;
 	int shortest_result_length=INT_MAX;
+	dbg(1,"searching samples for text: '%s'\n",text);
 	while (loop_samples) {
 		char *sample_name=loop_samples->data;
 		int sample_name_len;
@@ -76,6 +77,7 @@
 			const char *remaining_text=text+sample_name_len;
 			while (*remaining_text == ' ' || *remaining_text == ',')
 				remaining_text++;
+			dbg(1,"sample '%s' matched; remaining text: '%s'\n",sample_name,remaining_text);
 			if (*remaining_text) {
 				recursion_result=speech_cmdline_search(samples, suffix_len, remaining_text, decode);
 				if (recursion_result && g_list_length(recursion_result) < shortest_result_length) {
@@ -84,6 +86,8 @@
 					result=g_list_prepend(result, loop_samples->data);
 					shortest_result_length=g_list_length(result);
 				} else {
+					dbg(1,"no (shorter) result found for remaining text '%s', "
+						"trying next sample\n", remaining_text);
 					g_list_free(recursion_result);
 				}
 			} else {
@@ -135,12 +139,13 @@
 	
 	if (this->sample_dir && this->sample_suffix)  {
 		argl=speech_cmdline_search(this->samples, strlen(this->sample_suffix), text, !!(this->flags & 1));
+		dbg(1,"For text: '%s', found %d samples.\n",text,g_list_length(argl));
 		samplesmode=1;
 		listlen=g_list_length(argl);
 	} else {
 		listlen=1;
 	}
-	dbg(0,"text '%s'\n",text);
+	dbg(1,"Speaking text '%s'\n",text);
 	if(listlen>0) {
 		int argc;
 		char**argv;
@@ -160,7 +165,7 @@
 					while(l) {
 						char *new_arg;
 						new_arg=g_strdup_printf("%s/%s",this->sample_dir,(char *)l->data);
-						dbg(0,"new_arg %s\n",new_arg);
+						dbg(1,"new_arg %s\n",new_arg);
 						argv[j++]=g_strdup_printf(cmdv[i],new_arg);
 						g_free(new_arg);
 						l=g_list_next(l);
@@ -234,7 +239,7 @@
 			int len=strlen(name);
 			if (len > suffix_len) {
 				if (!strcmp(name+len-suffix_len, this->sample_suffix)) {
-					dbg(0,"found %s\n",name);
+					dbg(1,"found %s\n",name);
 					this->samples=g_list_prepend(this->samples, g_strdup(name));
 				}
 			}

Modified: trunk/navit/navit/util.c
===================================================================
--- trunk/navit/navit/util.c	2013-09-08 22:55:26 UTC (rev 5634)
+++ trunk/navit/navit/util.c	2013-09-08 22:55:38 UTC (rev 5635)
@@ -511,6 +511,7 @@
 		pid_t pid;
 		
 		sigset_t set, old;
+		dbg(1,"spawning process for '%s'\n", argv[0]);
 		sigemptyset(&set);
 		sigaddset(&set,SIGCHLD);
 		spawn_process_sigmask(SIG_BLOCK,&set,&old);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5634] trunk/navit/navit/speech/cmdline/speech_cmdline.c

From: <sl...@us...> - 2013-09-08 22:55:30

Revision: 5634
          http://sourceforge.net/p/navit/code/5634
Author:   sleske
Date:     2013-09-08 22:55:26 +0000 (Sun, 08 Sep 2013)
Log Message:
-----------
Refactor:speech_cmdline:Improve var names and simplify control flow in speech_cmdline_search ify control flow in

Modified Paths:
--------------
    trunk/navit/navit/speech/cmdline/speech_cmdline.c

Modified: trunk/navit/navit/speech/cmdline/speech_cmdline.c
===================================================================
--- trunk/navit/navit/speech/cmdline/speech_cmdline.c	2013-09-06 20:11:06 UTC (rev 5633)
+++ trunk/navit/navit/speech/cmdline/speech_cmdline.c	2013-09-08 22:55:26 UTC (rev 5634)
@@ -19,6 +19,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <glib.h>
 #include "config.h"
 #include "debug.h"
@@ -58,43 +59,44 @@
 }
 
 static GList *
-speech_cmdline_search(GList *l, int suffix_len, const char *s, int decode)
+speech_cmdline_search(GList *samples, int suffix_len, const char *text, int decode)
 {
-	GList *li=l,*ret=NULL,*tmp;
-	int len=0;
-	while (li) {
-		char *snd=li->data;
-		int snd_len;
+	GList *loop_samples=samples,*result=NULL,*recursion_result;
+	int shortest_result_length=INT_MAX;
+	while (loop_samples) {
+		char *sample_name=loop_samples->data;
+		int sample_name_len;
 		if (decode)
-			snd=urldecode(snd);
-		snd_len=strlen(snd)-suffix_len;
+			sample_name=urldecode(sample_name);
+		sample_name_len=strlen(sample_name)-suffix_len;
 		// TODO: Here we compare UTF-8 text with a filename.
-		// It's unclear how a case-insensitive comparison should
-		// work in general, so for now we only do it for ASCII
-		// text.
-		if (!g_ascii_strncasecmp(s, snd, snd_len)) {
-			const char *ss=s+snd_len;
-			while (*ss == ' ' || *ss == ',')
-				ss++;
-			dbg(1,"found %s remaining %s\n",snd,ss);
-			if (*ss) 
-				tmp=speech_cmdline_search(l, suffix_len, ss, decode);
-			else 
-				tmp=NULL;
-			if (!ret || (tmp && g_list_length(tmp) < len)) {
-				len=g_list_length(tmp);
-				g_list_free(ret);
-				ret=tmp;
-				if (!*ss || tmp) 
-					ret=g_list_prepend(ret, li->data);
-			} else
-				g_list_free(tmp);
+		// It's unclear how a case-insensitive comparison should work
+		// in general, so for now we only do it for ASCII text.
+		if (!g_ascii_strncasecmp(text, sample_name, sample_name_len)) {
+			const char *remaining_text=text+sample_name_len;
+			while (*remaining_text == ' ' || *remaining_text == ',')
+				remaining_text++;
+			if (*remaining_text) {
+				recursion_result=speech_cmdline_search(samples, suffix_len, remaining_text, decode);
+				if (recursion_result && g_list_length(recursion_result) < shortest_result_length) {
+					g_list_free(result);
+					result=recursion_result;
+					result=g_list_prepend(result, loop_samples->data);
+					shortest_result_length=g_list_length(result);
+				} else {
+					g_list_free(recursion_result);
+				}
+			} else {
+				g_list_free(result);
+				result=g_list_prepend(NULL, loop_samples->data);
+				break;
+			}
 		}
 		if (decode)
-			g_free(snd);
-		li=g_list_next(li);
+			g_free(sample_name);
+		loop_samples=g_list_next(loop_samples);
 	}
-	return ret;
+	return result;
 }
 #if 0
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5633] trunk/navit/navit/android/src/org/navitproject/ navit/NavitGraphics.java

From: <md...@us...> - 2013-09-06 20:11:14

Revision: 5633
          http://sourceforge.net/p/navit/code/5633
Author:   mdankov
Date:     2013-09-06 20:11:06 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Fix:port_android:Accept any character entered with Android software keyboard. Fixes #771.

Modified Paths:
--------------
    trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java

Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java	2013-09-06 08:24:06 UTC (rev 5632)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java	2013-09-06 20:11:06 UTC (rev 5633)
@@ -507,15 +507,12 @@
 				{
 					s = java.lang.String.valueOf((char) 14);
 				}
-			}
+			} 
 			else if (i == 10)
 			{
 				s = java.lang.String.valueOf((char) 13);
 			}
-			else
-			{
-				s = java.lang.String.valueOf((char) i);
-			}
+
 			if (s != null)
 			{
 				KeypressCallback(KeypressCallbackID, s);
@@ -602,6 +599,11 @@
 					}
 				}
 			}
+			else if(i!=10)
+			{
+				s = java.lang.String.valueOf((char) i);
+			} 
+						
 			if (s != null)
 			{
 				KeypressCallback(KeypressCallbackID, s);
@@ -611,6 +613,18 @@
 		}
 
 		@Override
+		public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
+		{
+			String s = null;
+			if(keyCode == KeyEvent.KEYCODE_UNKNOWN) {
+				s=event.getCharacters();
+				KeypressCallback(KeypressCallbackID, s);
+				return true;
+			}
+			return super.onKeyMultiple(keyCode, count, event);
+		}
+		
+		@Override
 		public boolean onTrackballEvent(MotionEvent event)
 		{
 			//Log.e("NavitGraphics", "onTrackball " + event.getAction() + " " + event.getX() + " "

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Navit-cvs-commit] SF.net SVN: navit:[5632] trunk/navit/navit

From: <mar...@us...> - 2013-09-06 08:24:09

Revision: 5632
          http://sourceforge.net/p/navit/code/5632
Author:   martin-s
Date:     2013-09-06 08:24:06 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Add:Core:Implement autozoom_max

Modified Paths:
--------------
    trunk/navit/navit/attr_def.h
    trunk/navit/navit/navit.c

Modified: trunk/navit/navit/attr_def.h
===================================================================
--- trunk/navit/navit/attr_def.h	2013-09-06 08:23:08 UTC (rev 5631)
+++ trunk/navit/navit/attr_def.h	2013-09-06 08:24:06 UTC (rev 5632)
@@ -185,6 +185,7 @@
 ATTR(turn_around_count)
 ATTR(turn_around_penalty)
 ATTR(turn_around_penalty2)
+ATTR(autozoom_max)
 ATTR2(0x00027500,type_rel_abs_begin)
 /* These attributes are int that can either hold relative		*
  * or absolute values. A relative value is indicated by 		*

Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c	2013-09-06 08:23:08 UTC (rev 5631)
+++ trunk/navit/navit/navit.c	2013-09-06 08:24:06 UTC (rev 5632)
@@ -133,6 +133,7 @@
 	int center_timeout;
 	int autozoom_secs;
 	int autozoom_min;
+	int autozoom_max;
 	int autozoom_active;
 	struct event_timeout *button_timeout, *motion_timeout;
 	struct callback *motion_timeout_callback;
@@ -655,14 +656,12 @@
 	if (abs(new_scale - scale) < 2) { 
 		return; // Smoothing
 	}
-	
-	if (new_scale >= this_->autozoom_min) {
+	if (new_scale > this_->autozoom_max)
+		new_scale=this_->autozoom_max;
+	if (new_scale < this_->autozoom_min)
+		new_scale=this_->autozoom_min;
+	if (new_scale != scale)
 		navit_scale(this_, (long)new_scale, &pc, 0);
-	} else {
-		if (scale != this_->autozoom_min) {
-			navit_scale(this_, this_->autozoom_min, &pc, 0);
-		}
-	}
 }
 
 /**
@@ -1401,6 +1400,7 @@
 	this_->autozoom_active = 0;
 	this_->zoom_min = 1;
 	this_->zoom_max = 2097152;
+	this_->autozoom_max = this_->zoom_max;
 	this_->follow_cursor = 1;
 	this_->radius = 30;
 	this_->border = 16;
@@ -2882,6 +2882,9 @@
 	case attr_autozoom_min:
 		this_->autozoom_min = attr->u.num;
 		break;
+	case attr_autozoom_max:
+		this_->autozoom_max = attr->u.num;
+		break;
 	case attr_layer:
 	case attr_script:
 		break;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

13 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 18 19 20 21 22 .. 242 > >> (Page 20 of 242)