navit-cvs-commit — CVS commit mailing list

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

[<mvg...@us...>]

Revision: 5956
          http://sourceforge.net/p/navit/code/5956
Author:   mvglasow
Date:     2014-11-22 15:50:40 +0000 (Sat, 22 Nov 2014)
Log Message:
-----------
Fix:core:Don't set map to invalid coordinates

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c	2014-11-22 15:38:23 UTC (rev 5955)
+++ trunk/navit/navit/navit.c	2014-11-22 15:50:40 UTC (rev 5956)
@@ -2344,12 +2344,29 @@
 	return 1;
 }
 
+/**
+ * @brief Recalculates the map view so that the vehicle cursor is visible
+ *
+ * This function recalculates the parameters which control the visible map area, zoom and orientation. The
+ * caller is responsible for redrawing the map after the function returns.
+ *
+ * If the vehicle supplies a {@code position_valid} attribute and it is {@code attr_position_valid_invalid},
+ * the map position is not changed.
+ *
+ * @param this_ The navit object
+ * @param autozoom Whether to set zoom based on current speed. If false, current zoom will be maintained.
+ * @param keep_orientation Whether to maintain the current map orientation. If false, the map will be rotated
+ * so that the bearing of the vehicle is up.
+ */
 void
 navit_set_center_cursor(struct navit *this_, int autozoom, int keep_orientation)
 {
 	int dir;
 	struct point pn;
 	struct navit_vehicle *nv=this_->vehicle;
+	struct attr attr;
+	if (vehicle_get_attr(nv->vehicle, attr_position_valid, &attr, NULL) && (attr.u.num == attr_position_valid_invalid))
+		return;
 	navit_get_cursor_pnt(this_, &pn, keep_orientation, &dir);
 	transform_set_yaw(this_->trans, dir);
 	navit_set_center_coord_screen(this_, &nv->coord, &pn, 0);
@@ -2357,6 +2374,14 @@
 		navit_autozoom(this_, &nv->coord, nv->speed, 0);
 }
 
+/**
+ * @brief Recenters the map so that the vehicle cursor is visible
+ *
+ * This function first calls {@code navit_set_center_cursor()} to recalculate the map display, then
+ * triggers a redraw of the map.
+ *
+ *@param this_ The navit object
+ */
 static void
 navit_set_center_cursor_draw(struct navit *this_)
 {
@@ -2365,6 +2390,14 @@
 		navit_draw_async(this_, 1);
 }
 
+/**
+ * @brief Recenters the map so that the vehicle cursor is visible
+ *
+ * This is the callback function for the {@code set_center_cursor()} command. It is just a wrapper around
+ * {@code navit_set_center_cursor_draw()}.
+ *
+ *@param this_ The navit object
+ */
 static void
 navit_cmd_set_center_cursor(struct navit *this_)
 {

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:[5955] trunk/navit/navit/osd/core/osd_core.c

[<mvg...@us...>]

Revision: 5955
          http://sourceforge.net/p/navit/code/5955
Author:   mvglasow
Date:     2014-11-22 15:38:23 +0000 (Sat, 22 Nov 2014)
Log Message:
-----------
Add:osd:Update gps_status when status changes but not position

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/osd/core/osd_core.c

Modified: trunk/navit/navit/osd/core/osd_core.c
===================================================================
--- trunk/navit/navit/osd/core/osd_core.c	2014-11-22 15:37:16 UTC (rev 5954)
+++ trunk/navit/navit/osd/core/osd_core.c	2014-11-22 15:38:23 UTC (rev 5955)
@@ -3221,6 +3221,9 @@
 {
 	osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc);
 	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_gps_status_draw), attr_position_coord_geo, opc));
+	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_gps_status_draw), attr_position_fix_type, opc));
+	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_gps_status_draw), attr_position_sats_used, opc));
+	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_gps_status_draw), attr_position_hdop, opc));
 	osd_gps_status_draw(opc, nav, NULL);
 }
 

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:[5954] trunk/navit/navit/navit.c

[<mvg...@us...>]

Revision: 5954
          http://sourceforge.net/p/navit/code/5954
Author:   mvglasow
Date:     2014-11-22 15:37:16 +0000 (Sat, 22 Nov 2014)
Log Message:
-----------
Add:core:Add support for GPS status callbacks in navit object

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/navit.c
===================================================================
--- trunk/navit/navit/navit.c	2014-11-21 22:34:29 UTC (rev 5953)
+++ trunk/navit/navit/navit.c	2014-11-22 15:37:16 UTC (rev 5954)
@@ -2987,9 +2987,29 @@
 #endif
 }
 
+/**
+ * @brief Called when the position of a vehicle changes.
+ *
+ * This function is called when the position of any configured vehicle changes and triggers all actions
+ * that need to happen in response, such as:
+ * <ul>
+ * <li>Switching between day and night layout (based on the new position timestamp)</li>
+ * <li>Updating position, bearing and speed of {@code nv} with the data of the active vehicle
+ * (which may be different from the vehicle reporting the update)</li>
+ * <li>Invoking callbacks for {@code navit}'s {@code attr_position} and {@code attr_position_coord_geo}
+ * attributes</li>
+ * <li>Triggering an update of the vehicle's position on the map and, if needed, an update of the
+ * visible map area ad orientation</li>
+ * <li>Logging a new track point, if enabled</li>
+ * <li>Updating the position on the route</li>
+ * <li>Stopping navigation if the destination has been reached</li>
+ * </ul>
+ *
+ * @param this_ The navit object
+ * @param nv The {@code navit_vehicle} which reported a new position
+ */
 static void
-navit_vehicle_update(struct navit *this_, struct navit_vehicle *nv)
-{
+navit_vehicle_update_position(struct navit *this_, struct navit_vehicle *nv) {
 	struct attr attr_valid, attr_dir, attr_speed, attr_pos;
 	struct pcoord cursor_pc;
 	struct point cursor_pnt, *pnt=&cursor_pnt;
@@ -3088,6 +3108,37 @@
 }
 
 /**
+ * @brief Called when a status attribute of a vehicle changes.
+ *
+ * This function is called when the {@code position_fix_type}, {@code position_sats_used} or {@code position_hdop}
+ * attribute of any configured vehicle changes.
+ *
+ * The function checks if {@code nv} refers to the active vehicle and if {@code type} is one of the above types.
+ * If this is the case, it invokes the callback functions for {@code navit}'s respective attributes.
+ *
+ * Future actions that need to happen when one of these three attribute changes for any vehicle should be
+ * implemented here.
+ *
+ * @param this_ The navit object
+ * @param nv The {@code navit_vehicle} which reported a new status attribute
+ * @param type The type of attribute with has changed
+ */
+static void
+navit_vehicle_update_status(struct navit *this_, struct navit_vehicle *nv, enum attr_type type) {
+	if (this_->vehicle != nv)
+		return;
+	switch(type) {
+	case attr_position_fix_type:
+	case attr_position_sats_used:
+	case attr_position_hdop:
+		callback_list_call_attr_2(this_->attr_cbl, type, this_, nv->vehicle);
+		break;
+	default:
+		return;
+	}
+}
+
+/**
  * Set the position of the vehicle
  *
  * @param navit The navit instance
@@ -3158,11 +3209,11 @@
 }
 
 /**
- * Register a new vehicle
+ * @brief Registers a new vehicle.
  *
- * @param navit The navit instance
- * @param v The vehicle instance
- * @returns 1 for success
+ * @param this_ The navit instance
+ * @param v The vehicle to register
+ * @return True for success
  */
 static int
 navit_add_vehicle(struct navit *this_, struct vehicle *v)
@@ -3183,8 +3234,14 @@
 	if ((vehicle_get_attr(v, attr_animate, &animate, NULL)))
 		nv->animate_cursor=animate.u.num;
 	nv->callback.type=attr_callback;
-	nv->callback.u.callback=callback_new_attr_2(callback_cast(navit_vehicle_update), attr_position_coord_geo, this_, nv);
+	nv->callback.u.callback=callback_new_attr_2(callback_cast(navit_vehicle_update_position), attr_position_coord_geo, this_, nv);
 	vehicle_add_attr(nv->vehicle, &nv->callback);
+	nv->callback.u.callback=callback_new_attr_3(callback_cast(navit_vehicle_update_status), attr_position_fix_type, this_, nv, attr_position_fix_type);
+	vehicle_add_attr(nv->vehicle, &nv->callback);
+	nv->callback.u.callback=callback_new_attr_3(callback_cast(navit_vehicle_update_status), attr_position_sats_used, this_, nv, attr_position_sats_used);
+	vehicle_add_attr(nv->vehicle, &nv->callback);
+	nv->callback.u.callback=callback_new_attr_3(callback_cast(navit_vehicle_update_status), attr_position_hdop, this_, nv, attr_position_hdop);
+	vehicle_add_attr(nv->vehicle, &nv->callback);
 	vehicle_set_attr(nv->vehicle, &this_->self);
 	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:[5953] trunk/navit/navit/vehicle/maemo/vehicle_maemo.c

[<mvg...@us...>]

Revision: 5953
          http://sourceforge.net/p/navit/code/5953
Author:   mvglasow
Date:     2014-11-21 22:34:29 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Fix:port/maemo:Correct debug output when getting attr_position_sats

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/vehicle/maemo/vehicle_maemo.c

Modified: trunk/navit/navit/vehicle/maemo/vehicle_maemo.c
===================================================================
--- trunk/navit/navit/vehicle/maemo/vehicle_maemo.c	2014-11-20 20:10:33 UTC (rev 5952)
+++ trunk/navit/navit/vehicle/maemo/vehicle_maemo.c	2014-11-21 22:34:29 UTC (rev 5953)
@@ -245,7 +245,7 @@
 		attr->u.numd = &priv->hdop;
 		break;
 	case attr_position_sats:
-		dbg(1,"Attr requested: position_sats_signal\n");
+		dbg(1,"Attr requested: position_sats\n");
 		attr->u.num = priv->sats;
 		break;
 	case attr_position_sats_used:

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:[5952] trunk/navit/navit/vehicle/android/vehicle_android. c

[<mvg...@us...>]

Revision: 5952
          http://sourceforge.net/p/navit/code/5952
Author:   mvglasow
Date:     2014-11-20 20:10:33 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Add:port/android:Support position_valid attribute for Android vehicle

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/vehicle/android/vehicle_android.c

Modified: trunk/navit/navit/vehicle/android/vehicle_android.c
===================================================================
--- trunk/navit/navit/vehicle/android/vehicle_android.c	2014-11-20 20:09:14 UTC (rev 5951)
+++ trunk/navit/navit/vehicle/android/vehicle_android.c	2014-11-20 20:10:33 UTC (rev 5952)
@@ -37,17 +37,17 @@
 
 struct vehicle_priv {
 	struct callback_list *cbl;
-	struct coord_geo geo;
-	double speed;
-	double direction;
-	double height;
-	double radius;
-	int fix_type;
-	time_t fix_time;
-	char fixiso8601[128];
-	int sats;
-	int sats_used;
-	int have_coords;
+	struct coord_geo geo;      /**< The last known position of the vehicle **/
+	double speed;              /**< Speed in km/h **/
+	double direction;          /**< Bearing in degrees **/
+	double height;             /**< Elevation in meters **/
+	double radius;             /**< Position accuracy in meters **/
+	int fix_type;              /**< Type of last fix (not used) **/
+	time_t fix_time;           /**< Timestamp of last fix (not used) **/
+	char fixiso8601[128];      /**< Timestamp of last fix in ISO 8601 format **/
+	int sats;                  /**< Number of satellites in view (currently not used) **/
+	int sats_used;             /**< Number of satellites used in fix (currently not used) **/
+	int have_coords;           /**< Whether the vehicle coordinates in {@code geo} are valid **/
 	struct attr ** attrs;
 	struct callback *cb;
 	jclass NavitVehicleClass;
@@ -117,6 +117,9 @@
 	case attr_position_time_iso8601:
 		attr->u.str=priv->fixiso8601;
 		break;
+	case attr_position_valid:
+		attr->u.num = priv->have_coords ? attr_position_valid_valid : attr_position_valid_invalid;
+		break;
 	default:
 		return 0;
 	}
@@ -147,7 +150,10 @@
 	tm = gmtime(&tnow);
 	strftime(v->fixiso8601, sizeof(v->fixiso8601), "%Y-%m-%dT%TZ", tm);
 	dbg(1,"lat %f lon %f time %s\n",v->geo.lat,v->geo.lng,v->fixiso8601);
-	v->have_coords=1;
+	if (!v->have_coords) {
+		v->have_coords=1;
+		callback_list_call_attr_0(v->cbl, attr_position_valid);
+	}
 	callback_list_call_attr_0(v->cbl, attr_position_coord_geo);
 }
 
