Merge branch 'trunk' into i18n/ckb

31 files changed, 781 insertions, 503 deletions

diff --git a/navit/attr.c b/navit/attr.c
index 58cfe621d..7eff92fb8 100644
--- a/navit/attr.c
+++ b/navit/attr.c
@@ -836,6 +836,10 @@ void attr_free(struct attr *attr) {
     g_free(attr);
 }
 
+void attr_free_g(struct attr *attr, void * unused) {
+    attr_free(attr);
+}
+
 void attr_dup_content(struct attr *src, struct attr *dst) {
     int size;
     dst->type=src->type;
diff --git a/navit/attr.h b/navit/attr.h
index ab4283394..d4cd07a1e 100644
--- a/navit/attr.h
+++ b/navit/attr.h
@@ -238,6 +238,7 @@ void attr_data_set(struct attr *attr, void *data);
 void attr_data_set_le(struct attr *attr, void *data);
 void attr_free_content(struct attr *attr);
 void attr_free(struct attr *attr);
+void attr_free_g(struct attr *attr, void * unused); /* to use as GFunc in glib context */
 void attr_dup_content(struct attr *src, struct attr *dst);
 struct attr *attr_dup(struct attr *attr);
 void attr_list_free(struct attr **attrs);
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index 5eddc50f7..84ed7fe00 100644
--- a/navit/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
@@ -1167,7 +1167,7 @@ static DBusHandlerResult request_navit_set_layout(DBusConnection *connection, DB
     if (!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &new_layout_name, DBUS_TYPE_INVALID))
         return dbus_error_invalid_parameter(connection, message);
 
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while(navit_get_attr(navit, attr_layout, &attr, iter)) {
         if (strcmp(attr.u.layout->name, new_layout_name) == 0) {
             navit_set_attr(navit, &attr);
@@ -1241,7 +1241,7 @@ static DBusHandlerResult request_navit_traffic_export_gpx(DBusConnection *connec
 
     dbus_message_iter_get_basic(&iter, &filename);
 
-    a_iter = navit_attr_iter_new();
+    a_iter = navit_attr_iter_new(NULL);
     if (navit_get_attr(navit, attr_traffic, &attr, a_iter))
         traffic = (struct traffic *) attr.u.navit_object;
     navit_attr_iter_destroy(a_iter);
@@ -1357,7 +1357,7 @@ static DBusHandlerResult request_navit_traffic_inject(DBusConnection *connection
     dbus_message_iter_get_basic(&iter, &filename);
 
     attr = g_new0(struct attr, 1);
-    a_iter = navit_attr_iter_new();
+    a_iter = navit_attr_iter_new(NULL);
     if (navit_get_attr(navit, attr_traffic, attr, a_iter))
         traffic = (struct traffic *) attr->u.navit_object;
     navit_attr_iter_destroy(a_iter);
@@ -1648,7 +1648,7 @@ static DBusHandlerResult request_navit_get_attr(DBusConnection *connection, DBus
 
 static DBusHandlerResult request_navit_attr_iter(DBusConnection *connection, DBusMessage *message) {
     DBusMessage *reply;
-    struct attr_iter *attr_iter=navit_attr_iter_new();
+    struct attr_iter *attr_iter=navit_attr_iter_new(NULL);
     char *opath=object_new("navit_attr_iter",attr_iter);
     reply = dbus_message_new_method_return(message);
     dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &opath, DBUS_TYPE_INVALID);
diff --git a/navit/bookmarks.c b/navit/bookmarks.c
index f32b6d89c..9877a6dba 100644
--- a/navit/bookmarks.c
+++ b/navit/bookmarks.c
@@ -364,7 +364,7 @@ static int bookmarks_store_bookmarks_to_file(struct bookmarks *this_,  int limit
 
 #ifdef FlushFileBuffers
     FlushFileBuffers(f)
-#endif FlushFileBuffers
+#endif
 
     fclose(f);
 
@@ -378,7 +378,7 @@ static int bookmarks_store_bookmarks_to_file(struct bookmarks *this_,  int limit
     unlink(this_->bookmark_file);
 #ifdef _POSIX
     sync();
-#endif _POSIX
+#endif
     result=(rename(this_->working_file,this_->bookmark_file)==0);
     if (!result) {
         navit_add_message(this_->parent->u.navit,_("Failed to write bookmarks file"));
@@ -421,7 +421,8 @@ void bookmarks_set_center_from_file(struct bookmarks *this_, char *file) {
     f = fopen(file, "r");
     if (! f)
         return;
-    getline(&line, &line_size, f);
+    if(getline(&line, &line_size, f) < 0)
+        dbg(lvl_error, "Error on getline (%s)", strerror(errno));
     fclose(f);
     if (line) {
         center = transform_center(this_->trans);
@@ -631,9 +632,15 @@ struct former_destination {
     GList* c;
 };
 
-static void free_former_destination(struct former_destination* former_destination) {
+/* to adapt g_free to GFunc */
+static void g_free_helper(void * data, void*user_data) {
+    g_free(data);
+}
+
+/* unused parameter is for GFunc compatibility */
+static void free_former_destination(struct former_destination* former_destination, void * unused) {
     g_free(former_destination->description);
-    g_list_foreach(former_destination->c, (GFunc)g_free, NULL);
+    g_list_foreach(former_destination->c, (GFunc)g_free_helper, NULL);
     g_list_free(former_destination->c);
     g_free(former_destination);
 }
@@ -693,7 +700,7 @@ static GList* find_destination_in_list(struct former_destination* dest_to_remove
         curr_dest = curr_el->data;
         if (destination_equal(dest_to_remove, curr_dest, remove_found?0:1)) {
             if(remove_found) {
-                free_former_destination(curr_dest);
+                free_former_destination(curr_dest, NULL);
                 curr_el = g_list_remove(curr_el, curr_dest);
                 continue;
             } else {
diff --git a/navit/config_.c b/navit/config_.c
index 644b66d70..2149eaf2e 100644
--- a/navit/config_.c
+++ b/navit/config_.c
@@ -109,8 +109,8 @@ int config_remove_attr(struct config *this_, struct attr *attr) {
 }
 
 struct attr_iter *
-config_attr_iter_new() {
-    return navit_object_attr_iter_new();
+config_attr_iter_new(void * unused) {
+    return navit_object_attr_iter_new(unused);
 }
 
 void config_attr_iter_destroy(struct attr_iter *iter) {
diff --git a/navit/config_.h b/navit/config_.h
index 64ac0465c..78710dcbb 100644
--- a/navit/config_.h
+++ b/navit/config_.h
@@ -17,7 +17,7 @@ int config_get_attr(struct config *this_, enum attr_type type, struct attr *attr
 int config_set_attr(struct config *this_, struct attr *attr);
 int config_add_attr(struct config *this_, struct attr *attr);
 int config_remove_attr(struct config *this_, struct attr *attr);
-struct attr_iter *config_attr_iter_new(void);
+struct attr_iter *config_attr_iter_new(void * unused);
 void config_attr_iter_destroy(struct attr_iter *iter);
 struct config *config_new(struct attr *parent, struct attr **attrs);
 /* end of prototypes */
diff --git a/navit/coord.c b/navit/coord.c
index c452f1c35..cc64044bd 100644
--- a/navit/coord.c
+++ b/navit/coord.c
@@ -378,6 +378,10 @@ void coord_format_with_sep(float lat,float lng, enum coord_format fmt, char *buf
             size_used+=g_snprintf(buffer+size_used,size-size_used,"%.0f°%.0f'%.0f\"%c",floor(lng_deg),floor(lng_min),
                                   round(lng_sec),lng_c);
         break;
+    /* compiler warned about those not being handled. What to do with them?*/
+    case DEGREES_DECIMAL_ABSOLUTE:
+    case DEGREES_DECIMAL:
+        break;
     }
 }
 
diff --git a/navit/debug.c b/navit/debug.c
index ef485ad8a..6321756b6 100644
--- a/navit/debug.c
+++ b/navit/debug.c
@@ -74,11 +74,13 @@ static void sigsegv(int sig) {
 #include <unistd.h>
 static void sigsegv(int sig) {
     char buffer[256];
+    int retval;
     if (segv_level > 1)
         sprintf(buffer, "gdb -ex bt %s %d", gdb_program, getpid());
     else
         sprintf(buffer, "gdb -ex bt -ex detach -ex quit %s %d", gdb_program, getpid());
-    system(buffer);
+    retval = system(buffer);
+    fprintf(stderr, "calling gdb returned %d\n", retval);
     exit(1);
 }
 #endif
diff --git a/navit/file.c b/navit/file.c
index 8d0365499..680b355b2 100644
--- a/navit/file.c
+++ b/navit/file.c
@@ -99,8 +99,8 @@ static void file_http_request(struct file *file, char *method, char *host, char
     char *request=g_strdup_printf("%s %s HTTP/1.0\r\nUser-Agent: navit %s\r\nHost: %s\r\n%s%s%s\r\n",method,path,
                                   NAVIT_VERSION,
                                   host,persistent?"Connection: Keep-Alive\r\n":"",header?header:"",header?"\r\n":"");
-    write(file->fd, request, strlen(request));
-    dbg(lvl_debug,"%s",request);
+    int retval = write(file->fd, request, strlen(request));
+    dbg(lvl_debug,"%s returned %d",request, retval);
     file->requests++;
 }
 
diff --git a/navit/gui/gtk/gui_gtk_action.c b/navit/gui/gtk/gui_gtk_action.c
index ca5ff9427..7b700c7d5 100644
--- a/navit/gui/gtk/gui_gtk_action.c
+++ b/navit/gui/gtk/gui_gtk_action.c
@@ -158,6 +158,7 @@ static void info_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     struct coord lt, rb;
     struct point p;
     struct transformation *t;
+    int retval;
 
     t=navit_get_trans(gui->nav);
     transform_get_size(t, &mw, &mh);
@@ -169,7 +170,8 @@ static void info_action(GtkWidget *w, struct gui_priv *gui, void *dummy) {
     transform_reverse(t, &p, &rb);
 
     sprintf(buffer,"./info.sh %d,%d 0x%x,0x%x 0x%x,0x%x", mw, mh, lt.x, lt.y, rb.x, rb.y);
-    system(buffer);
+    retval=system(buffer);
+    dbg(lvl_debug,"calling %s returned %d", buffer, retval);
 
 }
 
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index 858904ddb..008659c44 100644
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -413,7 +413,7 @@ static void gui_gtk_layouts_init(struct gui_priv *this) {
     int count=0;
     char *name;
 
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while(navit_get_attr(this->nav, attr_layout, &attr, iter)) {
         name=g_strdup_printf("Layout %d", count++);
         data=g_new(struct action_cb_data, 1);
@@ -466,7 +466,7 @@ static void gui_gtk_vehicles_update(struct gui_priv *this) {
     g_list_free(this->vehicle_menuitems);
     this->vehicle_menuitems = NULL;
 
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while(navit_get_attr(this->nav, attr_vehicle, &attr, iter)) {
         vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
         name=g_strdup_printf("Vehicle %d", count++);
@@ -495,7 +495,7 @@ static void gui_gtk_maps_init(struct gui_priv *this) {
     int count=0;
     char *name, *label;
 
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while(navit_get_attr(this->nav, attr_map, &attr, iter)) {
         name=g_strdup_printf("Map %d", count++);
         if (! map_get_attr(attr.u.map, attr_type, &type, NULL))
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index 910e2e8cf..ffd795b7d 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -200,7 +200,7 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
     struct attr_iter *iter;
     struct attr active_vehicle;
 
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     if (navit_get_attr(this->nav, attr_vehicle, &attr, iter) && !navit_get_attr(this->nav, attr_vehicle, &attr2, iter)) {
         vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
         navit_attr_iter_destroy(iter);
@@ -215,7 +215,7 @@ static void gui_internal_cmd2_setting_vehicle(struct gui_priv *this, char *funct
     gui_internal_widget_append(wb, w);
     if (!navit_get_attr(this->nav, attr_vehicle, &active_vehicle, NULL))
         active_vehicle.u.vehicle=NULL;
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while(navit_get_attr(this->nav, attr_vehicle, &attr, iter)) {
         vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
         wl=gui_internal_button_new_with_callback(this, vattr.u.str,
@@ -278,7 +278,7 @@ static void gui_internal_cmd2_setting_maps(struct gui_priv *this, char *function
     //w->spy=this->spacing*3;
     w = gui_internal_widget_table_new(this,gravity_left_top | flags_fill | flags_expand |orientation_vertical,1);
     gui_internal_widget_append(wb, w);
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     on.type=off.type=attr_active;
     on.u.num=1;
     off.u.num=0;
@@ -323,7 +323,7 @@ static void gui_internal_cmd2_setting_layout(struct gui_priv *this, char *functi
     wb=gui_internal_menu(this, _("Layout"));
     w=gui_internal_widget_table_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill,1);
     gui_internal_widget_append(wb, w);
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while(navit_get_attr(this->nav, attr_layout, &attr, iter)) {
         gui_internal_widget_append(w, row=gui_internal_widget_table_row_new(this,
                                           gravity_left|orientation_horizontal|flags_fill));
diff --git a/navit/gui/qt5_qml/backend.cpp b/navit/gui/qt5_qml/backend.cpp
index 7a455c2a6..c9733b173 100644
--- a/navit/gui/qt5_qml/backend.cpp
+++ b/navit/gui/qt5_qml/backend.cpp
@@ -69,7 +69,7 @@ void Backend::get_maps() {
     struct attr_iter * iter;
     _maps.clear();
 
-    iter = navit_attr_iter_new();
+    iter = navit_attr_iter_new(NULL);
     on.type = off.type = attr_active;
     on.u.num = 1;
     off.u.num = 0;
@@ -106,7 +106,7 @@ void Backend::get_vehicles() {
     struct attr active_vehicle;
     _vehicles.clear();
 
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     if (navit_get_attr(this->nav, attr_vehicle, &attr, iter) && !navit_get_attr(this->nav, attr_vehicle, &attr2, iter)) {
         vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
         navit_attr_iter_destroy(iter);
@@ -119,7 +119,7 @@ void Backend::get_vehicles() {
 
     if (!navit_get_attr(this->nav, attr_vehicle, &active_vehicle, NULL))
         active_vehicle.u.vehicle=NULL;
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while(navit_get_attr(this->nav, attr_vehicle, &attr, iter)) {
         vehicle_get_attr(attr.u.vehicle, attr_name, &vattr, NULL);
         dbg(lvl_debug, "adding vehicle %s", vattr.u.str);
diff --git a/navit/layout.c b/navit/layout.c
index 65e4b7265..7ecea6c27 100644
--- a/navit/layout.c
+++ b/navit/layout.c
@@ -98,7 +98,7 @@ struct attr_iter {
 
 
 struct attr_iter *
-layout_attr_iter_new(void) {
+layout_attr_iter_new(void* unused) {
     return g_new0(struct attr_iter, 1);
 }
 
@@ -282,6 +282,7 @@ static int layer_set_attr_do(struct layer *l, struct attr *attr, int init) {
             dbg(lvl_error, "Ignoring reference to unknown layer '%s' in layer '%s'.", attr->u.str, l->name);
         }
         obj->func->iter_destroy(iter);
+        return 0;
     default:
         return 0;
     }
diff --git a/navit/layout.h b/navit/layout.h
index 8b8a63194..7f19460e2 100644
--- a/navit/layout.h
+++ b/navit/layout.h
@@ -135,7 +135,7 @@ struct polygon;
 struct polyline;
 struct text;
 struct layout *layout_new(struct attr *parent, struct attr **attrs);
-struct attr_iter *layout_attr_iter_new(void);
+struct attr_iter *layout_attr_iter_new(void* unused);
 void layout_attr_iter_destroy(struct attr_iter *iter);
 int layout_get_attr(struct layout *layout, enum attr_type type, struct attr *attr, struct attr_iter *iter);
 int layout_add_attr(struct layout *layout, struct attr *attr);
diff --git a/navit/log.c b/navit/log.c
index 3c40e9152..d68312938 100644
--- a/navit/log.c
+++ b/navit/log.c
@@ -47,7 +47,9 @@
 #include "debug.h"
 #include "xmlconfig.h"
 #include "log.h"
-
+#ifndef HAVE_API_WIN32_BASE
+#include <errno.h>
+#endif
 struct log_data {
     int len;
     int max_len;
@@ -239,7 +241,8 @@ static void log_flush(struct log *this_, enum log_flags flags) {
 #ifndef HAVE_API_WIN32_BASE
     if (flags & log_flag_truncate) {
         pos=ftell(this_->f);
-        ftruncate(fileno(this_->f), pos);
+        if(ftruncate(fileno(this_->f), pos) <0)
+            dbg(lvl_error,"Error on fruncate (%s)", strerror(errno));
     }
 #endif
     if (this_->trailer.len) {
diff --git a/navit/main.c b/navit/main.c
index 898fb9dca..84ec577aa 100644
--- a/navit/main.c
+++ b/navit/main.c
@@ -358,7 +358,12 @@ void main_init(const char *program) {
     if (file_exists("navit.c") || file_exists("navit.o") || file_exists("navit.lo") || file_exists("version.h")) {
         char buffer[PATH_MAX];
         printf("%s",_("Running from source directory\n"));
-        getcwd(buffer, PATH_MAX);		/* libc of navit returns "dummy" */
+        if(getcwd(buffer, PATH_MAX)==NULL) { /*libc of navit returns "dummy" */
+            printf("%s",_("Error getting current path. use ./ \n"));
+            buffer[0]='.';
+            buffer[1]='/';
+            buffer[2]=0;
+        }
         setenv("NAVIT_PREFIX", buffer, 0);
         main_setup_environment(0);
     } else {
diff --git a/navit/mapset.c b/navit/mapset.c
index 58751ee1e..94f1f42be 100644
--- a/navit/mapset.c
+++ b/navit/mapset.c
@@ -74,7 +74,7 @@ struct mapset *mapset_dup(struct mapset *ms) {
 
 
 struct attr_iter *
-mapset_attr_iter_new(void) {
+mapset_attr_iter_new(void* unused) {
     return g_new0(struct attr_iter, 1);
 }
 
diff --git a/navit/mapset.h b/navit/mapset.h
index 6f8917d04..df6c0d0a7 100644
--- a/navit/mapset.h
+++ b/navit/mapset.h
@@ -35,7 +35,7 @@ struct mapset_handle;
 struct mapset_search;
 struct mapset *mapset_new(struct attr *parent, struct attr **attrs);
 struct mapset *mapset_dup(struct mapset *ms);
-struct attr_iter *mapset_attr_iter_new(void);
+struct attr_iter *mapset_attr_iter_new(void * unused);
 void mapset_attr_iter_destroy(struct attr_iter *iter);
 int mapset_add_attr(struct mapset *ms, struct attr *attr);
 int mapset_remove_attr(struct mapset *ms, struct attr *attr);
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index 54a68135c..f18175990 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -255,7 +255,7 @@ static void add_plugin(char *path) {
 
     if (! plugins) {
         file_init();
-        plugins=plugins_new();
+        plugins=plugins_new(NULL, NULL);
     }
     pa_attr.u.str=path;
     pl_attr.u.plugins=plugins;
diff --git a/navit/navigation.c b/navit/navigation.c
index bc216ec15..1ddec7d33 100644
--- a/navit/navigation.c
+++ b/navit/navigation.c
@@ -4050,24 +4050,28 @@ static int navigation_map_item_attr_get(void *priv_data, enum attr_type attr_typ
                 this_->str=attr->u.str=g_strdup_printf("delta:%d", cmd->delta);
                 return 1;
             }
+        /* fall through */
         case 3:
             this_->debug_idx++;
             if (prev) {
                 this_->str=attr->u.str=g_strdup_printf("prev street_name:%s", prev->way.name);
                 return 1;
             }
+        /* fall through */
         case 4:
             this_->debug_idx++;
             if (prev) {
                 this_->str=attr->u.str=g_strdup_printf("prev street_name_systematic:%s", prev->way.name_systematic);
                 return 1;
             }
+        /* fall through */
         case 5:
             this_->debug_idx++;
             if (prev) {
                 this_->str=attr->u.str=g_strdup_printf("prev angle:(%d -) %d", prev->way.angle2, prev->angle_end);
                 return 1;
             }
+        /* fall through */
         case 6:
             this_->debug_idx++;
             this_->ways=itm->way.next;
@@ -4075,6 +4079,7 @@ static int navigation_map_item_attr_get(void *priv_data, enum attr_type attr_typ
                 this_->str=attr->u.str=g_strdup_printf("prev item type:%s", item_to_name(prev->way.item.type));
                 return 1;
             }
+        /* fall through */
         case 7:
             if (this_->ways && prev) {
                 this_->str=attr->u.str=g_strdup_printf("other item angle:%d delta:%d flags:%d dir:%d type:%s id:(0x%x,0x%x)",
@@ -4084,6 +4089,7 @@ static int navigation_map_item_attr_get(void *priv_data, enum attr_type attr_typ
                 return 1;
             }
             this_->debug_idx++;
+        /* fall through */
         case 8:
             this_->debug_idx++;
             if (prev) {
@@ -4108,6 +4114,7 @@ static int navigation_map_item_attr_get(void *priv_data, enum attr_type attr_typ
                                                maneuver->delta);
                 return 1;
             }
+        /* fall through */
 
         default:
             this_->attr_next=attr_none;
diff --git a/navit/navit.c b/navit/navit.c
index 63ed65807..50d639896 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -198,13 +198,12 @@ static int navit_add_vehicle(struct navit *this_, struct vehicle *v);
 static int navit_set_attr_do(struct navit *this_, struct attr *attr, int init);
 static int navit_get_cursor_pnt(struct navit *this_, struct point *p, int keep_orientation, int *dir);
 static void navit_set_cursors(struct navit *this_);
-static void navit_cmd_zoom_to_route(struct navit *this);
-static void navit_cmd_set_center_cursor(struct navit *this_);
-static void navit_cmd_announcer_toggle(struct navit *this_);
+static int navit_cmd_zoom_to_route(struct navit *this, char *function, struct attr **in, struct attr ***out);
+static int navit_cmd_set_center_cursor(struct navit *this_, char *function, struct attr **in, struct attr ***out);
+static int navit_cmd_announcer_toggle(struct navit *this_, char *function, struct attr **in, struct attr ***out);
 static void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv);
 static int navit_set_vehicleprofile(struct navit *this_, struct vehicleprofile *vp);
-static void navit_cmd_switch_layout_day_night(struct navit *this_, char *function, struct attr **in, struct attr ***out,
-        int valid);
+static int navit_cmd_switch_layout_day_night(struct navit *this_, char *function, struct attr **in, struct attr ***out);
 struct object_func navit_func;
 
 struct navit *global_navit;
@@ -830,22 +829,22 @@ void navit_zoom_out_cursor(struct navit *this_, int factor) {
     } else
         navit_zoom_out(this_, 2, NULL);
 }
-
-static int navit_cmd_zoom_in(struct navit *this_) {
+static int navit_cmd_zoom_in(struct navit *this_, char *cmd, struct attr **in, struct attr ***out) {
 
     navit_zoom_in_cursor(this_, 2);
     return 0;
 }
 
-static int navit_cmd_zoom_out(struct navit *this_) {
+static int navit_cmd_zoom_out(struct navit *this_, char *cmd, struct attr **in, struct attr ***out) {
     navit_zoom_out_cursor(this_, 2);
     return 0;
 }
 
 
-static void navit_cmd_say(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int navit_cmd_say(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     if (in && in[0] && ATTR_IS_STRING(in[0]->type) && in[0]->u.str)
         navit_say(this, in[0]->u.str);
+    return 0;
 }
 
 static GHashTable *cmd_int_var_hash = NULL;
@@ -858,11 +857,9 @@ static GHashTable *cmd_attr_var_hash = NULL;
  * @param function unused (needed to match command function signature)
  * @param in input attributes in[0] is the key string, in[1] is the integer value to store
  * @param out output attributes, unused
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_set_int_var(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                  int *valid) {
+static int navit_cmd_set_int_var(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     char*key;
     struct attr*val;
     if(!cmd_int_var_hash) {
@@ -876,6 +873,7 @@ static void navit_cmd_set_int_var(struct navit *this, char *function, struct att
         key = g_strdup(in[0]->u.str);
         g_hash_table_insert(cmd_int_var_hash, key, val);
     }
+    return 0;
 }
 
 
@@ -886,11 +884,9 @@ static void navit_cmd_set_int_var(struct navit *this, char *function, struct att
  * @param function unused (needed to match command function signature)
  * @param in input attributes in[0] is the key string, in[1] is the attr* value to store
  * @param out output attributes, unused
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_set_attr_var(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int navit_cmd_set_attr_var(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     char*key;
     struct attr*val;
     if(!cmd_attr_var_hash) {
@@ -905,6 +901,7 @@ static void navit_cmd_set_attr_var(struct navit *this, char *function, struct at
     } else {
         dbg(lvl_warning, "Wrong parameters for set_attr_var() command function");
     }
+    return 0;
 }
 
 
@@ -917,10 +914,9 @@ static void navit_cmd_set_attr_var(struct navit *this, char *function, struct at
  * @param in input attribute in[0] is the name of the layer
  * @param out output unused
  * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_toggle_layer(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int navit_cmd_toggle_layer(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     if (in && in[0] && ATTR_IS_STRING(in[0]->type) && in[0]->u.str) {
         if(this->layout_current && this->layout_current->layers) {
             GList* layers = this->layout_current->layers;
@@ -929,12 +925,13 @@ static void navit_cmd_toggle_layer(struct navit *this, char *function, struct at
                 if(l && !strcmp(l->name,in[0]->u.str) ) {
                     l->active ^= 1;
                     navit_draw(this);
-                    return;
+                    return 0;
                 }
                 layers=g_list_next(layers);
             }
         }
     }
+    return 0;
 }
 
 /**
@@ -944,11 +941,9 @@ static void navit_cmd_toggle_layer(struct navit *this, char *function, struct at
  * @param function unused (needed to match command function signature)
  * @param in input attribute in[0] is the name of the map
  * @param out output attribute, 0 on error or the id of the created item on success
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_map_add_curr_pos(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                       int *valid) {
+static int navit_cmd_map_add_curr_pos(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct attr **list = g_new0(struct attr *,2);
     struct attr*val = g_new0(struct attr,1);
     struct mapset* ms;
@@ -973,12 +968,12 @@ static void navit_cmd_map_add_curr_pos(struct navit *this, char *function, struc
 
         if(!(ms=navit_get_mapset(this))) {
             dbg(lvl_error, "Command function map_add_curr_pos(): there is no active mapset");
-            return;
+            return 0;
         }
 
         if((item_type = item_from_name(in[1]->u.str))==type_none) {
             dbg(lvl_error, "Command function map_add_curr_pos(): unknown item type");
-            return;
+            return 0;
         }
 
         curr_map = mapset_get_map_by_name(ms, in[0]->u.str);
@@ -986,7 +981,7 @@ static void navit_cmd_map_add_curr_pos(struct navit *this, char *function, struc
         //no map with the given name found
         if( ! curr_map) {
             dbg(lvl_error, "Command function map_add_curr_pos(): map not found");
-            return;
+            return 0;
         }
 
         if(this->vehicle && this->vehicle->vehicle ) {
@@ -995,11 +990,11 @@ static void navit_cmd_map_add_curr_pos(struct navit *this, char *function, struc
                 transform_from_geo(projection_mg, pos_attr.u.coord_geo, &curr_coord);
             } else {
                 dbg(lvl_error, "Command function map_add_curr_pos(): vehicle position is not accessible");
-                return;
+                return 0;
             }
         } else {
             dbg(lvl_error, "Command function map_add_curr_pos(): no vehicle");
-            return;
+            return 0;
         }
 
         sel.next=NULL;
@@ -1025,6 +1020,7 @@ static void navit_cmd_map_add_curr_pos(struct navit *this, char *function, struc
         }
         map_rect_destroy(mr);
     }
+    return 0;
 }
 
 /**
@@ -1034,11 +1030,9 @@ static void navit_cmd_map_add_curr_pos(struct navit *this, char *function, struc
  * @param function unused (needed to match command function signature)
  * @param in input attribute in[0] - name of the map  ; in[1] - item  ; in[2] - attr name ; in[3] - attr value
  * @param out output attribute, 0 on error, 1 on success
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_map_item_set_attr(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                        int *valid) {
+static int navit_cmd_map_item_set_attr(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     if (
         in && in[0] && ATTR_IS_STRING(in[0]->type) && in[0]->u.str  &&//map name
         in[1] && ATTR_IS_ITEM(in[1]->type)   && in[2]->u.item &&//item
@@ -1069,7 +1063,7 @@ static void navit_cmd_map_item_set_attr(struct navit *this, char *function, stru
         curr_map = mapset_get_map_by_name(ms, in[0]->u.str);
 
         if( ! curr_map) {
-            return;
+            return 0;
         }
 
         mr=map_rect_new(curr_map,NULL);
@@ -1090,6 +1084,7 @@ static void navit_cmd_map_item_set_attr(struct navit *this, char *function, stru
         dbg(lvl_debug,"Command function item_set_attr(): attr val cond:  %d",(in[3] && ATTR_IS_STRING(in[3]->type)
                 && in[3]->u.str)?1:0);
     }
+    return 0;
 }
 
 /**
@@ -1099,11 +1094,9 @@ static void navit_cmd_map_item_set_attr(struct navit *this, char *function, stru
  * @param function unused (needed to match command function signature)
  * @param in input attribute in[0] is the key string
  * @param out output attribute, the attr for the given key string if exists or NULL
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_get_attr_var(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int navit_cmd_get_attr_var(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct attr **list = g_new0(struct attr *,2);
     list[1] = NULL;
     *out = list;
@@ -1112,7 +1105,7 @@ static void navit_cmd_get_attr_var(struct navit *this, char *function, struct at
         val->type   = attr_type_item_begin;
         val->u.item = NULL;
         list[0]     = val;
-        return;
+        return 0;
     }
     if (in && in[0] && ATTR_IS_STRING(in[0]->type) && in[0]->u.str) {
         struct attr*ret = g_hash_table_lookup(cmd_attr_var_hash, in[0]->u.str);
@@ -1125,6 +1118,7 @@ static void navit_cmd_get_attr_var(struct navit *this, char *function, struct at
             list[0]   = val;
         }
     }
+    return 0;
 }
 
 
@@ -1135,11 +1129,9 @@ static void navit_cmd_get_attr_var(struct navit *this, char *function, struct at
  * @param function unused (needed to match command function signature)
  * @param in input attribute in[0] is the key string
  * @param out output attribute, the value for the given key string if exists or 0
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_get_int_var(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                  int *valid) {
+static int navit_cmd_get_int_var(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct attr **list = g_new0(struct attr *,2);
     list[1] = NULL;
     *out = list;
@@ -1148,7 +1140,7 @@ static void navit_cmd_get_int_var(struct navit *this, char *function, struct att
         val->type   = attr_type_int_begin;
         val->u.num  = 0;
         list[0]     = val;
-        return;
+        return 0;
     }
     if (in && in[0] && ATTR_IS_STRING(in[0]->type) && in[0]->u.str) {
         struct attr*ret = g_hash_table_lookup(cmd_int_var_hash, in[0]->u.str);
@@ -1161,6 +1153,7 @@ static void navit_cmd_get_int_var(struct navit *this, char *function, struct att
             list[0]   = val;
         }
     }
+    return 0;
 }
 
 GList *cmd_int_var_stack = NULL;
@@ -1172,15 +1165,15 @@ GList *cmd_int_var_stack = NULL;
  * @param function unused (needed to match command function signature)
  * @param in input attribute in[0] is the integer attibute to push
  * @param out output attributes, unused
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_push_int(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int navit_cmd_push_int(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     if (in && in[0] && ATTR_IS_NUMERIC(in[0]->type)) {
         struct attr*val = g_new(struct attr,1);
         attr_dup_content(in[0],val);
         cmd_int_var_stack = g_list_prepend(cmd_int_var_stack, val);
     }
+    return 0;
 }
 
 /**
@@ -1190,10 +1183,9 @@ static void navit_cmd_push_int(struct navit *this, char *function, struct attr *
  * @param function unused (needed to match command function signature)
  * @param in input attributes unused
  * @param out output attribute, the value popped if stack isn't empty or 0
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_pop_int(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int navit_cmd_pop_int(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct attr **list = g_new0(struct attr *,2);
     if(!cmd_int_var_stack) {
         struct attr*val = g_new0(struct attr,1);
@@ -1206,6 +1198,7 @@ static void navit_cmd_pop_int(struct navit *this, char *function, struct attr **
     }
     list[1] = NULL;
     *out = list;
+    return 0;
 }
 
 /**
@@ -1215,11 +1208,9 @@ static void navit_cmd_pop_int(struct navit *this, char *function, struct attr **
  * @param function unused (needed to match command function signature)
  * @param in input attributes unused
  * @param out output attribute, the size of stack
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_int_stack_size(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                     int *valid) {
+static int navit_cmd_int_stack_size(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct attr **list;
     struct attr *attr  = g_new0(struct attr,1);
     attr->type  = attr_type_int_begin;
@@ -1233,6 +1224,7 @@ static void navit_cmd_int_stack_size(struct navit *this, char *function, struct
     list[1] = NULL;
     *out = list;
     cmd_int_var_stack = g_list_remove_link(cmd_int_var_stack,cmd_int_var_stack);
+    return 0;
 }
 
 static struct attr ** navit_get_coord(struct navit *this, struct attr **in, struct pcoord *pc) {
@@ -1268,63 +1260,64 @@ static struct attr ** navit_get_coord(struct navit *this, struct attr **in, stru
     return in;
 }
 
-static void navit_cmd_set_destination(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                      int *valid) {
+static int navit_cmd_set_destination(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct pcoord pc;
     char *description=NULL;
     in=navit_get_coord(this, in, &pc);
     if (!in)
-        return;
+        return 0;
     if (in[0] && ATTR_IS_STRING(in[0]->type))
         description=in[0]->u.str;
     navit_set_destination(this, &pc, description, 1);
+    return 0;
 }
 
 
-static void navit_cmd_route_remove_next_waypoint(struct navit *this, char *function, struct attr **in,
-        struct attr ***out,
-        int *valid) {
+static int navit_cmd_route_remove_next_waypoint(struct navit *this, char *function, struct attr **in,
+        struct attr ***out) {
     navit_remove_waypoint(this);
+    return 0;
 }
 
 
-static void navit_cmd_route_remove_last_waypoint(struct navit *this, char *function, struct attr **in,
-        struct attr ***out,
-        int *valid) {
+static int navit_cmd_route_remove_last_waypoint(struct navit *this, char *function, struct attr **in,
+        struct attr ***out) {
     navit_remove_nth_waypoint(this, navit_get_destination_count(this)-1);
+    return 0;
 }
 
 
-static void navit_cmd_set_center(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int navit_cmd_set_center(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct pcoord pc;
     int set_timeout=0;
     in=navit_get_coord(this, in, &pc);
     if (!in)
-        return;
+        return 0;
     if(in[0] && ATTR_IS_INT(in[0]->type))
         set_timeout=in[0]->u.num!=0;
     navit_set_center(this, &pc, set_timeout);
+    return 0;
 }
 
 
-static void navit_cmd_set_position(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                   int *valid) {
+static int navit_cmd_set_position(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct pcoord pc;
     in=navit_get_coord(this, in, &pc);
     if (!in)
-        return;
+        return 0;
     navit_set_position(this, &pc);
+    return 0;
 }
 
 
-static void navit_cmd_fmt_coordinates(struct navit *this, char *function, struct attr **in, struct attr ***out,
-                                      int *valid) {
+static int navit_cmd_fmt_coordinates(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct attr attr;
     attr.type=attr_type_string_begin;
     attr.u.str="Fix me";
     if (out) {
         *out=attr_generic_add_attr(*out, &attr);
     }
+    return 0;
 }
 
 /**
@@ -1334,10 +1327,9 @@ static void navit_cmd_fmt_coordinates(struct navit *this, char *function, struct
  * @param function unused (needed to match command function signature)
  * @param in input attributes in[0] - separator, in[1..] - attributes to join
  * @param out output attribute joined attribute as string
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_strjoin(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int navit_cmd_strjoin(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     struct attr attr;
     gchar *ret, *sep;
     int i;
@@ -1360,6 +1352,7 @@ static void navit_cmd_strjoin(struct navit *this, char *function, struct attr **
         }
         g_free(ret);
     }
+    return 0;
 }
 
 /**
@@ -1369,10 +1362,9 @@ static void navit_cmd_strjoin(struct navit *this, char *function, struct attr **
  * @param function unused (needed to match command function signature)
  * @param in input attributes in[0] - name of executable, in[1..] - parameters
  * @param out output attribute unused
- * @param valid unused
- * @returns nothing
+ * @returns 0
  */
-static void navit_cmd_spawn(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid) {
+static int navit_cmd_spawn(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     int i,j, nparms, nvalid;
     char ** argv=NULL;
     struct spawn_process_info *pi;
@@ -1418,6 +1410,7 @@ static void navit_cmd_spawn(struct navit *this, char *function, struct attr **in
             g_free(argv[i]);
         g_free(argv);
     }
+    return 0;
 }
 
 
@@ -1887,12 +1880,12 @@ void navit_say(struct navit *this_, const char *text) {
  * @brief Toggles the navigation announcer for navit
  * @param this_ The navit object
  */
-static void navit_cmd_announcer_toggle(struct navit *this_) {
+static int navit_cmd_announcer_toggle(struct navit *this_, char *function, struct attr **in, struct attr ***out) {
     struct attr attr, speechattr;
 
     // search for the speech attribute
     if(!navit_get_attr(this_, attr_speech, &speechattr, NULL))
-        return;
+        return 0;
     // find out if the corresponding attribute attr_active has been set
     if(speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL)) {
         // flip it then...
@@ -1905,10 +1898,11 @@ static void navit_cmd_announcer_toggle(struct navit *this_) {
 
     // apply the new state
     if(!speech_set_attr(speechattr.u.speech, &attr))
-        return;
+        return 0;
 
     // announce that the speech attribute has changed
     callback_list_call_attr_1(this_->attr_cbl, attr_speech, this_);
+    return 0;
 }
 
 void navit_speak(struct navit *this_) {
@@ -2058,7 +2052,7 @@ void navit_window_roadbook_new(struct navit *this_) {
     navit_window_roadbook_update(this_);
 }
 
-void navit_init(struct navit *this_) {
+int navit_init(struct navit *this_) {
     struct mapset *ms;
     struct map *map;
     int callback;
@@ -2135,7 +2129,7 @@ void navit_init(struct navit *this_) {
         }
 
         attr = g_new0(struct attr, 1);
-        iter = navit_attr_iter_new();
+        iter = navit_attr_iter_new(NULL);
         map = NULL;
         while (navit_get_attr(this_, attr_traffic, attr, iter)) {
             traffic = (struct traffic *) attr->u.navit_object;
@@ -2213,6 +2207,7 @@ void navit_init(struct navit *this_) {
         navit_draw_async(this_, 1);
     if (callback)
         callback_list_call_attr_1(this_->attr_cbl, attr_graphics_ready, this_);
+    return 0;
 }
 
 void navit_zoom_to_rect(struct navit *this_, struct coord_rect *r) {
@@ -2280,8 +2275,9 @@ void navit_zoom_to_route(struct navit *this_, int orientation) {
     navit_zoom_to_rect(this_, &r);
 }
 
-static void navit_cmd_zoom_to_route(struct navit *this) {
+static int navit_cmd_zoom_to_route(struct navit *this, char *function, struct attr **in, struct attr ***out) {
     navit_zoom_to_route(this, 0);
+    return 0;
 }
 
 
@@ -2484,8 +2480,9 @@ static void navit_set_center_cursor_draw(struct navit *this_) {
  *
  *@param this_ The navit object
  */
-static void navit_cmd_set_center_cursor(struct navit *this_) {
+static int navit_cmd_set_center_cursor(struct navit *this_, char *function, struct attr **in, struct attr ***out) {
     navit_set_center_cursor_draw(this_);
+    return 0;
 }
 
 void navit_set_center_screen(struct navit *this_, struct point *p, int set_timeout) {
@@ -2951,7 +2948,7 @@ struct layout *navit_get_layout_by_name(struct navit *this_, const char *layout_
 
     if (!layout_name)
         return NULL;
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
     while (navit_get_attr(this_, attr_layout, &layout_attr, iter)) {
         if (strcmp(layout_attr.u.layout->name, layout_name) == 0) {
             result = layout_attr.u.layout;
@@ -3112,7 +3109,7 @@ int navit_remove_attr(struct navit *this_, struct attr *attr) {
 }
 
 struct attr_iter *
-navit_attr_iter_new(void) {
+navit_attr_iter_new(void * unused) {
     return g_new0(struct attr_iter, 1);
 }
 
@@ -3529,7 +3526,6 @@ void navit_layout_switch(struct navit *n) {
  * @param function unused
  * @param in input attributes in[0], a string, see usage below
  * @param out output attribute unused
- * @param valid unused
  *
  *
  * usage :
@@ -3543,20 +3539,19 @@ void navit_layout_switch(struct navit *n) {
  * the version of the active layout (day/night/undefined)
  */
 static
-void navit_cmd_switch_layout_day_night(struct navit *this_, char *function, struct attr **in, struct attr ***out,
-                                       int valid) {
+int navit_cmd_switch_layout_day_night(struct navit *this_, char *function, struct attr **in, struct attr *** out) {
 
     if (!(in && in[0] && ATTR_IS_STRING(in[0]->type))) {
-        return;
+        return 0;
     }
 
     dbg(lvl_debug," called with mode =%s",in[0]->u.str);
 
     if (!this_->layout_current)
-        return;
+        return 0;
 
     if (!this_->vehicle)
-        return;
+        return 0;
 
     if (!strcmp(in[0]->u.str,"manual")) {
         this_->auto_switch = FALSE;
@@ -3585,7 +3580,7 @@ void navit_cmd_switch_layout_day_night(struct navit *this_, char *function, stru
     }
 
     dbg(lvl_debug,"auto = %i",this_->auto_switch);
-    return;
+    return 0;
 }
 
 int navit_set_vehicle_by_name(struct navit *n,const char *name) {
@@ -3593,7 +3588,7 @@ int navit_set_vehicle_by_name(struct navit *n,const char *name) {
     struct attr_iter *iter;
     struct attr vehicle_attr, name_attr;
 
-    iter=navit_attr_iter_new();
+    iter=navit_attr_iter_new(NULL);
 
     while (navit_get_attr(n,attr_vehicle,&vehicle_attr,iter)) {
         v=vehicle_attr.u.vehicle;
@@ -3703,7 +3698,7 @@ void navit_destroy(struct navit *this_) {
         cmd_attr_var_hash=NULL;
     }
     if(cmd_int_var_stack) {
-        g_list_foreach(cmd_int_var_stack, (GFunc)attr_free, NULL);
+        g_list_foreach(cmd_int_var_stack, (GFunc)attr_free_g, NULL);
         g_list_free(cmd_int_var_stack);
         cmd_int_var_stack=NULL;
     }
diff --git a/navit/navit.h b/navit/navit.h
index f543a7baf..d715d814d 100644
--- a/navit/navit.h
+++ b/navit/navit.h
@@ -98,7 +98,7 @@ void navit_say(struct navit *this_, const char *text);
 void navit_speak(struct navit *this_);
 void navit_window_roadbook_destroy(struct navit *this_);
 void navit_window_roadbook_new(struct navit *this_);
-void navit_init(struct navit *this_);
+int navit_init(struct navit *this_);
 void navit_zoom_to_rect(struct navit *this_, struct coord_rect *r);
 void navit_zoom_to_route(struct navit *this_, int orientation);
 void navit_set_center(struct navit *this_, struct pcoord *center, int set_timeout);
@@ -110,7 +110,7 @@ struct layout *navit_get_layout_by_name(struct navit *this_, const char *layout_
 void navit_update_current_layout(struct navit *this_, struct layout *layout);
 int navit_add_attr(struct navit *this_, struct attr *attr);
 int navit_remove_attr(struct navit *this_, struct attr *attr);
-struct attr_iter *navit_attr_iter_new(void);
+struct attr_iter *navit_attr_iter_new(void * unused);
 void navit_attr_iter_destroy(struct attr_iter *iter);
 void navit_add_callback(struct navit *this_, struct callback *cb);
 void navit_remove_callback(struct navit *this_, struct callback *cb);
diff --git a/navit/plugin.c b/navit/plugin.c
index 82fcc61c5..259d8e7e6 100644
--- a/navit/plugin.c
+++ b/navit/plugin.c
@@ -220,7 +220,7 @@ void plugin_destroy(struct plugin *pl) {
 }
 
 struct plugins *
-plugins_new(void) {
+plugins_new(struct attr * in, struct attr ** out) {
     struct plugins *ret=g_new0(struct plugins, 1);
     ret->hash=g_hash_table_new(g_str_hash, g_str_equal);
     pls=ret;
@@ -300,7 +300,7 @@ plugin_new(struct attr *parent, struct attr **attrs) {
 #endif
 }
 
-void plugins_init(struct plugins *pls) {
+int plugins_init(struct plugins *pls) {
 #ifdef USE_PLUGINS
     struct plugin *pl;
     GList *l;
@@ -322,6 +322,7 @@ void plugins_init(struct plugins *pls) {
         dbg(lvl_error, "Warning: No plugins found. Is Navit installed correctly?");
     }
 #endif
+    return 0;
 }
 
 void plugins_destroy(struct plugins *pls) {
diff --git a/navit/plugin.h b/navit/plugin.h
index 5c9636aa2..911daa440 100644
--- a/navit/plugin.h
+++ b/navit/plugin.h
@@ -33,26 +33,26 @@ struct plugin;
  * offered by a plugin.
  */
 enum plugin_category {
-	/** Category for plugins which implement a graphics backend. */
-	plugin_category_graphics,
-	/** Category for plugins which implement a GUI frontend. */
-	plugin_category_gui,
-	/** Category for plugins which implement a driver for providing/loading map data. */
-	plugin_category_map,
-	/** Category for plugins which implement an OSD. */
-	plugin_category_osd,
-	/** Category for plugins which implement speech output. */
-	plugin_category_speech,
-	/** Category for plugins which supply position data (typically from a GPS receiver). */
-	plugin_category_vehicle,
-	/** Category for plugins which implement/wrap an event subsystem. */
-	plugin_category_event,
-	/** Category for plugins which load fonts. */
-	plugin_category_font,
-	/** Category for plugins which retrieve traffic information. */
-	plugin_category_traffic,
-	/** Dummy for last entry. */
-	plugin_category_last,
+    /** Category for plugins which implement a graphics backend. */
+    plugin_category_graphics,
+    /** Category for plugins which implement a GUI frontend. */
+    plugin_category_gui,
+    /** Category for plugins which implement a driver for providing/loading map data. */
+    plugin_category_map,
+    /** Category for plugins which implement an OSD. */
+    plugin_category_osd,
+    /** Category for plugins which implement speech output. */
+    plugin_category_speech,
+    /** Category for plugins which supply position data (typically from a GPS receiver). */
+    plugin_category_vehicle,
+    /** Category for plugins which implement/wrap an event subsystem. */
+    plugin_category_event,
+    /** Category for plugins which load fonts. */
+    plugin_category_font,
+    /** Category for plugins which retrieve traffic information. */
+    plugin_category_traffic,
+    /** Dummy for last entry. */
+    plugin_category_last,
 };
 #endif
 
@@ -95,8 +95,8 @@ void plugin_call_##name(t1 p1,t2 p2, t3 p3, t4 p4) PLUGIN_CALL(name,p1,p2,p3,p4)
 PLUGIN_REGISTER(name,t1 p1,t2 p2,t3 p3,t4 p4)
 
 struct name_val {
-	char *name;
-	void *val;
+    char *name;
+    void *val;
 };
 
 GList *plugin_categories[plugin_category_last];
@@ -162,9 +162,9 @@ void plugin_set_lazy(struct plugin *pl, int lazy);
 void plugin_call_init(struct plugin *pl);
 void plugin_unload(struct plugin *pl);
 void plugin_destroy(struct plugin *pl);
-struct plugins *plugins_new(void);
+struct plugins *plugins_new(struct attr *, struct attr **);
 struct plugin *plugin_new(struct attr *parent, struct attr ** attrs);
-void plugins_init(struct plugins *pls);
+int plugins_init(struct plugins *pls);
 void plugins_destroy(struct plugins *pls);
 void *plugin_get_category(enum plugin_category category, const char *category_name, const char *name);
 /* end of prototypes */
diff --git a/navit/popup.c b/navit/popup.c
index 49f379853..79d997b46 100644
--- a/navit/popup.c
+++ b/navit/popup.c
@@ -108,7 +108,7 @@ static void popup_traffic_distortion_delay(struct item *item, int delay) {
 static void popup_set_destination(struct navit *nav, struct pcoord *pc) {
     struct coord c;
     struct coord_geo g;
-    char buffer[1024];
+    char buffer[1024 +10]; /* +10 for "Map Point "*/
     char buffer_geo[1024];
     c.x = pc->x;
     c.y = pc->y;
@@ -141,7 +141,7 @@ static void popup_set_bookmark(struct navit *nav, struct pcoord *pc) {
     struct attr attr;
     struct coord c;
     struct coord_geo g;
-    char buffer[1024];
+    char buffer[1024 + 10]; /* + 10 for "Map Point " */
     char buffer_geo[1024];
     c.x = pc->x;
     c.y = pc->y;
diff --git a/navit/route.c b/navit/route.c
index 6ee352c65..652ae6d54 100644
--- a/navit/route.c
+++ b/navit/route.c
@@ -1072,8 +1072,13 @@ static void route_free_selection(struct map_selection *sel) {
 }
 
 
+/* for compatibility to GFunc */
+static void route_info_free_g(struct route_info *inf, void * unused) {
+    route_info_free(inf);
+}
+
 static void route_clear_destinations(struct route *this_) {
-    g_list_foreach(this_->destinations, (GFunc)route_info_free, NULL);
+    g_list_foreach(this_->destinations, (GFunc)route_info_free_g, NULL);
     g_list_free(this_->destinations);
     this_->destinations=NULL;
 }
diff --git a/navit/traffic.c b/navit/traffic.c
index 035707934..9705abbdd 100644
--- a/navit/traffic.c
+++ b/navit/traffic.c
@@ -3408,7 +3408,7 @@ static int traffic_message_restore_segments(struct traffic_message * this_, stru
     struct map_rect * mr;
     struct item * map_item;
     int * default_flags;
-    int item_flags, segmented, maxspeed;
+    int item_flags, segmented, maxspeed=INT_MAX;
     struct coord map_c;
 
     /*
@@ -4152,7 +4152,7 @@ static void traffic_set_shared(struct traffic *this_) {
     dbg(lvl_debug, "enter");
 
     if (!this_->shared) {
-        iter = navit_attr_iter_new();
+        iter = navit_attr_iter_new(NULL);
         while (navit_get_attr(this_->navit, attr_traffic, &attr, iter)) {
             traffic = (struct traffic *) attr.u.navit_object;
             if (traffic->shared)
diff --git a/navit/xmlconfig.c b/navit/xmlconfig.c
index 476997c2d..c47c82163 100644
--- a/navit/xmlconfig.c
+++ b/navit/xmlconfig.c
@@ -1304,13 +1304,14 @@ navit_object_ref(struct navit_object *obj) {
     return obj;
 }
 
-void navit_object_unref(struct navit_object *obj) {
+void* navit_object_unref(struct navit_object *obj) {
     if (obj) {
         obj->refcount--;
         dbg(lvl_debug,"refcount %s %p %d",attr_to_name(obj->func->type),obj,obj->refcount);
         if (obj->refcount <= 0 && obj->func && obj->func->destroy)
             obj->func->destroy(obj);
     }
+    return NULL;
 }
 
 struct attr_iter {
@@ -1318,7 +1319,7 @@ struct attr_iter {
 };
 
 struct attr_iter *
-navit_object_attr_iter_new(void) {
+navit_object_attr_iter_new(void * unused) {
     return g_new0(struct attr_iter, 1);
 }
 
diff --git a/navit/xmlconfig.h b/navit/xmlconfig.h
index 56f118eb2..d5697d53c 100644
--- a/navit/xmlconfig.h
+++ b/navit/xmlconfig.h
@@ -78,54 +78,56 @@ typedef void *(*object_func_unref)(void *);
  * see fit.
  */
 struct object_func {
-	enum attr_type type;                           /**< The object type */
-	void *(*create)(struct attr *parent, struct attr **attrs); /**< Function to create a new object instance */
-	int (*get_attr)(void *, enum attr_type type, struct attr *attr, struct attr_iter *iter); /**< Function
+    enum attr_type type;                           /**< The object type */
+    void *(*create)(struct attr *parent, struct attr **attrs); /**< Function to create a new object instance */
+    int (*get_attr)(void *, enum attr_type type, struct attr *attr, struct attr_iter *iter); /**< Function
 	                                                 *  to get an attribute of the object,
 	                                                 *  set to `navit_object_get_attr` for default behavior */
-	struct attr_iter *(*iter_new)(void *);         /**< Function to obtain a new attribute iterator,
+    struct attr_iter *(*iter_new)(void *);         /**< Function to obtain a new attribute iterator,
 	                                                 *  set to `navit_object_attr_iter_new` for default
 	                                                 *  behavior, can be NULL for some object types */
-	void (*iter_destroy)(struct attr_iter *);      /**< Function to destroy an attribute iterator,
+    void (*iter_destroy)(struct attr_iter *);      /**< Function to destroy an attribute iterator,
 	                                                 *  set to `navit_object_attr_iter_destroy` for default
 	                                                 *  behavior, can be NULL for some object types */
-	int (*set_attr)(void *, struct attr *attr);    /**< Function to set an attribute,
+    int (*set_attr)(void *, struct attr *attr);    /**< Function to set an attribute,
 	                                                 *  set to `navit_object_set_attr` for default behavior,
 	                                                 *  can be NULL for some object types */
-	int (*add_attr)(void *, struct attr *attr);    /**< Function to add an attribute,
+    int (*add_attr)(void *, struct attr *attr);    /**< Function to add an attribute,
 	                                                 *  set to `navit_object_add_attr` for default behavior,
 	                                                 *  can be NULL for some object types */
-	int (*remove_attr)(void *, struct attr *attr); /**< Function to remove an attribute,
+    int (*remove_attr)(void *, struct attr *attr); /**< Function to remove an attribute,
 	                                                 *  set to `navit_object_remove_attr` for default behavior,
 	                                                 *  can be NULL for some object types */
-	int (*init)(void *);                           /**< TODO,
+    int (*init)(void *);                           /**< TODO,
 	                                                 *  can be NULL for some object types */
-	void (*destroy)(void *);                       /**< Function to destroy an object instance,
+    void (*destroy)(void *);                       /**< Function to destroy an object instance,
 	                                                 *  set to `navit_object_destroy` for default behavior,
 	                                                 *  can be NULL */
-	void *(*dup)(void *);                          /**< Function to create a copy of an object instance */
-	void *(*ref)(void *);                          /**< Function to increase the reference count for an
+    void *(*dup)(void *);                          /**< Function to create a copy of an object instance */
+    void *(*ref)(void *);                          /**< Function to increase the reference count for an
 	                                                 *  object instance, set to `navit_object_ref` for
 	                                                 *  default behavior, can be NULL for some object types */
-	void *(*unref)(void *);                        /**< Function to decrease the reference count for an
+    void *(*unref)(void *);                        /**< Function to decrease the reference count for an
 	                                                 *  object instance, set to `navit_object_unref` for
 	                                                 *  default behavior, can be NULL for some object types */
 };
 
-extern struct object_func map_func, mapset_func, navit_func, osd_func, tracking_func, vehicle_func, maps_func, layout_func, roadprofile_func, vehicleprofile_func, layer_func, config_func, profile_option_func, script_func, log_func, speech_func, navigation_func, route_func, traffic_func;
+extern struct object_func map_func, mapset_func, navit_func, osd_func, tracking_func, vehicle_func, maps_func,
+           layout_func, roadprofile_func, vehicleprofile_func, layer_func, config_func, profile_option_func, script_func, log_func,
+           speech_func, navigation_func, route_func, traffic_func;
 
 #define HAS_OBJECT_FUNC(x) ((x) == attr_map || (x) == attr_mapset || (x) == attr_navit || (x) == attr_osd || (x) == attr_trackingo || (x) == attr_vehicle || (x) == attr_maps || (x) == attr_layout || (x) == attr_roadprofile || (x) == attr_vehicleprofile || (x) == attr_layer || (x) == attr_config || (x) == attr_profile_option || (x) == attr_script || (x) == attr_log || (x) == attr_speech || (x) == attr_navigation || (x) == attr_route)
 
 #define NAVIT_OBJECT struct object_func *func; int refcount; struct attr **attrs;
 struct navit_object {
-	NAVIT_OBJECT
+    NAVIT_OBJECT
 };
 
 int navit_object_set_methods(void *in, int in_size, void *out, int out_size);
 struct navit_object *navit_object_new(struct attr **attrs, struct object_func *func, int size);
 struct navit_object *navit_object_ref(struct navit_object *obj);
-void navit_object_unref(struct navit_object *obj);
-struct attr_iter * navit_object_attr_iter_new(void);
+void* navit_object_unref(struct navit_object *obj);
+struct attr_iter * navit_object_attr_iter_new(void * unused);
 void navit_object_attr_iter_destroy(struct attr_iter *iter);
 int navit_object_get_attr(struct navit_object *obj, enum attr_type type, struct attr *attr, struct attr_iter *iter);
 void navit_object_callbacks(struct navit_object *obj, struct attr *attr);
@@ -140,10 +142,12 @@ typedef GError xmlerror;
 enum attr_type;
 struct object_func *object_func_lookup(enum attr_type type);
 int xml_parse_file(char *filename, void *data,
-		void (*start)(xml_context *, const char *, const char **, const char **, void *, GError **),
-		void (*end)(xml_context *, const char *, void *, GError **),
-		void (*text)(xml_context *, const char *, gsize, void *, GError **));
-int xml_parse_text(const char *document, void *data, void (*start)(xml_context *, const char *, const char **, const char **, void *, GError **), void (*end)(xml_context *, const char *, void *, GError **), void (*text)(xml_context*, const char *, gsize, void *, GError **));
+                   void (*start)(xml_context *, const char *, const char **, const char **, void *, GError **),
+                   void (*end)(xml_context *, const char *, void *, GError **),
+                   void (*text)(xml_context *, const char *, gsize, void *, GError **));
+int xml_parse_text(const char *document, void *data, void (*start)(xml_context *, const char *, const char **,
+                   const char **, void *, GError **), void (*end)(xml_context *, const char *, void *, GError **),
+                   void (*text)(xml_context*, const char *, gsize, void *, GError **));
 gboolean config_load(const char *filename, xmlerror **error);
 //static void xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error);
 
diff --git a/po/cy.po.in b/po/cy.po.in
index db524f7f2..09d30dec3 100644
--- a/po/cy.po.in
+++ b/po/cy.po.in
@@ -1,5 +1,5 @@
 # Welsh translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2019 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Michael von Glasow https://launchpad.net/~michael-vonglasow
@@ -8,7 +8,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-06-14 23:55+0000\n"
 "Last-Translator: Padi Phillips <Unknown>\n"
@@ -154,7 +154,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr ""
 
@@ -367,7 +366,6 @@ msgstr ""
 msgid "You have reached your destination %s"
 msgstr ""
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr ""
 
@@ -384,9 +382,15 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr ""
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr ""
 
@@ -447,6 +451,7 @@ msgid "Anguilla"
 msgstr ""
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr ""
 
@@ -459,6 +464,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr ""
 
@@ -467,6 +473,7 @@ msgid "Antarctica"
 msgstr ""
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr ""
 
@@ -475,10 +482,12 @@ msgid "American Samoa"
 msgstr ""
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr ""
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr ""
 
@@ -491,10 +500,12 @@ msgid "Aland Islands"
 msgstr ""
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr ""
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
@@ -507,6 +518,7 @@ msgid "Bangladesh"
 msgstr ""
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr ""
 
@@ -515,6 +527,7 @@ msgid "Burkina Faso"
 msgstr ""
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr ""
 
@@ -523,6 +536,7 @@ msgid "Bahrain"
 msgstr ""
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr ""
 
@@ -543,6 +557,7 @@ msgid "Brunei Darussalam"
 msgstr ""
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr ""
 
@@ -551,6 +566,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr ""
 
@@ -567,10 +583,12 @@ msgid "Bouvet Island"
 msgstr ""
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr ""
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr ""
 
@@ -579,6 +597,7 @@ msgid "Belize"
 msgstr ""
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr ""
 
@@ -587,6 +606,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr ""
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr ""
 
@@ -599,10 +619,12 @@ msgid "Congo"
 msgstr ""
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr ""
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr ""
 
@@ -611,6 +633,7 @@ msgid "Cook Islands"
 msgstr ""
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr ""
 
@@ -619,10 +642,12 @@ msgid "Cameroon"
 msgstr ""
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr ""
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr ""
 
@@ -631,6 +656,7 @@ msgid "Costa Rica"
 msgstr ""
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr ""
 
@@ -647,14 +673,17 @@ msgid "Christmas Island"
 msgstr ""
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr ""
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr ""
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr ""
 
@@ -663,6 +692,7 @@ msgid "Djibouti"
 msgstr ""
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr ""
 
@@ -671,6 +701,7 @@ msgid "Dominica"
 msgstr ""
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr ""
 
@@ -679,10 +710,12 @@ msgid "Algeria"
 msgstr ""
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr ""
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr ""
 
@@ -699,14 +732,17 @@ msgid "Eritrea"
 msgstr ""
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr ""
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr ""
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr ""
 
@@ -723,10 +759,12 @@ msgid "Micronesia, Federated States of"
 msgstr ""
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr ""
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr ""
 
@@ -735,6 +773,7 @@ msgid "Gabon"
 msgstr ""
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr ""
 
@@ -771,6 +810,7 @@ msgid "Gambia"
 msgstr ""
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr ""
 
@@ -783,6 +823,7 @@ msgid "Equatorial Guinea"
 msgstr ""
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr ""
 
@@ -803,6 +844,7 @@ msgid "Guinea-Bissau"
 msgstr ""
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr ""
 
@@ -819,26 +861,32 @@ msgid "Honduras"
 msgstr ""
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr ""
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr ""
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr ""
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr ""
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr ""
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr ""
 
@@ -847,6 +895,7 @@ msgid "Isle of Man"
 msgstr ""
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr ""
 
@@ -855,18 +904,22 @@ msgid "British Indian Ocean Territory"
 msgstr ""
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr ""
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr ""
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr ""
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr ""
 
@@ -875,6 +928,7 @@ msgid "Jersey"
 msgstr ""
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr ""
 
@@ -883,14 +937,17 @@ msgid "Jordan"
 msgstr ""
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr ""
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr ""
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr ""
 
@@ -927,6 +984,7 @@ msgid "Cayman Islands"
 msgstr ""
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr ""
 
@@ -951,26 +1009,32 @@ msgid "Sri Lanka"
 msgstr ""
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr ""
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr ""
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr ""
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr ""
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr ""
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr ""
 
@@ -995,6 +1059,7 @@ msgid "Saint Martin (French part)"
 msgstr ""
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr ""
 
@@ -1015,6 +1080,7 @@ msgid "Myanmar"
 msgstr ""
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr ""
 
@@ -1055,10 +1121,12 @@ msgid "Malawi"
 msgstr ""
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr ""
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr ""
 
@@ -1067,10 +1135,12 @@ msgid "Mozambique"
 msgstr ""
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr ""
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr ""
 
@@ -1091,6 +1161,7 @@ msgid "Nicaragua"
 msgstr ""
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr ""
 
@@ -1099,6 +1170,7 @@ msgid "Norway"
 msgstr ""
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr ""
 
@@ -1111,6 +1183,7 @@ msgid "Niue"
 msgstr ""
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr ""
 
@@ -1123,6 +1196,7 @@ msgid "Panama"
 msgstr ""
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr ""
 
@@ -1135,14 +1209,17 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr ""
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr ""
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr ""
 
@@ -1163,6 +1240,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr ""
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr ""
 
@@ -1171,6 +1249,7 @@ msgid "Palau"
 msgstr ""
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr ""
 
@@ -1179,10 +1258,12 @@ msgid "Qatar"
 msgstr ""
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr ""
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr ""
 
@@ -1191,14 +1272,17 @@ msgid "Serbia"
 msgstr ""
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr ""
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr ""
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -1219,6 +1303,7 @@ msgid "Sweden"
 msgstr ""
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr ""
 
@@ -1235,6 +1320,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr ""
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr ""
 
@@ -1255,6 +1341,7 @@ msgid "Somalia"
 msgstr ""
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr ""
 
@@ -1299,6 +1386,7 @@ msgid "Togo"
 msgstr ""
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr ""
 
@@ -1315,6 +1403,7 @@ msgid "Timor-Leste"
 msgstr ""
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr ""
 
@@ -1327,6 +1416,7 @@ msgid "Tonga"
 msgstr ""
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr ""
 
@@ -1343,14 +1433,17 @@ msgid "Taiwan, Province of China"
 msgstr ""
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr ""
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr ""
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr ""
 
@@ -1363,6 +1456,7 @@ msgid "United States"
 msgstr ""
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr ""
 
@@ -1379,6 +1473,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr ""
 
@@ -1415,6 +1510,7 @@ msgid "Mayotte"
 msgstr ""
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr ""
 
@@ -1442,23 +1538,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1599,6 +1695,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr ""
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1668,7 +1767,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1676,15 +1780,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1693,9 +1797,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1708,7 +1809,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1755,7 +1856,7 @@ msgid "OT"
 msgstr ""
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
+msgid "Route %4.1f%s    %02d:%02d ETA"
 msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
@@ -1978,6 +2079,9 @@ msgstr ""
 msgid "Show Locale"
 msgstr ""
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr ""
 
@@ -2016,729 +2120,861 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
+msgid "Vehicle Position"
 msgstr ""
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
+msgid "Main menu"
 msgstr ""
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgid "Settings"
 msgstr ""
 
-msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+msgid "Tools"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Route"
 msgstr ""
 
-msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+msgid "About"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
+msgid "Quit"
 msgstr ""
 
-msgid "Cancel"
+msgid "Actions"
 msgstr ""
 
-msgid "filenamePath"
+msgid ""
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+msgid "Coordinates"
 msgstr ""
 
-msgid "Whole Planet"
+msgid ""
+"Stop\n"
+"Navigation"
 msgstr ""
 
-msgid "Africa"
+msgid "Display"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Fullscreen"
 msgstr ""
 
-msgid "Asia"
+msgid "Window Mode"
 msgstr ""
 
-msgid "Korea"
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Taiwan"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "UAE+Other"
+msgid "Layers"
 msgstr ""
 
-msgid "Oceania"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Tasmania"
+msgid "Description"
 msgstr ""
 
-msgid "Victoria"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "New South Wales"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "Europe"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Western Europe"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Azores"
+msgid "car_shortest"
 msgstr ""
 
-msgid "BeNeLux"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Alsace"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Aquitaine"
+msgid "horse"
 msgstr ""
 
-msgid "Auvergne"
+msgid "Truck"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Vehicle Position"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Main menu"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-msgid "Settings"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-msgid "Tools"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
 
-msgid "Route"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
 msgstr ""
 
-msgid "About"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
 msgstr ""
 
-msgid "Quit"
+#. Android resource: @strings/saarland
+msgid "Saarland"
 msgstr ""
 
-msgid "Actions"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
 msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
 
-msgid "Display"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
 msgstr ""
 
-msgid "Fullscreen"
+#. Android resource: @strings/galicia
+msgid "Galicia"
 msgstr ""
 
-msgid "Window Mode"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
 msgstr ""
 
-msgid "Layers"
+#. Android resource: @strings/england
+msgid "England"
 msgstr ""
 
-msgid "Description"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
 msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
 msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""