@@ -210,6 +216,7 @@
 	ret = g_new0(struct vehicle_priv, 1);
 	ret->cbl = cbl;
 	ret->cb=callback_new_1(callback_cast(vehicle_android_callback), ret);
+	ret->have_coords = 0;
 	*meth = vehicle_android_methods;
 	vehicle_android_init(ret);
 	dbg(0, "return\n");

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:[5951] trunk/navit/navit/vehicle/demo/vehicle_demo.c

[<mvg...@us...>]

Revision: 5951
          http://sourceforge.net/p/navit/code/5951
Author:   mvglasow
Date:     2014-11-20 20:09:14 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Add:core:Support position_valid attribute for demo vehicle

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/vehicle/demo/vehicle_demo.c

Modified: trunk/navit/navit/vehicle/demo/vehicle_demo.c
===================================================================
--- trunk/navit/navit/vehicle/demo/vehicle_demo.c	2014-11-16 23:00:21 UTC (rev 5950)
+++ trunk/navit/navit/vehicle/demo/vehicle_demo.c	2014-11-20 20:09:14 UTC (rev 5951)
@@ -49,6 +49,7 @@
 	struct event_timeout *timer;
 	char *timep;
 	char *nmea;
+	enum attr_position_valid valid;  /**< Whether the vehicle has valid position data **/
 
 };
 
@@ -126,6 +127,9 @@
 		g_free(rmc);
 		attr->u.str=priv->nmea;
 		break;
+	case attr_position_valid:
+		attr->u.num=priv->valid;
+		break;
 	default:
 		return 0;
 	}
@@ -154,6 +158,10 @@
 		break;
 	case attr_position_coord_geo:
 		priv->geo=*(attr->u.coord_geo);
+		if (priv->valid != attr_position_valid_valid) {
+			priv->valid = attr_position_valid_valid;
+			callback_list_call_attr_0(priv->cbl, attr_position_valid);
+		}
 		priv->position_set=1;
 		dbg(1,"position_set %f %f\n", priv->geo.lat, priv->geo.lng);
 		break;
@@ -246,6 +254,10 @@
 				dbg(1, "ci=0x%x,0x%x\n", ci.x, ci.y);
 				transform_to_geo(projection_mg, &ci,
 						 &priv->geo);
+				if (priv->valid != attr_position_valid_valid) {
+					priv->valid = attr_position_valid_valid;
+					callback_list_call_attr_0(priv->cbl, attr_position_valid);
+				}
 				callback_list_call_attr_0(priv->cbl, attr_position_coord_geo);
 				break;
 			}
@@ -273,6 +285,7 @@
 	ret->interval=1000;
 	ret->config_speed=40;
 	ret->timer_callback=callback_new_1(callback_cast(vehicle_demo_timer), ret);
+	ret->valid = attr_position_valid_invalid;
 	*meth = vehicle_demo_methods;
 	while (attrs && *attrs) 
 		vehicle_demo_set_attr_do(ret, *attrs++);

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:[5950] trunk/navit/navit

[<mvg...@us...>]

Revision: 5950
          http://sourceforge.net/p/navit/code/5950
Author:   mvglasow
Date:     2014-11-16 23:00:21 +0000 (Sun, 16 Nov 2014)
Log Message:
-----------
Refactoring:core:documentation update

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/command.c
===================================================================
--- trunk/navit/navit/command.c	2014-11-15 17:33:13 UTC (rev 5949)
+++ trunk/navit/navit/command.c	2014-11-16 23:00:21 UTC (rev 5950)
@@ -58,15 +58,15 @@
 struct command_saved {
 	struct context ctx;
 	struct result res;
-	char *command;				// The command string itself
-	struct event_idle *idle_ev;		// Event to update this command
+	char *command;				/**< The command string itself **/
+	struct event_idle *idle_ev;		/**< Event to update this command **/
 	struct callback *idle_cb;
-	struct callback *register_cb;			// Callback to register all the callbacks
-	struct event_idle *register_ev;		// Idle event to register all the callbacks
+	struct callback *register_cb;			/**< Callback to register all the callbacks **/
+	struct event_idle *register_ev;		/**< Idle event to register all the callbacks **/
 	struct attr context_attr;
 	int num_cbs;
-	struct command_saved_cb *cbs;		// List of callbacks for this saved command
-	struct callback *cb; // Callback that should be called when we re-evaluate
+	struct command_saved_cb *cbs;		/**< List of callbacks for this saved command **/
+	struct callback *cb; /**< Callback that should be called when we re-evaluate **/
 	int error;
 	int async;
 };
@@ -279,7 +279,26 @@
 }
 
 
-
+/**
+ * @brief Returns an integer or bool representation of the result of an expression
+ *
+ * This function evaluates the result of an expression ({@code res->attr}).
+ *
+ * If {@code res->attr} is of a numeric type, its integer part is returned.
+ *
+ * If {@code is_bool} is false and {@code res->attr} is not of a numeric type, 0 is returned.
+ *
+ * If {@code is_bool} is true and {@code res->attr} is of an object or string type, true is returned
+ * for non-null, false otherwise.
+ *
+ * For all other types of {@code res->attr}, 0 (false) is returned.
+ *
+ * @param ctx The context for the expression
+ * @param is_bool If true, return boolean representation, else return integer representation. See description.
+ * @param res The result of the evaluation
+ *
+ * @return The result of the expression, see description.
+ */
 static int
 get_int_bool(struct context *ctx, int is_bool, struct result *res)
 {
@@ -301,12 +320,24 @@
 	return 0;
 }
 
+/**
+ * @brief Returns an integer representation of the result of an expression
+ *
+ * This function is a wrapper around {@code get_int_bool()}. It is equivalent to
+ * {@code get_int_bool(ctx, 0, res)}. See {@code get_int_bool()} for a description.
+ */
 static int
 get_int(struct context *ctx, struct result *res)
 {
 	return get_int_bool(ctx, 0, res);
 }
 
+/**
+ * @brief Returns a boolean representation of the result of an expression
+ *
+ * This function is a wrapper around {@code get_int_bool()}. It is equivalent to
+ * {@code get_int_bool(ctx, 1, res)}. See {@code get_int_bool()} for a description.
+ */
 static int
 get_bool(struct context *ctx, struct result *res)
 {
@@ -1398,6 +1429,12 @@
 	cs->cb = cb;
 }
 
+/**
+ * @brief Returns an integer representation of the evaluation result of a saved command
+ *
+ * This function is a wrapper around {@code get_int()}. It is equivalent to
+ * {@code get_int(&cs->ctx, &cs->res)}. See {@code get_int()} for a description.
+ */
 int
 command_saved_get_int (struct command_saved *cs)
 {

Modified: trunk/navit/navit/vehicle.c
===================================================================
--- trunk/navit/navit/vehicle.c	2014-11-15 17:33:13 UTC (rev 5949)
+++ trunk/navit/navit/vehicle.c	2014-11-16 23:00:21 UTC (rev 5950)
@@ -205,7 +205,7 @@
  * @param this_ Pointer to a vehicle structure
  * @param type The attribute type to look for
  * @param attr Pointer to a {@code struct attr} to store the attribute
- * @param iter A vehicle attr_iter
+ * @param iter A vehicle attr_iter. This is only used for generic attributes; for attributes specific to the vehicle object it is ignored.
  * @return True for success, false for failure
  */
 int

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:[5949] trunk/navit/navit/log.c

[<mvg...@us...>]

Revision: 5949
          http://sourceforge.net/p/navit/code/5949
Author:   mvglasow
Date:     2014-11-15 17:33:13 +0000 (Sat, 15 Nov 2014)
Log Message:
-----------
Fix:core:Obey size argument of strftime_localtime in log.c

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/log.c
===================================================================
--- trunk/navit/navit/log.c	2014-11-15 16:50:21 UTC (rev 5948)
+++ trunk/navit/navit/log.c	2014-11-15 17:33:13 UTC (rev 5949)
@@ -95,8 +95,7 @@
 
 	t=time(NULL);
 	tm=localtime(&t);
-	strftime(buffer, 4096, fmt, tm);
-	//FIXME: strftime(buffer, size - 1, fmt, tm);
+	strftime(buffer, size - 1, fmt, tm);
 }
 
 /** 

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:[5948] trunk/navit/navit

[<mvg...@us...>]

Revision: 5948
          http://sourceforge.net/p/navit/code/5948
Author:   mvglasow
Date:     2014-11-15 16:50:21 +0000 (Sat, 15 Nov 2014)
Log Message:
-----------
Refactoring:core:Add some more documentation

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/attr.c
    trunk/navit/navit/attr_def.h
    trunk/navit/navit/log.c
    trunk/navit/navit/osd/core/osd_core.c
    trunk/navit/navit/util.c
    trunk/navit/navit/vehicle/android/vehicle_android.c
    trunk/navit/navit/vehicle/wince/vehicle_wince.c
    trunk/navit/navit/vehicle.c

Modified: trunk/navit/navit/attr.c
===================================================================
--- trunk/navit/navit/attr.c	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/attr.c	2014-11-15 16:50:21 UTC (rev 5948)
@@ -1,4 +1,4 @@
-/**
+/*
  * Navit, a modular navigation system.
  * Copyright (C) 2005-2008 Navit Team
  *
@@ -16,6 +16,15 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  */
+ 
+/** @file attr.c
+ * @brief Attribute handling code
+ * 
+ * Structures and functions for working with attributes.
+ *
+ * @author Navit Team
+ * @date 2005-2014
+ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -74,6 +83,14 @@
 	attr_hash=NULL;
 }
 
+/** 
+ * @brief Converts a string to an attr_type
+ *
+ * This function reads a string and returns the corresponding attr_type.
+ *
+ * @param name The attribute name
+ * @return The corresponding {@code attr_type}, or {@code attr_none} if the string specifies a nonexistent or invalid attribute type.
+ */
 enum attr_type
 attr_from_name(const char *name)
 {
@@ -93,6 +110,14 @@
 
 
 
+/** 
+ * @brief Converts an attr_type to a string
+ *
+ * @param attr The attribute type to be converted.
+ * @return The attribute name, or NULL if an invalid value was passed as {@code attr}.
+ * The calling function should create a copy of the string if it needs to alter it or relies on the
+ * string being available permanently.
+ */
 char *
 attr_to_name(enum attr_type attr)
 {
@@ -105,6 +130,16 @@
 	return NULL; 
 }
 
+/** 
+ * @brief Creates an attribute from text information
+ *
+ * This function creates an attribute from two strings specifying the name and
+ * the value.
+ *
+ * @param name The name of the new attribute
+ * @param value The value of the new attribute
+ * @return The new attribute
+ */
 struct attr *
 attr_new_from_text(const char *name, const char *value)
 {
@@ -250,6 +285,12 @@
 	return ret;
 }
 
+/** 
+ * @brief Converts access flags to a human-readable string.
+ *
+ * @param flags The flags as a number
+ * @return The flags in human-readable form
+ */
 static char *
 flags_to_text(int flags)
 {
@@ -289,6 +330,19 @@
 	return ret;
 }
 
+/** 
+ * @brief Converts attribute data to human-readable text
+ *
+ * @param attr The attribute to be formatted
+ * @param sep The separator to insert between a numeric value and its unit. If NULL, nothing will be inserted.
+ * @param fmt Set to {@code attr_format_with_units} if {@code attr} is of type {@code attr_destination_length}
+ * or {@code attr_destination_time} or a group type which might contain attributes of those types. Ignored for
+ * all other attribute types.
+ * @param def_fmt Not used
+ * @param map The translation map. This is only needed for string type attributes or group type
+ * attributes which might contain strings. It can be NULL for other attribute types. If a string
+ * type attribute is encountered and {@code map} is NULL, the string will be returned unchanged.
+ */
 char *
 attr_to_text_ext(struct attr *attr, char *sep, enum attr_format fmt, enum attr_format def_fmt, struct map *map)
 {
@@ -407,7 +461,7 @@
  * This function is just a wrapper around {@code attr_to_text_ext()}.
  *
  * @param attr The attribute to convert
- * @param map
+ * @param map The translation map, see {@code attr_to_text_ext()}
  * @param pretty Not used
  */
 char *
@@ -416,6 +470,18 @@
 	return attr_to_text_ext(attr, NULL, attr_format_default, attr_format_default, map);
 }
 
+/** 
+ * @brief Searches for an attribute of a given type
+ *
+ * This function searches an array of pointers to attributes for a given
+ * attribute type and returns the first match.
+ *
+ * @param attrs Points to the array of attribute pointers to be searched
+ * @param last Not used
+ * @param attr_type The attribute type to search for. Generic types (such as
+ * attr_any or attr_any_xml) are NOT supported.
+ * @return Pointer to the first matching attribute, or NULL if no match was found.
+ */
 struct attr *
 attr_search(struct attr **attrs, struct attr *last, enum attr_type attr)
 {
@@ -448,6 +514,32 @@
 	}
 }
 
+/**
+ * @brief Generic get function
+ *
+ * This function searches an attribute list for an attribute of a given type and
+ * stores it in the attr parameter. If no match is found in attrs and the
+ * def_attrs argument is supplied, def_attrs is searched for the attribute type
+ * and the first match (if any) is returned.
+ * <p>
+ * Searching for attr_any or attr_any_xml is supported, but def_attrs will not
+ * be searched in that case.
+ * <p>
+ * An iterator can be specified to get multiple attributes of the same type:
+ * The first call will return the first match from attr; each subsequent call
+ * with the same iterator will return the next match. After obtaining the last
+ * match from attr, def_attrs is searched in the same manner. If no more matching
+ * attributes are found in either of them, false is returned.
+ *
+ * @param attrs Points to the array of attribute pointers to be searched
+ * @param def_attrs Points to a list of pointers to default attributes.
+ * If an attribute is not found in attrs, the function will return the first
+ * match from def_attrs. This parameter may be NULL.
+ * @param type The attribute type to search for
+ * @param attr Points to a {@code struct attr} which will receive the attribute
+ * @param iter An iterator. This parameter may be NULL.
+ * @return True if a matching attribute was found, false if not.
+ */
 int
 attr_generic_get_attr(struct attr **attrs, struct attr **def_attrs, enum attr_type type, struct attr *attr, struct attr_iter *iter)
 {
@@ -475,6 +567,18 @@
 	return 0;
 }
 
+/**
+ * @brief Generic set function
+ *
+ * This function will search the list for the first attribute of the same type
+ * as the supplied new one and replace it with that. If the list does not
+ * contain an attribute whose type matches that of the new one, the new
+ * attribute is inserted into the list.
+ *
+ * @param attrs Points to the array of attribute pointers to be updated
+ * @param attr The new attribute.
+ * @return Pointer to the updated attribute list
+ */
 struct attr **
 attr_generic_set_attr(struct attr **attrs, struct attr *attr)
 {
@@ -498,6 +602,15 @@
 	return curr;
 }
 
+/**
+ * @brief Generic add function
+ *
+ * This function will insert a new attribute into the list.
+ *
+ * @param attrs Points to the array of attribute pointers to be updated
+ * @param attr The new attribute.
+ * @return Pointer to the updated attribute list
+ */
 struct attr **
 attr_generic_add_attr(struct attr **attrs, struct attr *attr)
 {
@@ -823,12 +936,12 @@
 }
 
 /**
- * Check if an enumeration of attribute types contains a specific attribute.
+ * @brief Checks if an enumeration of attribute types contains a specific attribute.
  *
- * @param types Pointer to the attr_type enumeration to be searched
+ * @param types Points to a NULL-terminated array of pointers to {@code enum attr_type}, which will be searched
  * @param type The attr_type to be searched for
  *
- * @return 1 if the attribute type was found, 0 if it was not found or if a null pointer was passed as types
+ * @return True if the attribute type was found, false if it was not found or if {@code types} is empty
  */
 int
 attr_types_contains(enum attr_type *types, enum attr_type type)
@@ -842,14 +955,16 @@
 }
 
 /**
- * Check if an enumeration of attribute types contains a specific attribute. 
- * It is different from attr_types_contains in that it returns a caller-defined value if the pointer to the enumeration is NULL.
+ * @brief Check if an enumeration of attribute types contains a specific attribute.
  *
- * @param types Pointer to the attr_type enumeration to be searched
+ * This function is mostly identical to {@code attr_types_contains()} but returns the supplied default
+ * value if {@code types} is empty.
+ *
+ * @param types Points to a NULL-terminated array of pointers to {@code enum attr_type}, which will be searched
  * @param type The attr_type to be searched for
- * @param deflt The default value to return if types is NULL.
+ * @param deflt The default value to return if {@code types} is empty.
  *
- * @return 1 if the attribute type was found, 0 if it was not found, the value of the deflt argument if types is NULL.
+ * @return True if the attribute type was found, false if it was not found, {@code deflt} if types is empty.
  */
 int
 attr_types_contains_default(enum attr_type *types, enum attr_type type, int deflt)

Modified: trunk/navit/navit/attr_def.h
===================================================================
--- trunk/navit/navit/attr_def.h	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/attr_def.h	2014-11-15 16:50:21 UTC (rev 5948)
@@ -1,4 +1,4 @@
-/**
+/*
  * Navit, a modular navigation system.
  * Copyright (C) 2005-2009 Navit Team
  *
@@ -17,6 +17,15 @@
  * Boston, MA  02110-1301, USA.
  */
 
+/** @file attr_def.h
+ * @brief Attribute definitions.
+ * 
+ * Any attribute used by a Navit object must be defined in this file.
+ *
+ * @author Navit Team
+ * @date 2005-2014
+ */
+
 /* prototypes */
 
 /* common */

Modified: trunk/navit/navit/log.c
===================================================================
--- trunk/navit/navit/log.c	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/log.c	2014-11-15 16:50:21 UTC (rev 5948)
@@ -1,4 +1,4 @@
-/**
+/*
  * Navit, a modular navigation system.
  * Copyright (C) 2005-2008 Navit Team
  *
@@ -16,6 +16,15 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  */
+ 
+/** @file log.c
+ * @brief The log object.
+ * 
+ * This file implements everything needed for logging: the log object and its functions.
+ *
+ * @author Navit Team
+ * @date 2005-2014
+ */
 
 #include "config.h"
 #ifdef HAVE_UNISTD_H
@@ -67,6 +76,17 @@
 	struct log_data trailer;
 };
 
+/** 
+ * @brief Stores formatted time to a string.
+ *
+ * This function obtains local system time, formats it as specified in {@code fmt} and stores it in buffer.
+ * Format strings follow the same syntax as those for {@code strftime()}.
+ *
+ * @param buffer A preallocated buffer that will receive the formatted time
+ * @param size Size of the buffer, in bytes
+ * @param fmt The format string
+ * @return Nothing
+ */
 static void
 strftime_localtime(char *buffer, int size, char *fmt)
 {
@@ -76,8 +96,19 @@
 	t=time(NULL);
 	tm=localtime(&t);
 	strftime(buffer, 4096, fmt, tm);
+	//FIXME: strftime(buffer, size - 1, fmt, tm);
 }
 
+/** 
+ * @brief Expands placeholders in a filename
+ *
+ * This function examines the {@code log->filename} and replaces any placeholders
+ * found in it with date, time or an incremental number. If an incremental number is specified, the function
+ * will ensure the filename is unique. The expanded filename will be stored {@code log->filename_ex2}.
+ * The function uses {@code log->filename_ex1} to store the partly-expanded filename.
+ * 
+ * @param this_ The log object.
+ */
 static void
 expand_filenames(struct log *this_)
 {
@@ -102,6 +133,13 @@
 		this_->filename_ex2=g_strdup(this_->filename_ex1);
 }
 
+/** 
+ * @brief Sets the time at which the log buffer was last flushed.
+ *
+ * This function sets {@code log->last_flush} to current time.
+ *
+ * @param this_ The log object.
+ */
 static void
 log_set_last_flush(struct log *this_)
 {
@@ -110,6 +148,24 @@
 #endif
 }
 
+/** 
+ * @brief Opens a log file.
+ *
+ * This function opens the log file for {@code log}.
+ * The file name must be specified by {@code log->filename_ex2} before this function is called.
+ * <p>
+ * {@code log->overwrite} specifies the behavior if the file exists: if true,
+ * an existing file will be overwritten, else it will be appended to.
+ * <p>
+ * If the directory specified in the filename does not exist and the {@code log->mkdir}
+ * is true, it will be created.
+ * <p>
+ * After the function returns, {@code log->f} will contain the file handle (or NULL, if
+ * the operation failed) and {@code log->empty} will indicate if the file is empty.
+ * {@code log->last_flush} will be updated with the current time.
+ *
+ * @param this_ The log object.
+ */
 static void
 log_open(struct log *this_)
 {
@@ -131,6 +187,13 @@
 	log_set_last_flush(this_);
 }
 
+/** 
+ * @brief Closes a log file.
+ *
+ * This function writes the trailer to a log file, flushes it and closes the log file for {@code log}.
+ *
+ * @param this_ The log object.
+ */
 static void
 log_close(struct log *this_)
 {
@@ -143,6 +206,31 @@
 	this_->f=NULL;
 }
 
+/** 
+ * @brief Flushes the buffer of a log.
+ *
+ * This function writes buffered log data to the log file associated with {@code log}
+ * and updates {@code log->last_flush} with the current time.
+ * <p>
+ * If {@code log->lazy} is true, this function will open the file if needed, else
+ * the file must be opened with {@code log_open()} prior to calling this function.
+ * <p>
+ * If the file is empty, the header will be written first, followed by the buffer data.
+ * {@code log->empty} will be set to zero if header or data are written to the file.
+ *
+ * @param this_ The log object.
+ * @param flags Flags to control behavior of the function:
+ * <br>
+ * {@code log_flag_replace_buffer}: ignored
+ * <br>
+ * {@code log_flag_force_flush}: ignored
+ * <br>
+ * {@code log_flag_keep_pointer}: keeps the file pointer at the start position of the new data
+ * <br>
+ * {@code log_flag_keep_buffer}: prevents clearing of the buffer after a successful write (default is to clear the buffer).
+ * <br>
+ * {@code log_flag_truncate}: truncates the log file at the current position. On the Win32 Base API, this flag has no effect.
+ */
 static void
 log_flush(struct log *this_, enum log_flags flags)
 {
@@ -185,13 +273,39 @@
 	log_set_last_flush(this_);
 }
 
+/** 
+ * @brief Determines if the maximum buffer size of a log has been exceeded.
+ *
+ * This function examines the size of the data buffer to determine if it exceeds
+ * the maximum size specified in {@code log->flush_size} and thus needs to be flushed.
+ *
+ * @param this_ The log object.
+ * @return True if the cache needs to be flushed, false otherwise.
+ */
 static int
 log_flush_required(struct log *this_)
 {
 	return this_->data.len > this_->flush_size;
 }
 
-
+/** 
+ * @brief Rotates a log file.
+ *
+ * This function rotates a log by stopping and immediately restarting it.
+ * Stopping flushes the buffer and closes the file; restarting determines the
+ * new file name and opens the file as needed (depending on the lazy member).
+ * <p>
+ * Depending on the file name format and how the function was called, a new log
+ * file will be created or the old log file will be reused (appended to or
+ * overwritten, depending on {@code log->overwrite}): if the file name includes an
+ * incremental number, the new file will always have a different name. If a
+ * previous call to {@code log_change_required()} returned true, the new file
+ * will also have a different name. In all other cases the new file will have
+ * the same name as the old one, causing the old file to be overwritten or
+ * appended to.
+ *
+ * @param this_ The log object.
+ */
 static void
 log_change(struct log *this_)
 {
@@ -202,6 +316,15 @@
 		log_open(this_);
 }
 
+/** 
+ * @brief Determines if the log must be rotated.
+ *
+ * This function expands the date and time placeholders in {@code log->filename}
+ * to determine if the resulting part of the filename has changed.
+ *
+ * @param this_ The log object.
+ * @return True if the date/time-dependent part of the filename has changed, false otherwise.
+ */
 static int
 log_change_required(struct log *this_)
 {
@@ -211,6 +334,14 @@
 	return (strcmp(this_->filename_ex1, buffer) != 0);
 }
 
+/** 
+ * @brief Determines if the flush interval of a log has elapsed and flushes the buffer if needed.
+ *
+ * This function calculates the difference between current time and {@code log->last_flush}.
+ * If it is greater than or equal to {@code log->flush_time}, the buffer is flushed.
+ *
+ * @param this_ The log object.
+ */
 static void
 log_timer(struct log *this_)
 {
@@ -225,6 +356,15 @@
 #endif
 }
 
+/** 
+ * @brief Gets an attribute
+ *
+ * @param this_ The log object.
+ * @param attr_type The attribute type to return
+ * @param attr Points to a struct attr to store the attribute
+ * @param iter An attribute iterator
+ * @return True for success, false for failure
+ */
 int
 log_get_attr(struct log *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter)
 {
@@ -232,6 +372,13 @@
 }
 
 
+/** 
+ * @brief Creates and initializes a new log object.
+ *
+ * @param parent The parent object.
+ * @param attrs Points to an array of pointers to attributes for the new log object
+ * @return The new log object, or NULL if creation fails.
+ */
 struct log *
 log_new(struct attr * parent,struct attr **attrs)
 {
@@ -285,6 +432,16 @@
 	return ret;
 }
 
+/** 
+ * @brief Sets the header for a log file.
+ *
+ * This function sets the header, which is to be inserted into any log file before
+ * the actual log data.
+ *
+ * @param this_ The log object.
+ * @param data The header data.
+ * @param len Size of the header data to be copied, in bytes.
+ */
 void
 log_set_header(struct log *this_, char *data, int len)
 {
@@ -293,6 +450,16 @@
 	memcpy(this_->header.data, data, len);
 }
 
+/** 
+ * @brief Sets the trailer for a log file.
+ *
+ * This function sets the trailer, which is to be added to any log file after
+ * the actual log data.
+ *
+ * @param this_ The log object.
+ * @param data The trailer data.
+ * @param len Size of the trailer data to be copied, in bytes.
+ */
 void
 log_set_trailer(struct log *this_, char *data, int len)
 {
@@ -301,6 +468,28 @@
 	memcpy(this_->trailer.data, data, len);
 }
 
+/** 
+ * @brief Writes to a log.
+ *
+ * This function appends data to a log. It rotates the log, if needed, before 
+ * adding the new data. After adding, the log is flushed if the buffer exceeds
+ * its maximum size or if the {@code log_flag_force_flush} flag is set.
+ *
+ * @param this_ The log object.
+ * @param data Points to a buffer containing the data to be appended.
+ * @param len Length of the data to be appended, in bytes.
+ * @param flags Flags to control behavior of the function:
+ * <br>
+ * {@code log_flag_replace_buffer}: discards any data in the buffer not yet written to the log file
+ * <br>
+ * {@code log_flag_force_flush}: forces a flush of the log after appending the data
+ * <br>
+ * {code log_flag_keep_pointer}: ignored
+ * <br>
+ * {@code log_flag_keep_buffer}: ignored
+ * <br>
+ * {@code log_flag_truncate}: ignored
+ */
 void
 log_write(struct log *this_, char *data, int len, enum log_flags flags)
 {
@@ -313,7 +502,7 @@
 		this_->data.len=0;
 	if (this_->data.len + len > this_->data.max_len) {
 		dbg(2,"overflow\n");
-		this_->data.max_len+=16384;
+		this_->data.max_len+=16384; // FIXME: what if len exceeds this->data.max_len by more than 16384 bytes?
 		this_->data.data=g_realloc(this_->data.data,this_->data.max_len);
 	}
 	memcpy(this_->data.data+this_->data.len, data, len);
@@ -322,6 +511,14 @@
 		log_flush(this_, flags);
 }
 
+/** 
+ * @brief Returns the data buffer of a log object and its length.
+ *
+ * @param this_ The log object.
+ * @param len Points to an int which will receive the length of the buffer.
+ * This can be NULL, in which case no information on buffer length will be stored.
+ * @return Pointer to the data buffer.
+ */
 void *
 log_get_buffer(struct log *this_, int *len)
 {
@@ -331,6 +528,16 @@
 }
 
 
+/** 
+ * @brief Writes a formatted string to a log.
+ *
+ * This function formats a string in a fashion similar to {@code printf()} and related functions
+ * and writes it to a log using {@code log_write()}.
+ *
+ * @param this_ The log object.
+ * @param fmt The format string.
+ * @param ... Additional arguments must be specified for each placeholder in the format string.
+ */
 void
 log_printf(struct log *this_, char *fmt, ...)
 {
@@ -347,6 +554,11 @@
 	va_end(ap);
 }
 
+/** 
+ * @brief Destroys a log object and frees up its memory.
+ *
+ * @param this_ The log object.
+ */
 void
 log_destroy(struct log *this_)
 {

Modified: trunk/navit/navit/osd/core/osd_core.c
===================================================================
--- trunk/navit/navit/osd/core/osd_core.c	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/osd/core/osd_core.c	2014-11-15 16:50:21 UTC (rev 5948)
@@ -2516,13 +2516,14 @@
 
 
 /**
- * @brief Format a text attribute
+ * @brief Formats a text attribute
  *
  * Returns the formatted current value of an attribute as a string
  * 
- * @param attr Pointer to an attr structure specifying the attribute to be formatted
- * @param format Pointer to a string specifying how to format the attribute. Allowed format strings depend on the attribute; this member can be NULL.
- * @returns Pointer to a string containing the formatted value
+ * @param attr The attribute to be formatted
+ * @param format A string specifying how to format the attribute. Allowed format strings depend on the attribute; this member can be NULL.
+ * @param imperial True to convert values to imperial, false to return metric values
+ * @returns The formatted value
  */
 static char *
 osd_text_format_attr(struct attr *attr, char *format, int imperial)
@@ -2675,11 +2676,17 @@
 }
 
 /**
- * Parse a string of the form key.subkey or key[index].subkey into its components, where subkey can itself have its own index and further subkeys
+ * @brief Parses a string of the form key.subkey or key[index].subkey into its components, where subkey
+ * can itself have its own index and further subkeys
  *
- * @param in String to parse (the part before subkey will be modified by the function); upon returning this pointer will point to a string containing key
- * @param index Pointer to an address that will receive a pointer to a string containing index or a null pointer if key does not have an index
- * @returns If the function succeeds, a pointer to a string containing subkey, i.e. everything following the first period, or a pointer to an empty string if there is nothing left to parse. If the function fails(index with missing closed bracket or passing a null pointer as index argument when an index was encountered), the return value is NULL
+ * @param in String to parse (the part before subkey will be modified by the function); upon returning
+ * this pointer will point to a string containing key
+ * @param index Pointer to an address that will receive a pointer to a string containing index or NULL
+ * if key does not have an index
+ * @returns If the function succeeds, a pointer to a string containing subkey, i.e. everything following
+ * the first period, or a pointer to an empty string if there is nothing left to parse. If the function
+ * fails (index with missing closed bracket or passing a null pointer as index argument when an index
+ * was encountered), the return value is NULL
  */
 static char *
 osd_text_split(char *in, char **index)
@@ -2944,10 +2951,11 @@
 }
 
 /**
- * @brief Create a new osd_text_item and insert it into a linked list
+ * @brief Creates a new osd_text_item and inserts it into a linked list
  * 
- * @param parent Pointer to the preceding osd_text_item structure in the list. If NULL, the new osd_text_item becomes the root element of a new list.
- * @returns A pointer to the new osd_text_item element.
+ * @param parent The preceding {@code osd_text_item} in the list. If NULL, the new item becomes the root
+ * element of a new list
+ * @returns The new {@code osd_text_item}
  */
 static struct osd_text_item *
 oti_new(struct osd_text_item * parent)
@@ -2967,13 +2975,14 @@
 }
 
 /**
- * @brief Prepare a text type OSD element
+ * @brief Prepares a text type OSD element
  *
- * Parses the label string (as specified in the XML file) for a text type OSD element into attributes and static text. 
+ * This function parses the label string (as specified in the XML file) for a text type OSD element
+ * into attributes and static text.
  * 
- * @param this Pointer to an osd_text structure representing the OSD element. The items member of this structure will receive a pointer to a list of osd_text_item structures.
- * @param nav Pointer to a navit structure
- * @returns nothing
+ * @param opc The {@code struct osd_priv_common} for the OSD element. {@code opc->data->items} will
+ * receive a pointer to a list of {@code osd_text_item} structures.
+ * @param nav The navit structure
  */
 static void
 osd_text_prepare(struct osd_priv_common *opc, struct navit *nav)

Modified: trunk/navit/navit/util.c
===================================================================
--- trunk/navit/navit/util.c	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/util.c	2014-11-15 16:50:21 UTC (rev 5948)
@@ -184,17 +184,15 @@
 
 #ifndef HAVE_GETDELIM
 /**
- * Read the part of a file up to a delimiter to a string.
+ * @brief Reads the part of a file up to a delimiter to a string.
  * <p> 
- * Read up to (and including) a DELIMITER from FP into *LINEPTR (and
-   NUL-terminate it).  
- * @param lineptr Pointer to a pointer returned from malloc (or
-   NULL), pointing to a buffer. It is realloc'ed as
-   necessary and will receive the data read.
+ * Read up to (and including) a DELIMITER from FP into *LINEPTR (and NUL-terminate it).
+ *
+ * @param lineptr Pointer to a pointer returned from malloc (or NULL), pointing to a buffer. It is
+ * realloc'ed as necessary and will receive the data read.
  * @param n Size of the buffer.  
  *
- * @return Number of characters read (not including
-   the null terminator), or -1 on error or EOF.
+ * @return Number of characters read (not including the null terminator), or -1 on error or EOF.
 */
 ssize_t
 getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
@@ -312,11 +310,11 @@
 }
 #endif
 /**
- * Convert an ISO 8601-style time string into epoch time.
+ * @brief Converts an ISO 8601-style time string into epoch time.
  *
- * @param iso8601 Pointer to a string containing the time in ISO 8601 format.
+ * @param iso8601 Time in ISO 8601 format.
  *
- * @return An unsigned integer representing the number of seconds elapsed since January 1, 1970, 00:00:00 UTC.
+ * @return The number of seconds elapsed since January 1, 1970, 00:00:00 UTC.
  */
 unsigned int
 iso8601_to_secs(char *iso8601)
@@ -347,9 +345,9 @@
 }
 
 /**
- * Output local system time in ISO 8601 format.
+ * @brief Outputs local system time in ISO 8601 format.
  *
- * @return Pointer to a string containing the time in ISO 8601 format
+ * @return Time in ISO 8601 format
  */
 char *
 current_to_iso8601(void)

Modified: trunk/navit/navit/vehicle/android/vehicle_android.c
===================================================================
--- trunk/navit/navit/vehicle/android/vehicle_android.c	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/vehicle/android/vehicle_android.c	2014-11-15 16:50:21 UTC (rev 5948)
@@ -59,7 +59,7 @@
 /**
  * @brief Free the android_vehicle
  * 
- * @param priv
+ * @param priv vehicle_priv structure for the vehicle
  * @returns nothing
  */
 static void
@@ -70,12 +70,12 @@
 }
 
 /**
- * @brief Provide the outside with information
- * 
- * @param priv
- * @param type TODO: What can this be?
- * @param attr
- * @returns true/false
+ * @brief Retrieves a vehicle attribute.
+ *
+ * @param priv vehicle_priv structure for the vehicle
+ * @param type The attribute type to retrieve
+ * @param attr Points to an attr structure that will receive the attribute data
+ * @returns True for success, false for failure
  */
 static int
 vehicle_android_position_attr_get(struct vehicle_priv *priv,

Modified: trunk/navit/navit/vehicle/wince/vehicle_wince.c
===================================================================
--- trunk/navit/navit/vehicle/wince/vehicle_wince.c	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/vehicle/wince/vehicle_wince.c	2014-11-15 16:50:21 UTC (rev 5948)
@@ -710,6 +710,11 @@
 }
 
 
+/**
+ * @brief Frees the wince_vehicle
+ * 
+ * @param priv vehicle_priv structure for the vehicle
+ */
 static void
 vehicle_wince_destroy(struct vehicle_priv *priv)
 {
@@ -729,6 +734,14 @@
 	g_free(priv);
 }
 
+/**
+ * @brief Retrieves a vehicle attribute.
+ *
+ * @param priv vehicle_priv structure for the vehicle
+ * @param type The attribute type to retrieve
+ * @param attr Points to an attr structure that will receive the attribute data
+ * @returns True for success, false for failure
+ */
 static int
 vehicle_wince_position_attr_get(struct vehicle_priv *priv,
 			       enum attr_type type, struct attr *attr)
@@ -846,6 +859,14 @@
 	NULL,
 };
 
+/**
+ * @brief Creates a new wince_vehicle
+ * 
+ * @param meth
+ * @param cbl
+ * @param attrs
+ * @returns vehicle_priv
+ */
 static struct vehicle_priv *
 vehicle_wince_new(struct vehicle_methods
 		      *meth, struct callback_list
@@ -921,6 +942,9 @@
 	return NULL;
 }
 
+/**
+ * @brief Registers the vehicle_wince plugin
+ */
 void
 plugin_init(void)
 {

Modified: trunk/navit/navit/vehicle.c
===================================================================
--- trunk/navit/navit/vehicle.c	2014-11-14 22:12:58 UTC (rev 5947)
+++ trunk/navit/navit/vehicle.c	2014-11-15 16:50:21 UTC (rev 5948)
@@ -1,4 +1,4 @@
-/**
+/*
  * Navit, a modular navigation system.
  * Copyright (C) 2005-2009 Navit Team
  *
@@ -16,6 +16,16 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301, USA.
  */
+ 
+/** @file vehicle.c
+ * @brief Generic components of the vehicle object.
+ * 
+ * This file implements the generic vehicle interface, i.e. everything which is
+ * not specific to a single data source.
+ *
+ * @author Navit Team
+ * @date 2005-2014
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -78,7 +88,13 @@
 
 
 /**
- * Creates a new vehicle
+ * @brief Creates a new vehicle
+ *
+ * @param parent
+ * @param attrs Points to a null-terminated array of pointers to the attributes
+ * for the new vehicle type.
+ *
+ * @return The newly created vehicle object
  */
 struct vehicle *
 vehicle_new(struct attr *parent, struct attr **attrs)
@@ -138,7 +154,7 @@
 }
 
 /**
- * Destroys a vehicle
+ * @brief Destroys a vehicle
  * 
  * @param this_ The vehicle to destroy
  */
@@ -188,8 +204,9 @@
  *
  * @param this_ Pointer to a vehicle structure
  * @param type The attribute type to look for
- * @param attr Pointer to an attr structure to store the attribute
+ * @param attr Pointer to a {@code struct attr} to store the attribute
  * @param iter A vehicle attr_iter
+ * @return True for success, false for failure
  */
 int
 vehicle_get_attr(struct vehicle *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter)
@@ -210,9 +227,9 @@
 /**
  * Generic set function
  *
- * @param this_ Pointer to a vehicle structure
- * @param attr Pointer to an attr structure for the attribute to be set
- * @return nonzero on success, zero on failure
+ * @param this_ A vehicle
+ * @param attr The attribute to set
+ * @return False on success, true on failure
  */
 int
 vehicle_set_attr(struct vehicle *this_, struct attr *attr)
@@ -237,7 +254,9 @@
  * Generic add function
  *
  * @param this_ A vehicle
- * @param attr A struct attr
+ * @param attr The attribute to add
+ *
+ * @return true if the attribute was added, false if not.
  */
 int
 vehicle_add_attr(struct vehicle *this_, struct attr *attr)
@@ -452,10 +471,10 @@
 }
 
 /**
- * Writes to an NMEA log.
+ * @brief Writes to an NMEA log.
  *
- * @param this_ Pointer to the vehicle structure of the data source
- * @param log Pointer to a log structure for the log file
+ * @param this_ The vehicle supplying data
+ * @param log The log to write to
  */
 static void
 vehicle_log_nmea(struct vehicle *this_, struct log *log)
@@ -468,6 +487,15 @@
 	log_write(log, pos_attr.u.str, strlen(pos_attr.u.str), 0);
 }
 
+/**
+ * Add a tag to the extensions section of a GPX trackpoint.
+ *
+ * @param tag The tag to add
+ * @param logstr Pointer to a pointer to a string to be inserted into the log.
+ * When calling this function, {@code *logstr} must point to the substring into which the new tag is
+ * to be inserted. If {@code *logstr} is NULL, a new string will be created for the extensions section.
+ * Upon returning, {@code *logstr} will point to the new string with the additional tag inserted.
+ */
 void
 vehicle_log_gpx_add_tag(char *tag, char **logstr)
 {
@@ -502,10 +530,10 @@
 }
 
 /**
- * Writes to a GPX log.
+ * @brief Writes a trackpoint to a GPX log.
  *
- * @param this_ Pointer to the vehicle structure of the data source
- * @param log Pointer to a log structure for the log file
+ * @param this_ The vehicle supplying data
+ * @param log The log to write to
  */
 static void
 vehicle_log_gpx(struct vehicle *this_, struct log *log)
@@ -580,10 +608,10 @@
 }
 
 /**
- * Writes to a text log.
+ * @brief Writes to a text log.
  *
- * @param this_ Pointer to the vehicle structure of the data source
- * @param log Pointer to a log structure for the log file
+ * @param this_ The vehicle supplying data
+ * @param log The log to write to
  */
 static void
 vehicle_log_textfile(struct vehicle *this_, struct log *log)
@@ -604,10 +632,10 @@
 }
 
 /**
- * Writes to a binary log.
+ * @brief Writes to a binary log.
  *
- * @param this_ Pointer to the vehicle structure of the data source
- * @param log Pointer to a log structure for the log file
+ * @param this_ The vehicle supplying data
+ * @param log The log to write to
  */
 static void
 vehicle_log_binfile(struct vehicle *this_, struct log *log)
@@ -664,10 +692,12 @@
 }
 
 /**
- * Register a new log to receive data.
+ * @brief Registers a new log to receive data.
  *
- * @param this_ Pointer to the vehicle structure of the data source
- * @param log Pointer to a log structure for the log file
+ * @param this_ The vehicle supplying data
+ * @param log The log to write to
+ *
+ * @return False if the log is of an unknown type, true otherwise (including when {@code attr_type} is missing).
  */
 static int
 vehicle_add_log(struct vehicle *this_, struct log *log)

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:[5947] trunk/navit/navit/binding/dbus/binding_dbus.c

[<mvg...@us...>]

Revision: 5947
          http://sourceforge.net/p/navit/code/5947
Author:   mvglasow
Date:     2014-11-14 22:12:58 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Refactoring:dbus:Removed unneeded local variable

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/binding/dbus/binding_dbus.c

Modified: trunk/navit/navit/binding/dbus/binding_dbus.c
===================================================================
--- trunk/navit/navit/binding/dbus/binding_dbus.c	2014-11-14 20:26:38 UTC (rev 5946)
+++ trunk/navit/navit/binding/dbus/binding_dbus.c	2014-11-14 22:12:58 UTC (rev 5947)
@@ -1319,7 +1319,7 @@
 	struct navigation * nav = NULL;
 	struct map_rect * mr=NULL;
 	struct item *item = NULL;
-	struct attr attr,attr2,route;
+	struct attr attr,route;
 	struct coord c;
 	struct coord_geo g;
 	struct transformation *trans;

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:[5946] trunk/navit/po/ru.po.in

[<md...@us...>]

Revision: 5946
          http://sourceforge.net/p/navit/code/5946
Author:   mdankov
Date:     2014-11-14 20:26:38 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Fix:Core:Typo in ru

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

Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in	2014-11-14 20:18:56 UTC (rev 5945)
+++ trunk/navit/po/ru.po.in	2014-11-14 20:26:38 UTC (rev 5946)
@@ -142,7 +142,7 @@
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "чер е%d милю"
+msgstr[0] "через %d милю"
 msgstr[1] "через %d мили"
 msgstr[2] "через %d миль"
 

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:[5945] trunk/navit/po/ru.po.in

[<ka...@us...>]

Revision: 5945
          http://sourceforge.net/p/navit/code/5945
Author:   kazer_
Date:     2014-11-14 20:18:56 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Fix:Core:Fixed typo in ru|Thanks tryagain

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

Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in	2014-11-14 20:17:53 UTC (rev 5944)
+++ trunk/navit/po/ru.po.in	2014-11-14 20:18:56 UTC (rev 5945)
@@ -142,7 +142,7 @@
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "чере%d милю"
+msgstr[0] "чер е%d милю"
 msgstr[1] "через %d мили"
 msgstr[2] "через %d миль"
 

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:[5944] trunk/navit/po/hi.po.in

[<ka...@us...>]

Revision: 5944
          http://sourceforge.net/p/navit/code/5944
Author:   kazer_
Date:     2014-11-14 20:17:53 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Fix:Core:Another attempt to fix hi plurals

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

Modified: trunk/navit/po/hi.po.in
===================================================================
--- trunk/navit/po/hi.po.in	2014-11-14 09:57:46 UTC (rev 5943)
+++ trunk/navit/po/hi.po.in	2014-11-14 20:17:53 UTC (rev 5944)
@@ -125,13 +125,13 @@
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "ek kilometer"
-msgstr[1] "kai kilometero"
+msgstr[1] "%d kilometero"
 
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "ek kilometer mein"
-msgstr[1] "kai kilometero mein"
+msgstr[1] "%d kilometero mein"
 
 msgid "exit"
 msgstr "nikas"

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:[5943] trunk/navit/po/be.po.in

[<ka...@us...>]

Revision: 5943
          http://sourceforge.net/p/navit/code/5943
Author:   kazer_
Date:     2014-11-14 09:57:46 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Fix:Core:Another attempt to fix be plurals

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

Modified: trunk/navit/po/be.po.in
===================================================================
--- trunk/navit/po/be.po.in	2014-11-14 09:56:11 UTC (rev 5942)
+++ trunk/navit/po/be.po.in	2014-11-14 09:57:46 UTC (rev 5943)
@@ -124,8 +124,9 @@
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] "адзін кіламетр"
+msgstr[0] "%d кіламетр"
 msgstr[1] "%d кіламетраў"
+msgstr[2] "%d кіламетраў"
 
 #, c-format
 msgid "in one kilometer"

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:[5942] trunk/navit/po/lv.po.in

[<ka...@us...>]

Revision: 5942
          http://sourceforge.net/p/navit/code/5942
Author:   kazer_
Date:     2014-11-14 09:56:11 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Fix:Core:Another attempt to fix lv plurals

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

Modified: trunk/navit/po/lv.po.in
===================================================================
--- trunk/navit/po/lv.po.in	2014-11-14 09:47:27 UTC (rev 5941)
+++ trunk/navit/po/lv.po.in	2014-11-14 09:56:11 UTC (rev 5942)
@@ -115,21 +115,21 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "viena jūdze"
+msgstr[0] "%d jūdze"
 msgstr[1] "%d jūdzes"
 msgstr[2] "%d jūdzes"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "pēc vienas jūdzes"
+msgstr[0] "pēc %d jūdzes"
 msgstr[1] "pēc %d jūdzēm"
 msgstr[2] "pēc %d jūdzēm"
 
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] "kilometru"
+msgstr[0] "%d kilometru"
 msgstr[1] "%d kilometrus"
 msgstr[2] "%d kilometri"
 

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:[5941] trunk/navit/po

[<ka...@us...>]

Revision: 5941
          http://sourceforge.net/p/navit/code/5941
Author:   kazer_
Date:     2014-11-14 09:47:27 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Fix:Core:Another attempt to fix ru and sk plurals

Modified Paths:
--------------
    trunk/navit/po/ru.po.in
    trunk/navit/po/sk.po.in

Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in	2014-11-14 09:41:38 UTC (rev 5940)
+++ trunk/navit/po/ru.po.in	2014-11-14 09:47:27 UTC (rev 5941)
@@ -38,7 +38,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"Language: \n"
+"Language: ru\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -135,14 +135,14 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "одна миля"
+msgstr[0] "%d миля"
 msgstr[1] "%d мили"
 msgstr[2] "%d миль"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "через одну милю"
+msgstr[0] "чере%d милю"
 msgstr[1] "через %d мили"
 msgstr[2] "через %d миль"
 

Modified: trunk/navit/po/sk.po.in
===================================================================
--- trunk/navit/po/sk.po.in	2014-11-14 09:41:38 UTC (rev 5940)
+++ trunk/navit/po/sk.po.in	2014-11-14 09:47:27 UTC (rev 5941)
@@ -23,7 +23,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"Language: \n"
+"Language: sk\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -120,14 +120,14 @@
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "jedna míľa"
+msgstr[0] "%d míľa"
 msgstr[1] "%d míle"
 msgstr[2] "%d míľ"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "o jednu míľu"
+msgstr[0] "o %d míľu"
 msgstr[1] "o %d míle"
 msgstr[2] "o %d míľ"
 

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:[5940] trunk/navit/po

[<ka...@us...>]

Revision: 5940
          http://sourceforge.net/p/navit/code/5940
Author:   kazer_
Date:     2014-11-14 09:41:38 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Update:Core:massive translation update from launchpad to add new strings, fixed some headers

Modified Paths:
--------------
    trunk/navit/po/af.po.in
    trunk/navit/po/ar.po.in
    trunk/navit/po/ast.po.in
    trunk/navit/po/be.po.in
    trunk/navit/po/bg.po.in
    trunk/navit/po/bs.po.in
    trunk/navit/po/ca.po.in
    trunk/navit/po/ckb.po.in
    trunk/navit/po/cs.po.in
    trunk/navit/po/cy.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_CA.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/fa.po.in
    trunk/navit/po/fi.po.in
    trunk/navit/po/fil.po.in
    trunk/navit/po/fo.po.in
    trunk/navit/po/fr_CH.po.in
    trunk/navit/po/fy.po.in
    trunk/navit/po/gl.po.in
    trunk/navit/po/he.po.in
    trunk/navit/po/hi.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/kn.po.in
    trunk/navit/po/ku.po.in
    trunk/navit/po/lb.po.in
    trunk/navit/po/lt.po.in
    trunk/navit/po/lv.po.in
    trunk/navit/po/mk.po.in
    trunk/navit/po/mr.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/pms.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/sc.po.in
    trunk/navit/po/si.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/sw.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/po/af.po.in
===================================================================
--- trunk/navit/po/af.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/af.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -13,7 +13,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Afrikaans <af...@li...>\n"
@@ -21,6 +20,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: af\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1454,6 +1454,12 @@
 msgid "Opens address search dialog"
 msgstr "Toon adres soek skerm"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Stop Navigasie"
 
@@ -1496,6 +1502,100 @@
 msgid "Data"
 msgstr "Data"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/ar.po.in
===================================================================
--- trunk/navit/po/ar.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/ar.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -11,7 +11,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-11-10 01:24+0000\n"
 "Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Arabic <ar...@li...>\n"
@@ -20,6 +19,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
+"Language: ar\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1469,6 +1469,12 @@
 msgid "Opens address search dialog"
 msgstr "إفتح حوار البحث عن عنوان"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "قف الملاحة"
 
@@ -1511,6 +1517,100 @@
 msgid "Data"
 msgstr "المعطيات"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "ش."
 

Modified: trunk/navit/po/ast.po.in
===================================================================
--- trunk/navit/po/ast.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/ast.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -8,7 +8,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: Xuacu Saturio <xua...@gm...>\n"
 "Language-Team: Asturian <as...@li...>\n"
@@ -16,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: ast\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1449,6 +1449,12 @@
 msgid "Opens address search dialog"
 msgstr "Abre'l diálogu de guetar direición"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Parar navegación"
 
@@ -1491,6 +1497,100 @@
 msgid "Data"
 msgstr "Datos"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/be.po.in
===================================================================
--- trunk/navit/po/be.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/be.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -6,9 +6,8 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2011-10-11 19:19+0000\n"
 "Last-Translator: Anatoli Putseyeu <Unknown>\n"
 "Language-Team: Belarusian <be...@li...>\n"
@@ -17,6 +16,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: be\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -124,8 +124,8 @@
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "адзін кіламетр"
+msgstr[1] "%d кіламетраў"
 
 #, c-format
 msgid "in one kilometer"
@@ -1449,6 +1449,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1491,6 +1497,100 @@
 msgid "Data"
 msgstr "Дадзеныя"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/bg.po.in
===================================================================
--- trunk/navit/po/bg.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/bg.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -12,7 +12,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:39+0000\n"
 "Last-Translator: Alex Stanev <al...@st...>\n"
 "Language-Team: Bulgarian <bg...@li...>\n"
@@ -1454,6 +1453,12 @@
 msgid "Opens address search dialog"
 msgstr "Отваря прозорец Търсене на адрес"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Спри Навигацията"
 
@@ -1496,6 +1501,100 @@
 msgid "Data"
 msgstr "Данни"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "С"
 

Modified: trunk/navit/po/bs.po.in
===================================================================
--- trunk/navit/po/bs.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/bs.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -9,7 +9,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2014-08-08 23:15+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Bosnian <bs...@li...>\n"
@@ -1453,6 +1452,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1495,6 +1500,100 @@
 msgid "Data"
 msgstr ""
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr ""
 

Modified: trunk/navit/po/ca.po.in
===================================================================
--- trunk/navit/po/ca.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/ca.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -18,7 +18,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2014-07-09 18:11+0000\n"
 "Last-Translator: Sergi Gomis <pa...@gm...>\n"
 "Language-Team: Catalan <ca...@li...>\n"
@@ -26,6 +25,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: ca\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1459,6 +1459,12 @@
 msgid "Opens address search dialog"
 msgstr "Obre el diàleg de cercar adreces"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Atura la navegació"
 
@@ -1501,6 +1507,100 @@
 msgid "Data"
 msgstr "Dades"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/ckb.po.in
===================================================================
--- trunk/navit/po/ckb.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/ckb.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -6,9 +6,8 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-06-22 23:00+0000\n"
 "Last-Translator: kosar <kos...@gm...>\n"
 "Language-Team: Kurdish (Sorani) <ck...@li...>\n"
@@ -16,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -1448,6 +1448,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1490,6 +1496,100 @@
 msgid "Data"
 msgstr ""
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr ""
 

Modified: trunk/navit/po/cs.po.in
===================================================================
--- trunk/navit/po/cs.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/cs.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -1,4 +1,4 @@
-# # translation of navit_cs.po to Čeština translations for navit
+# Čeština translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -19,7 +19,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-12-09 13:46+0000\n"
 "Last-Translator: MMlosh <Unknown>\n"
 "Language-Team: Čeština\n"
@@ -1474,6 +1473,12 @@
 msgid "Opens address search dialog"
 msgstr "Otevře vyhledávání adres"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Přestat navigovat"
 
@@ -1516,6 +1521,100 @@
 msgid "Data"
 msgstr "Data"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "S"
 

Modified: trunk/navit/po/cy.po.in
===================================================================
--- trunk/navit/po/cy.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/cy.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -8,7 +8,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2014-08-08 23:15+0000\n"
 "Last-Translator: Simon Hewison <sim...@zy...>\n"
 "Language-Team: Welsh <cy...@li...>\n"
@@ -1452,6 +1451,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1494,6 +1499,100 @@
 msgid "Data"
 msgstr ""
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr ""
 

Modified: trunk/navit/po/da.po.in
===================================================================
--- trunk/navit/po/da.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/da.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -1,4 +1,4 @@
-# # Danish translation for Navit translations for navit
+# Danish translation for Navit translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -16,7 +16,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\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"
@@ -24,6 +23,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1457,6 +1457,12 @@
 msgid "Opens address search dialog"
 msgstr "Åbner adressesøgning"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Stop Navigation"
 
@@ -1499,6 +1505,100 @@
 msgid "Data"
 msgstr "Data"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/de.po.in
===================================================================
--- trunk/navit/po/de.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/de.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -37,7 +37,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2014-09-12 20:49+0000\n"
 "Last-Translator: Artem Anufrij <Unknown>\n"
 "Language-Team: Martin Schaller <mar...@so...>\n"
@@ -45,6 +44,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1492,6 +1492,12 @@
 msgid "Opens address search dialog"
 msgstr "Öffnet Adresssuche-Dialog"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Navigation be_enden"
 
@@ -1535,6 +1541,100 @@
 msgid "Data"
 msgstr "Daten"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/de_CH.po.in
===================================================================
--- trunk/navit/po/de_CH.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/de_CH.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -7,7 +7,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2010-05-18 08:49+0000\n"
 "Last-Translator: \n"
 "Language-Team: German (Switzerland) <de...@li...>\n"
@@ -1449,6 +1448,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1491,6 +1496,100 @@
 msgid "Data"
 msgstr ""
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr ""
 

Modified: trunk/navit/po/el.po.in
===================================================================
--- trunk/navit/po/el.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/el.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -13,7 +13,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:41+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Greek <el...@li...>\n"
@@ -21,6 +20,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: el\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1454,6 +1454,12 @@
 msgid "Opens address search dialog"
 msgstr "Ανοιγμα διαλόγου αναζήτησης διεύθυνσης"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Διακοπή πλοήγησης"
 
@@ -1496,6 +1502,100 @@
 msgid "Data"
 msgstr "Δεδομένα"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "Β"
 

Modified: trunk/navit/po/en_AU.po.in
===================================================================
--- trunk/navit/po/en_AU.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/en_AU.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -9,7 +9,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:41+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: English (Australia) <en...@li...>\n"
@@ -17,6 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1450,6 +1450,12 @@
 msgid "Opens address search dialog"
 msgstr "Opens address search dialogue"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Stop Navigation"
 
@@ -1492,6 +1498,100 @@
 msgid "Data"
 msgstr "Data"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/en_CA.po.in
===================================================================
--- trunk/navit/po/en_CA.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/en_CA.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -6,9 +6,8 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2012-11-20 02:05+0000\n"
 "Last-Translator: Frank Bax <fr...@ba...>\n"
 "Language-Team: English (Canada) <en...@li...>\n"
@@ -16,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 
 msgid "Running from source directory\n"
 msgstr "Running from source directory\n"
@@ -1448,6 +1448,12 @@
 msgid "Opens address search dialog"
 msgstr "Opens address search dialog"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1490,6 +1496,100 @@
 msgid "Data"
 msgstr "Data"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/en_GB.po.in
===================================================================
--- trunk/navit/po/en_GB.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/en_GB.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -15,14 +15,14 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
-"PO-Revision-Date: 2014-09-23 23:26+0000\n"
+"PO-Revision-Date: 2014-11-12 10:10+0000\n"
 "Last-Translator: Andi Chandler <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"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1464,6 +1464,12 @@
 msgid "Opens address search dialog"
 msgstr "Opens address search dialogue"
 
+msgid "_POI search"
+msgstr "_POI search"
+
+msgid "Opens POI search dialog"
+msgstr "Opens POI search dialogue"
+
 msgid "_Stop Navigation"
 msgstr "Stop navigation"
 
@@ -1506,6 +1512,100 @@
 msgid "Data"
 msgstr "Data"
 
+msgid "Pharmacy"
+msgstr "Pharmacy"
+
+msgid "Restaurant"
+msgstr "Restaurant"
+
+msgid "Restaurant. Fast food"
+msgstr "Restaurant. Fast food"
+
+msgid "Hotel"
+msgstr "Hotel"
+
+msgid "Car parking"
+msgstr "Car parking"
+
+msgid "Fuel station"
+msgstr "Fuel station"
+
+msgid "Bank"
+msgstr "Bank"
+
+msgid "Hospital"
+msgstr "Hospital"
+
+msgid "Cinema"
+msgstr "Cinema"
+
+msgid "Train station"
+msgstr "Railway station"
+
+msgid "School"
+msgstr "School"
+
+msgid "Police"
+msgstr "Police"
+
+msgid "Justice"
+msgstr "Justice"
+
+msgid "Taxi"
+msgstr "Taxi"
+
+msgid "Shopping"
+msgstr "Shopping"
+
+msgid "Distance from screen center (km)"
+msgstr "Distance from screen centre (km)"
+
+#, c-format
+msgid "POI %s. %s"
+msgstr "POI %s. %s"
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr "Set destination to %ld, %ld \n"
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr "Set map to %ld, %ld \n"
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr "Set next visit to %ld, %ld \n"
+
+msgid "POI search"
+msgstr "POI search"
+
+msgid "Select a category"
+msgstr "Select a category"
+
+msgid "Select a distance to look for (km)"
+msgstr "Select a distance to look for (km)"
+
+msgid "Select a POI"
+msgstr "Select a POI"
+
+msgid " "
+msgstr " "
+
+msgid "Category"
+msgstr "Category"
+
+msgid "Direction"
+msgstr "Direction"
+
+msgid "Distance(m)"
+msgstr "Distance(m)"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Visit Before"
+msgstr "Visit Before"
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/eo.po.in
===================================================================
--- trunk/navit/po/eo.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/eo.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -11,7 +11,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-27 21:43+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: Esperanto <eo...@li...>\n"
@@ -1453,6 +1452,12 @@
 msgid "Opens address search dialog"
 msgstr "Ĝi malfermas dialogon por serĉi adreson"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1495,6 +1500,100 @@
 msgid "Data"
 msgstr "Datumoj"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/es.po.in
===================================================================
--- trunk/navit/po/es.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/es.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -24,7 +24,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-12-18 16:54+0000\n"
 "Last-Translator: iceman75 <Unknown>\n"
 "Language-Team: Chris Eubank <cte...@gm...>\n"
@@ -1475,6 +1474,12 @@
 msgid "Opens address search dialog"
 msgstr "Abre el dialogo de busqueda de dirección"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "_Detener navegación"
 
@@ -1517,6 +1522,100 @@
 msgid "Data"
 msgstr "Datos"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/et.po.in
===================================================================
--- trunk/navit/po/et.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/et.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -12,7 +12,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-12-05 21:25+0000\n"
 "Last-Translator: Jalakas <Unknown>\n"
 "Language-Team: Estonian <et...@li...>\n"
@@ -20,6 +19,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: et\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1462,6 +1462,12 @@
 msgid "Opens address search dialog"
 msgstr "Ava aadressiotsingu aken"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "_Peata navigeerimine"
 
@@ -1504,6 +1510,100 @@
 msgid "Data"
 msgstr "Andmed"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/eu.po.in
===================================================================
--- trunk/navit/po/eu.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/eu.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -9,7 +9,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:42+0000\n"
 "Last-Translator: Inaki Saez <Ina...@gm...>\n"
 "Language-Team: Basque <eu...@li...>\n"
@@ -17,6 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: eu\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1450,6 +1450,12 @@
 msgid "Opens address search dialog"
 msgstr "Ireki helbidea bilatzeko lehioa"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Nabigazioa Gelditu"
 
@@ -1492,6 +1498,100 @@
 msgid "Data"
 msgstr "Datuak"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "I"
 

Modified: trunk/navit/po/fa.po.in
===================================================================
--- trunk/navit/po/fa.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/fa.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -7,9 +7,8 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-06-28 21:57+0000\n"
 "Last-Translator: the_cephalex <Unknown>\n"
 "Language-Team: Persian <fa...@li...>\n"
@@ -17,6 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"Language: fa\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -1449,6 +1449,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1491,6 +1497,100 @@
 msgid "Data"
 msgstr ""
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr ""
 

Modified: trunk/navit/po/fi.po.in
===================================================================
--- trunk/navit/po/fi.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/fi.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -14,7 +14,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:42+0000\n"
 "Last-Translator: Timo Jyrinki <tim...@ca...>\n"
 "Language-Team: Ossi Berg <o....@ma...>\n"
@@ -22,6 +21,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1459,6 +1459,12 @@
 msgid "Opens address search dialog"
 msgstr "Avaa osoitehaun ikkunan"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Lopeta navigointi"
 
@@ -1502,6 +1508,100 @@
 msgid "Data"
 msgstr "Tieto"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/fil.po.in
===================================================================
--- trunk/navit/po/fil.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/fil.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -6,9 +6,8 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2012-09-26 07:21+0000\n"
 "Last-Translator: chito <cn...@gm...>\n"
 "Language-Team: Filipino <fi...@li...>\n"
@@ -16,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+"Language: fil\n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -1448,6 +1448,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1490,6 +1496,100 @@
 msgid "Data"
 msgstr ""
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr ""
 

Modified: trunk/navit/po/fo.po.in
===================================================================
--- trunk/navit/po/fo.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/fo.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -9,7 +9,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:42+0000\n"
 "Last-Translator: Cyberish <ka...@gm...>\n"
 "Language-Team: Faroese <fo...@li...>\n"
@@ -1451,6 +1450,12 @@
 msgid "Opens address search dialog"
 msgstr "Opnar bústaðar leiting"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Stegga Navigering"
 
@@ -1493,6 +1498,100 @@
 msgid "Data"
 msgstr "Dáta"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/fr_CH.po.in
===================================================================
--- trunk/navit/po/fr_CH.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/fr_CH.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -8,7 +8,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2013-09-28 01:42+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: KaZeR <ka...@al...>\n"
@@ -1455,6 +1454,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Annuler le trajet"
 
@@ -1497,6 +1502,100 @@
 msgid "Data"
 msgstr "Données"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

Modified: trunk/navit/po/fy.po.in
===================================================================
--- trunk/navit/po/fy.po.in	2014-11-14 09:36:03 UTC (rev 5939)
+++ trunk/navit/po/fy.po.in	2014-11-14 09:41:38 UTC (rev 5940)
@@ -6,9 +6,8 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
+"Project-Id-Version: navit 0.5.0\n"
+"Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2011-08-12 12:18+0000\n"
 "Last-Translator: 205 <Unknown>\n"
 "Language-Team: Frisian <fy...@li...>\n"
@@ -16,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
 
 msgid "Running from source directory\n"
 msgstr ""
@@ -1448,6 +1448,12 @@
 msgid "Opens address search dialog"
 msgstr ""
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr ""
 
@@ -1490,6 +1496,100 @@
 msgid "Data"
 msgstr ""
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "N...
 
[truncated message content]

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

[<ka...@us...>]

Revision: 5939
          http://sourceforge.net/p/navit/code/5939
Author:   kazer_
Date:     2014-11-14 09:36:03 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
Update:Core:Updated French translation from launchpad

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

Modified: trunk/navit/po/fr.po.in
===================================================================
--- trunk/navit/po/fr.po.in	2014-11-09 21:28:51 UTC (rev 5938)
+++ trunk/navit/po/fr.po.in	2014-11-14 09:36:03 UTC (rev 5939)
@@ -1,4 +1,4 @@
-# French (fr)  translations for navit
+# French (fr) translations for navit
 # Copyright (C) 2006-2014 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
@@ -26,7 +26,6 @@
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 11:04-0700\n"
 "PO-Revision-Date: 2014-08-11 17:45+0000\n"
 "Last-Translator: KaZeR <Unknown>\n"
 "Language-Team: KaZeR <ka...@al...>\n"
@@ -34,7 +33,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"Language: \n"
+"Language: fr\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
@@ -1480,6 +1479,12 @@
 msgid "Opens address search dialog"
 msgstr "Ouvrir la fenêtre de recherche d'adresse"
 
+msgid "_POI search"
+msgstr ""
+
+msgid "Opens POI search dialog"
+msgstr ""
+
 msgid "_Stop Navigation"
 msgstr "Annuler le trajet"
 
@@ -1522,6 +1527,100 @@
 msgid "Data"
 msgstr "Données"
 
+msgid "Pharmacy"
+msgstr ""
+
+msgid "Restaurant"
+msgstr ""
+
+msgid "Restaurant. Fast food"
+msgstr ""
+
+msgid "Hotel"
+msgstr ""
+
+msgid "Car parking"
+msgstr ""
+
+msgid "Fuel station"
+msgstr ""
+
+msgid "Bank"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Cinema"
+msgstr ""
+
+msgid "Train station"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Justice"
+msgstr ""
+
+msgid "Taxi"
+msgstr ""
+
+msgid "Shopping"
+msgstr ""
+
+msgid "Distance from screen center (km)"
+msgstr ""
+
+#, c-format
+msgid "POI %s. %s"
+msgstr ""
+
+#, c-format
+msgid "Set destination to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set map to %ld, %ld \n"
+msgstr ""
+
+#, c-format
+msgid "Set next visit to %ld, %ld \n"
+msgstr ""
+
+msgid "POI search"
+msgstr ""
+
+msgid "Select a category"
+msgstr ""
+
+msgid "Select a distance to look for (km)"
+msgstr ""
+
+msgid "Select a POI"
+msgstr ""
+
+msgid " "
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "Direction"
+msgstr ""
+
+msgid "Distance(m)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Visit Before"
+msgstr ""
+
 msgid "N"
 msgstr "N"
 

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:[5938] trunk/navit/navit/binding/dbus/binding_dbus.c

[<mvg...@us...>]

Revision: 5938
          http://sourceforge.net/p/navit/code/5938
Author:   mvglasow
Date:     2014-11-09 21:28:51 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Add:dbus:Include maneuver type in GPS export

Signed-off-by: mvglasow <michael -at- vonglasow.com>

Modified Paths:
--------------
    trunk/navit/navit/binding/dbus/binding_dbus.c

Modified: trunk/navit/navit/binding/dbus/binding_dbus.c
===================================================================
--- trunk/navit/navit/binding/dbus/binding_dbus.c	2014-11-09 20:39:33 UTC (rev 5937)
+++ trunk/navit/navit/binding/dbus/binding_dbus.c	2014-11-09 21:28:51 UTC (rev 5938)
@@ -1318,8 +1318,8 @@
 	struct map * map=NULL;
 	struct navigation * nav = NULL;
 	struct map_rect * mr=NULL;
-	struct item * item =NULL;
-	struct attr attr,route;
+	struct item *item = NULL;
+	struct attr attr,attr2,route;
 	struct coord c;
 	struct coord_geo g;
 	struct transformation *trans;
@@ -1350,7 +1350,7 @@
 		if(item_attr_get(item,attr_navigation_long,&attr)) {
 			item_coord_get(item, &c, 1);
 			transform_to_geo (projection_mg, &c, &g);
-			fprintf(fp,"<rtept lon='%4.16f' lat='%4.16f'><name>%s</name></rtept>\n",g.lng, g.lat, map_convert_string_tmp(item->map,attr.u.str));
+			fprintf(fp,"<rtept lon='%4.16f' lat='%4.16f'><type>%s</type><name>%s</name></rtept>\n",g.lng, g.lat, item_to_name(item->type), map_convert_string_tmp(item->map,attr.u.str));
 		}
 	}
 	fprintf(fp,"%s",trailer);

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:[5937] trunk/navit/CMakeLists.txt

[<md...@us...>]

Revision: 5937
          http://sourceforge.net/p/navit/code/5937
Author:   mdankov
Date:     2014-11-09 20:39:33 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix:core:Set reason when enabling NSIS cpack generator.

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

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2014-11-09 20:13:03 UTC (rev 5936)
+++ trunk/navit/CMakeLists.txt	2014-11-09 20:39:33 UTC (rev 5937)
@@ -118,7 +118,7 @@
     add_feature(USE_NSIS "makensis not found" FALSE)
     FIND_PROGRAM(NSIS_EXECUTABLE NAMES makensis makensis.exe)
     if(NSIS_EXECUTABLE)
-    	set(USE_NSIS TRUE)
+        set_with_reason(USE_NSIS "makensis found" TRUE)
     endif(NSIS_EXECUTABLE)
 
     set(CPACK_GENERATOR ZIP)

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:[5936] trunk/navit

[<md...@us...>]

Revision: 5936
          http://sourceforge.net/p/navit/code/5936
Author:   mdankov
Date:     2014-11-09 20:13:03 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix:core:Set CPACK_INCLUDE_TOPLEVEL_DIRECTORY only for zip cpack generator, otherwise it breaks NSIS package generation when strict settings are active.

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

Added Paths:
-----------
    trunk/navit/cpack.cmake

Modified: trunk/navit/CMakeLists.txt
===================================================================
--- trunk/navit/CMakeLists.txt	2014-11-09 19:58:17 UTC (rev 5935)
+++ trunk/navit/CMakeLists.txt	2014-11-09 20:13:03 UTC (rev 5936)
@@ -112,7 +112,6 @@
 set(CPACK_NSIS_PACKAGE_NAME "Navit ${PACKAGE_VERSION}")
 set(CPACK_PACKAGE_FILE_NAME ${PACKAGE})
 set(CPACK_PACKAGE_EXECUTABLES "navit;Navit")
-set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
 set(CPACK_NSIS_HELP_LINK "http://www.navit-project.org/?page=contact")
 set(CPACK_NSIS_URL_INFO_ABOUT "http://www.navit-project.org")
 if(WIN32)

Added: trunk/navit/cpack.cmake
===================================================================
--- trunk/navit/cpack.cmake	                        (rev 0)
+++ trunk/navit/cpack.cmake	2014-11-09 20:13:03 UTC (rev 5936)
@@ -0,0 +1,4 @@
+if(CPACK_GENERATOR=="ZIP")
+  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
+endif(CPACK_GENERATOR=="ZIP")
+

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:[5935] trunk/navit/navit/navigation.c

[<mvg...@us...>]

Revision: 5935
          http://sourceforge.net/p/navit/code/5935
Author:   mvglasow
Date:     2014-11-09 19:58:17 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix:core:Improve detection of motorway interchanges

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2014-11-09 13:54:20 UTC (rev 5934)
+++ trunk/navit/navit/navigation.c	2014-11-09 19:58:17 UTC (rev 5935)
@@ -1356,8 +1356,13 @@
 			 * at a motorway interchange.
 			 */
 			// FIXME: motorway junctions could have service roads
-			r="yes: motorway interchange";
+			r="yes: motorway interchange (multiple motorways)";
 			ret=1;
+		} else if (is_motorway_like(&(old->way)) && (num_other == 0) && (!is_same_street)) {
+			/* Another sign that we are at a motorway interchange is if the street name changes
+			 */
+			r="yes: motorway interchange (name changes)";
+			ret=1;
 		} else if ((new->way.item.type == type_ramp) && ((num_other == 0) || (abs(d) >= curve_limit)) && ((left > -90) || (right < 90))) {
 			/* Motorway ramps can be confusing, therefore we need to lower the bar for announcing a maneuver.
 			 * When the new way is a ramp, we check for the following criteria:

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:[5934] trunk/navit/navit/navigation.c

[<mvg...@us...>]

Revision: 5934
          http://sourceforge.net/p/navit/code/5934
Author:   mvglasow
Date:     2014-11-09 13:54:20 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix:core:Eliminate more superfluous maneuvers at ramps|Should fix #660

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2014-11-09 01:40:07 UTC (rev 5933)
+++ trunk/navit/navit/navigation.c	2014-11-09 13:54:20 UTC (rev 5934)
@@ -1263,35 +1263,35 @@
 				} else if (w->item.type != type_ramp) {
 					num_other++;
 				}
+				if (w != &(new->way)) {
+					dw=angle_delta(old->angle_end, w->angle2);
+					if (dw < 0) {
+						if (dw > left)
+							left=dw;
+						if (dw > -curve_limit && d < 0 && d > -curve_limit)
+							dc=dw;
+					} else {
+						if (dw < right)
+							right=dw;
+						if (dw < curve_limit && d > 0 && d < curve_limit)
+							dc=dw;
+					}
+					wcat=maneuver_category(w->item.type);
+					/* If any other street has the same name, we can't use the same name criterion.
+					 * Exceptions apply if we're coming from a motorway-like road and:
+					 * - the other road is motorway-like (a motorway might split up temporarily) or
+					 * - the other road is a ramp (they are sometimes tagged with the name of the motorway)
+					 * The second one is really a workaround for bad tagging practice in OSM. Since entering
+					 * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted
+					 * side effects.
+					 */
+					if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2))
+						is_same_street=0;
+					/* Mark if the street has a higher or the same category */
+					if (wcat > maxcat)
+						maxcat=wcat;
+				} /* if w != new->way */
 			} /* if is_way_allowed */
-			if (w != &(new->way)) {
-				dw=angle_delta(old->angle_end, w->angle2);
-				if (dw < 0) {
-					if (dw > left)
-						left=dw;
-					if (dw > -curve_limit && d < 0 && d > -curve_limit)
-						dc=dw;
-				} else {
-					if (dw < right)
-						right=dw;
-					if (dw < curve_limit && d > 0 && d < curve_limit)
-						dc=dw;
-				}
-				wcat=maneuver_category(w->item.type);
-				/* If any other street has the same name, we can't use the same name criterion.
-				 * Exceptions apply if we're coming from a motorway-like road and:
-				 * - the other road is motorway-like (a motorway might split up temporarily) or
-				 * - the other road is a ramp (they are sometimes tagged with the name of the motorway)
-				 * The second one is really a workaround for bad tagging practice in OSM. Since entering
-				 * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted
-				 * side effects.
-				 */
-				if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2))
-					is_same_street=0;
-				/* Mark if the street has a higher or the same category */
-				if (wcat > maxcat)
-					maxcat=wcat;
-			} /* if w != new->way */
 			//if ((w->flags & AF_ONEWAYMASK) && is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2))
 			if (is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2))
 				// FIXME: for some reason new->way has no flags set (at least in my test case), so we can't test for oneway
@@ -1358,15 +1358,17 @@
 			// FIXME: motorway junctions could have service roads
 			r="yes: motorway interchange";
 			ret=1;
-		} else if ((new->way.item.type == type_ramp) && ((num_other == 0) || (abs(d) >= curve_limit))) {
-			/* Motorway ramps can be confusing, therefore announce each maneuver.
-			 * We'll assume a motorway ramp when all available ways are either
-			 * motorway-like or ramps.
-			 * We will also generate a maneuver whenever we have to make a turn
-			 * (of curve_limit or more) to enter the ramp.
-			 * Going straight on a ramp that crosses non-motorway roads does not
-			 * per se create a maneuver. This is to avoid superfluous maneuvers
-			 * when the minor road of a complex T junction is a ramp.
+		} else if ((new->way.item.type == type_ramp) && ((num_other == 0) || (abs(d) >= curve_limit)) && ((left > -90) || (right < 90))) {
+			/* Motorway ramps can be confusing, therefore we need to lower the bar for announcing a maneuver.
+			 * When the new way is a ramp, we check for the following criteria:
+			 * - All available ways are either motorway-like or ramps.
+			 *   This prevents this rule from firing in non-motorway setings, which is needed to avoid
+			 *   superfluous maneuvers when the minor road of a complex T junction is a ramp.
+			 * - If the above is not met, the maneuver must involve a turn (curve_limit or more) to enter the ramp.
+			 * - Additionally, there must be one way (other than the new way) within +/-90°.
+			 *   This prevents the rule from essentially announcing "don't do the U turn" where the ramps for
+			 *   two opposite directions merge.
+			 * If the criteria are satisfied, announce.
 			 */
 			r="yes: entering ramp";
 			ret=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:[5933] trunk/navit/navit/navigation.c

[<mvg...@us...>]

Revision: 5933
          http://sourceforge.net/p/navit/code/5933
Author:   mvglasow
Date:     2014-11-09 01:40:07 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix:core:Announce turns when going straight is not allowed | One step closer to fixing #660, thanks jandegr and tryagain

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2014-11-09 01:38:42 UTC (rev 5932)
+++ trunk/navit/navit/navigation.c	2014-11-09 01:40:07 UTC (rev 5933)
@@ -1263,35 +1263,35 @@
 				} else if (w->item.type != type_ramp) {
 					num_other++;
 				}
-				if (w != &(new->way)) {
-					dw=angle_delta(old->angle_end, w->angle2);
-					if (dw < 0) {
-						if (dw > left)
-							left=dw;
-						if (dw > -curve_limit && d < 0 && d > -curve_limit)
-							dc=dw;
-					} else {
-						if (dw < right)
-							right=dw;
-						if (dw < curve_limit && d > 0 && d < curve_limit)
-							dc=dw;
-					}
-					wcat=maneuver_category(w->item.type);
-					/* If any other street has the same name, we can't use the same name criterion.
-					 * Exceptions apply if we're coming from a motorway-like road and:
-					 * - the other road is motorway-like (a motorway might split up temporarily) or
-					 * - the other road is a ramp (they are sometimes tagged with the name of the motorway)
-					 * The second one is really a workaround for bad tagging practice in OSM. Since entering
-					 * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted
-					 * side effects.
-					 */
-					if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2))
-						is_same_street=0;
-					/* Mark if the street has a higher or the same category */
-					if (wcat > maxcat)
-						maxcat=wcat;
-				} /* if w != new->way */
 			} /* if is_way_allowed */
+			if (w != &(new->way)) {
+				dw=angle_delta(old->angle_end, w->angle2);
+				if (dw < 0) {
+					if (dw > left)
+						left=dw;
+					if (dw > -curve_limit && d < 0 && d > -curve_limit)
+						dc=dw;
+				} else {
+					if (dw < right)
+						right=dw;
+					if (dw < curve_limit && d > 0 && d < curve_limit)
+						dc=dw;
+				}
+				wcat=maneuver_category(w->item.type);
+				/* If any other street has the same name, we can't use the same name criterion.
+				 * Exceptions apply if we're coming from a motorway-like road and:
+				 * - the other road is motorway-like (a motorway might split up temporarily) or
+				 * - the other road is a ramp (they are sometimes tagged with the name of the motorway)
+				 * The second one is really a workaround for bad tagging practice in OSM. Since entering
+				 * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted
+				 * side effects.
+				 */
+				if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2))
+					is_same_street=0;
+				/* Mark if the street has a higher or the same category */
+				if (wcat > maxcat)
+					maxcat=wcat;
+			} /* if w != new->way */
 			//if ((w->flags & AF_ONEWAYMASK) && is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2))
 			if (is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2))
 				// FIXME: for some reason new->way has no flags set (at least in my test case), so we can't test for oneway
@@ -1327,10 +1327,25 @@
 					ret=1;
 					r="yes: turning into dual-carriageway through-road of T junction";
 			}
-			if (!r)
-				r="no: only one option permitted";
 		}
 	}
+	if (!r && abs(d) > 75) {
+		/* always make an announcement if you have to make a sharp turn */
+		r="yes: delta over 75";
+		ret=1;
+	} else if (!r && abs(d) >= curve_limit) {
+		if ((cat >= maneuver_category(type_street_2_city)) && (num_similar > 1)) {
+			/* When coming from street_2_* or higher category road, check if
+			 * - we have multiple options of the same category and
+			 * - we have to make a considerable turn (at least curve_limit)
+			 * If both is the case, ANNOUNCE.
+			 */
+			ret=1;
+			r="yes: more than one similar road and delta >= curve_limit";
+		}
+	}
+	if ((!r) && (num_options <= 1))
+		r="no: only one option permitted";
 	if (!r) {
 		if (is_motorway_like(&(old->way)) && (num_other == 0) && (num_new_motorways > 1)) {
 			/* If we are at a motorway interchange, ANNOUNCE
@@ -1357,25 +1372,6 @@
 			ret=1;
 		}
 	}
-	if (!r && abs(d) > 75) {
-		/* always make an announcement if you have to make a sharp turn */
-		r="yes: delta over 75";
-		ret=1;
-	} else if (!r && abs(d) >= curve_limit) {
-		/* When coming from street_2_* or higher category road, check if
-		 * - we have multiple options of the same category and
-		 * - we have to make a considerable turn (at least curve_limit)
-		 * If both is the case, ANNOUNCE.
-		 * Note: 22.5 degrees is the threshold because anything higher is
-		 * closer to 45 than to 0 degrees.
-		 */
-		if (cat >= maneuver_category(type_street_2_city)) {
-			if (num_similar > 1) {
-				ret=1;
-				r="yes: more than one similar road and delta >= curve_limit";
-			}
-		}
-	}
 	ncat=maneuver_category(new->way.item.type);
 	if (!r) {
 		/* get the delta limit for checking for other streets. It is lower if the street has no other

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:[5932] trunk/navit/navit/navigation.c

[<mvg...@us...>]

Revision: 5932
          http://sourceforge.net/p/navit/code/5932
Author:   mvglasow
Date:     2014-11-09 01:38:42 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix:core:use curve_limit throughout maneuver_required2

Signed-off-by: mvglasow <michael -at- vonglasow.com>

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

Modified: trunk/navit/navit/navigation.c
===================================================================
--- trunk/navit/navit/navigation.c	2014-11-08 22:29:23 UTC (rev 5931)
+++ trunk/navit/navit/navigation.c	2014-11-09 01:38:42 UTC (rev 5932)
@@ -1361,11 +1361,10 @@
 		/* always make an announcement if you have to make a sharp turn */
 		r="yes: delta over 75";
 		ret=1;
-	} else if (!r && abs(d) > 22) {
-		//FIXME: use abs(d) >= curve_limit
+	} else if (!r && abs(d) >= curve_limit) {
 		/* When coming from street_2_* or higher category road, check if
 		 * - we have multiple options of the same category and
-		 * - we have to make a considerable turn (more than 22 degrees)
+		 * - we have to make a considerable turn (at least curve_limit)
 		 * If both is the case, ANNOUNCE.
 		 * Note: 22.5 degrees is the threshold because anything higher is
 		 * closer to 45 than to 0 degrees.
@@ -1373,7 +1372,7 @@
 		if (cat >= maneuver_category(type_street_2_city)) {
 			if (num_similar > 1) {
 				ret=1;
-				r="yes: more than one similar road and delta over 22";
+				r="yes: more than one similar road and delta >= curve_limit";
 			}
 		}
 	}

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