Merge remote-tracking branch 'upstream/trunk' into sailfish_build

18 files changed, 223 insertions, 43 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe9457e23..310639de1 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(NAVIT_VERSION_PATCH "1")
 set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVIT_VERSION_PATCH}")
 
 set(PACKAGE_NAME "navit-git")
-set(PACKAGE "navit")
+set(PACKAGE "navit" CACHE STRING "Navit package name")
 set(PACKAGE_STRING "${PACKAGE} ${PACKAGE_VERSION}")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
@@ -28,12 +28,19 @@ IF(NOT CMAKE_BUILD_TYPE)
    SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
+# binary name
+set(NAVIT_BINARY navit CACHE STRING "Navit binary name")
 # install path
-set(BIN_DIR bin)
-set(SHARE_DIR share/navit)
-set(LOCALE_DIR share/locale)
-set(IMAGE_DIR share/navit/xpm)
-set(MAN_DIR share/man/man1)
+set(BIN_DIR bin CACHE PATH "Navit bin path")
+add_definitions ("-DBIN_DIR=\"${BIN_DIR}\"")
+set(SHARE_DIR share/navit CACHE PATH "Navit share path")
+add_definitions ("-DSHARE_DIR=\"${SHARE_DIR}\"")
+set(LOCALE_DIR share/locale CACHE PATH "Navit locale path")
+add_definitions ("-DLOCALE_DIR=\"${LOCALE_DIR}\"")
+set(IMAGE_DIR share/navit/xpm CACHE PATH "Navit image path")
+add_definitions ("-DIMAGE_DIR=\"${IMAGE_DIR}\"")
+set(MAN_DIR share/man/man1 CACHE PATH "Navit man path")
+add_definitions ("-DMAN_DIR=\"${MAN_DIR}\"")
 # LIB_DIR
 IF(UNIX AND NOT ANDROID AND NOT APPLE)
     IF (NOT LIBDIR)
@@ -41,10 +48,10 @@ IF(UNIX AND NOT ANDROID AND NOT APPLE)
         MESSAGE(STATUS "You can set it manually with -DLIBDIR=<value>")
         # check 64 bit
         IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
-            SET(LIB_DIR lib)
+		SET(LIB_DIR lib/navit CACHE PATH "Navit 32bit bin path")
             MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")
         ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4)
-            SET(LIB_DIR lib64)
+		SET(LIB_DIR lib64/navit CACHE PATH "Navit 64bit bin path")
             MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")
         ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
     ELSE (NOT LIBDIR)
@@ -52,12 +59,12 @@ IF(UNIX AND NOT ANDROID AND NOT APPLE)
         MESSAGE(STATUS "   LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'")
     ENDIF (NOT LIBDIR)
 ELSE (UNIX AND NOT ANDROID AND NOT APPLE)
-    SET(LIB_DIR lib)
+	SET(LIB_DIR lib/navit CACHE PATH "Navit unix bin path")
 ENDIF (UNIX AND NOT ANDROID AND NOT APPLE)
-
 foreach(EXTRA_MODULE ${EXTRA_MODULES})
    add_module(${EXTRA_MODULE} "extra module specified" TRUE)
 endforeach()
+add_definitions ("-DLIB_DIR=\"${LIB_DIR}\"")
 
 if (EXTRA_LIBS)
 	list(APPEND NAVIT_LIBS ${EXTRA_LIBS})
@@ -634,7 +641,7 @@ if(CMAKE_SIZEOF_VOID_P LESS 8)
    set_with_reason(BUILD_MAPTOOL "maptool works only on 64 bit architectures" FALSE)
 endif()
 
-set(LOCALEDIR "${LOCALE_DIR}/locale")
+set(LOCALEDIR "${LOCALE_DIR}")
 
 find_program(BZCAT NAMES bzcat)
 if (SAMPLE_MAP)
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake
index 3baf5c9ed..6591d7463 100644
--- a/cmake/navit_macros.cmake
+++ b/cmake/navit_macros.cmake
@@ -70,7 +70,7 @@ macro(module_add_library MODULE_NAME )
       set_target_properties( ${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs")
 
       install(TARGETS ${MODULE_NAME}
-              DESTINATION ${LIB_DIR}/navit/${${MODULE_NAME}_TYPE}
+              DESTINATION ${LIB_DIR}/${${MODULE_NAME}_TYPE}
               PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
    endif()
 endmacro(module_add_library)
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index ceb2ca3c9..886dc1227 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1 +1,5 @@
-INSTALL(FILES maptool.1 navit.1 DESTINATION ${MAN_DIR})
+INSTALL(FILES maptool.1 DESTINATION ${MAN_DIR})
+if(NOT DEFINED NAVIT_BINARY)
+   set(NAVIT_BINARY navit)
+endif()   
+INSTALL(FILES navit.1 DESTINATION ${MAN_DIR} RENAME ${NAVIT_BINARY}.1)
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index 5333c9ff4..c9d56cd34 100644
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -81,7 +81,9 @@ if(NOT ANDROID)
    endif()
    add_executable(navit ${NAVIT_START_SRC})
    target_link_libraries (navit ${NAVIT_LIBNAME})
-   set_target_properties(navit PROPERTIES COMPILE_DEFINITIONS "MODULE=${MODULE_NAME}")
+   if(DEFINED NAVIT_BINARY)
+	   set_target_properties(navit PROPERTIES OUTPUT_NAME ${NAVIT_BINARY})
+   endif(DEFINED NAVIT_BINARY)
    if (BUILD_BUNDLE)
       add_custom_command(OUTPUT resources/share COMMAND mkdir -p resources/share)
       set_source_files_properties(resources/share resources/Icon.png resources/Default.png PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index 1b5d8fb50..a0e252dfe 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -322,7 +322,7 @@ public class Navit extends Activity
 		status_bar_height = (shid > 0) ? resources.getDimensionPixelSize(shid) : 0;

 		action_bar_default_height = (adhid > 0) ? resources.getDimensionPixelSize(adhid) : 0;

 		navigation_bar_height = (nhid > 0) ? resources.getDimensionPixelSize(nhid) : 0;

-		navigation_bar_height_landscape = (nhid > 0) ? resources.getDimensionPixelSize(nhlid) : 0;

+		navigation_bar_height_landscape = (nhlid > 0) ? resources.getDimensionPixelSize(nhlid) : 0;

 		navigation_bar_width = (nwid > 0) ? resources.getDimensionPixelSize(nwid) : 0;

 		Log.d(TAG, String.format("status_bar_height=%d, action_bar_default_height=%d, navigation_bar_height=%d, navigation_bar_height_landscape=%d, navigation_bar_width=%d", 

 				status_bar_height, action_bar_default_height, navigation_bar_height, navigation_bar_height_landscape, navigation_bar_width));

diff --git a/navit/graphics/qt5/QNavitQuick.cpp b/navit/graphics/qt5/QNavitQuick.cpp
index 127ea2113..d2664be27 100644
--- a/navit/graphics/qt5/QNavitQuick.cpp
+++ b/navit/graphics/qt5/QNavitQuick.cpp
@@ -31,6 +31,7 @@
 #include "debug.h"
 #include "window.h"
 #include "callback.h"
+#include "keys.h"
 #if defined(WINDOWS) || defined(WIN32) || defined (HAVE_API_WIN32_CE)
 #include <windows.h>
 #endif
@@ -95,7 +96,68 @@ void QNavitQuick::paint(QPainter *painter)
 
 void QNavitQuick::keyPressEvent(QKeyEvent *event)
 {
-    dbg(lvl_debug,"enter\n");
+   dbg(lvl_debug,"enter\n");
+	char key[2];
+   int keycode;
+   char * text = NULL;
+	
+   keycode = event->key();
+   key[0] = '\0';
+   key[1] = '\0';
+	switch (keycode) {
+	case Qt::Key_Up:
+		key[0]=NAVIT_KEY_UP;
+		break;
+	case Qt::Key_Down:
+		key[0]=NAVIT_KEY_DOWN;
+		break;
+	case Qt::Key_Left:
+		key[0]=NAVIT_KEY_LEFT;
+		break;
+	case Qt::Key_Right:
+		key[0]=NAVIT_KEY_RIGHT;
+		break;
+	case Qt::Key_Backspace:
+		key[0]=NAVIT_KEY_BACKSPACE;
+		break;
+	case Qt::Key_Tab:
+		key[0]=NAVIT_KEY_TAB;
+		break;
+	case Qt::Key_Delete:
+		key[0]=NAVIT_KEY_DELETE;
+		break;
+	case Qt::Key_Escape:
+		key[0]=NAVIT_KEY_BACK;
+		break;
+	case Qt::Key_Return:
+   case Qt::Key_Enter:
+		key[0]=NAVIT_KEY_RETURN;
+		break;
+	case Qt::Key_ZoomIn:
+		key[0]=NAVIT_KEY_ZOOM_IN;
+		break;
+	case Qt::Key_ZoomOut:
+		key[0]=NAVIT_KEY_ZOOM_OUT;
+		break;
+	case Qt::Key_PageUp:
+		key[0]=NAVIT_KEY_PAGE_UP;
+		break;
+	case Qt::Key_PageDown:
+		key[0]=NAVIT_KEY_PAGE_DOWN;
+		break;
+   default:
+      QString str=event->text();
+      if((str != NULL) && (str.size() != 0))
+      {
+         text=str.toUtf8().data();
+      }
+	}
+   if(text != NULL)
+		callback_list_call_attr_1(graphics_priv->callbacks, attr_keypress, (void *)text);
+   else if (key[0])
+		callback_list_call_attr_1(graphics_priv->callbacks, attr_keypress, (void *)key);
+	else
+		dbg(lvl_debug,"keyval 0x%x\n", keycode);
 }
 
 void QNavitQuick::keyReleaseEvent(QKeyEvent *event)
diff --git a/navit/graphics/qt5/QNavitWidget.cpp b/navit/graphics/qt5/QNavitWidget.cpp
index ad32c2cb7..d58f835a6 100644
--- a/navit/graphics/qt5/QNavitWidget.cpp
+++ b/navit/graphics/qt5/QNavitWidget.cpp
@@ -31,6 +31,7 @@
 #include "debug.h"
 #include "window.h"
 #include "callback.h"
+#include "keys.h"
 #if defined(WINDOWS) || defined(WIN32) || defined (HAVE_API_WIN32_CE)
 #include <windows.h>
 #endif
@@ -136,6 +137,73 @@ void QNavitWidget::mouseEvent(int pressed, QMouseEvent *event)
 	}
 }
 
+void QNavitWidget::keyPressEvent(QKeyEvent *event)
+{
+   dbg(lvl_debug,"enter\n");
+	char key[2];
+   int keycode;
+   char * text = NULL;
+	
+   keycode = event->key();
+   key[0] = '\0';
+   key[1] = '\0';
+	switch (keycode) {
+	case Qt::Key_Up:
+		key[0]=NAVIT_KEY_UP;
+		break;
+	case Qt::Key_Down:
+		key[0]=NAVIT_KEY_DOWN;
+		break;
+	case Qt::Key_Left:
+		key[0]=NAVIT_KEY_LEFT;
+		break;
+	case Qt::Key_Right:
+		key[0]=NAVIT_KEY_RIGHT;
+		break;
+	case Qt::Key_Backspace:
+		key[0]=NAVIT_KEY_BACKSPACE;
+		break;
+	case Qt::Key_Tab:
+		key[0]=NAVIT_KEY_TAB;
+		break;
+	case Qt::Key_Delete:
+		key[0]=NAVIT_KEY_DELETE;
+		break;
+	case Qt::Key_Escape:
+		key[0]=NAVIT_KEY_BACK;
+		break;
+	case Qt::Key_Return:
+   case Qt::Key_Enter:
+		key[0]=NAVIT_KEY_RETURN;
+		break;
+	case Qt::Key_ZoomIn:
+		key[0]=NAVIT_KEY_ZOOM_IN;
+		break;
+	case Qt::Key_ZoomOut:
+		key[0]=NAVIT_KEY_ZOOM_OUT;
+		break;
+	case Qt::Key_PageUp:
+		key[0]=NAVIT_KEY_PAGE_UP;
+		break;
+	case Qt::Key_PageDown:
+		key[0]=NAVIT_KEY_PAGE_DOWN;
+		break;
+   default:
+      QString str=event->text();
+      if((str != NULL) && (str.size() != 0))
+      {
+         text=str.toUtf8().data();
+      }
+	}
+   if(text != NULL)
+		callback_list_call_attr_1(graphics_priv->callbacks, attr_keypress, (void *)text);
+   else if (key[0])
+		callback_list_call_attr_1(graphics_priv->callbacks, attr_keypress, (void *)key);
+	else
+		dbg(lvl_debug,"keyval 0x%x\n", keycode);
+}
+
+
 void QNavitWidget::mousePressEvent(QMouseEvent *event)
 {
 //        dbg(lvl_debug,"enter\n");
diff --git a/navit/graphics/qt5/QNavitWidget.h b/navit/graphics/qt5/QNavitWidget.h
index 3b048ccf7..727e7e130 100644
--- a/navit/graphics/qt5/QNavitWidget.h
+++ b/navit/graphics/qt5/QNavitWidget.h
@@ -17,6 +17,7 @@ public:
                              Qt::WindowFlags flags);
 protected:
         virtual bool event(QEvent *event);
+        virtual void keyPressEvent(QKeyEvent *event);
         virtual void paintEvent(QPaintEvent * event);
         virtual void resizeEvent(QResizeEvent * event);
         virtual void mouseEvent(int pressed, QMouseEvent *event);
diff --git a/navit/graphics/qt5/graphics_qt5.cpp b/navit/graphics/qt5/graphics_qt5.cpp
index c7408690d..37fda3d66 100644
--- a/navit/graphics/qt5/graphics_qt5.cpp
+++ b/navit/graphics/qt5/graphics_qt5.cpp
@@ -1003,6 +1003,9 @@ graphics_qt5_new(struct navit *nav, struct graphics_methods *meth, struct attr *
 void
 plugin_init(void)
 {
+#if USE_QML
+	 Q_INIT_RESOURCE(graphics_qt5);
+#endif
 //        dbg(lvl_debug,"enter\n");
         plugin_register_category_graphics("qt5", graphics_qt5_new);
         qt5_event_init();
diff --git a/navit/graphics/qt5/graphics_qt5.qml b/navit/graphics/qt5/graphics_qt5.qml
index 3748fe520..a797c8eb9 100644
--- a/navit/graphics/qt5/graphics_qt5.qml
+++ b/navit/graphics/qt5/graphics_qt5.qml
@@ -7,6 +7,7 @@ Window {
    QNavitQuick {
        id: navit1
        anchors.fill: parent
+       focus: true
        Component.onCompleted: {
           navit1.setGraphicContext(graphics_qt5_context)
        }
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 908b2756f..0a62ae010 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -2042,6 +2042,7 @@ gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
 	struct attr vehicle_name_attr;
 	char *vehicle_name = NULL;
 	struct attr profilename_attr;
+	struct attr vehicle;
 
 	// Get the vehicle name
 	vehicle_get_attr(v, attr_name, &vehicle_name_attr, NULL);
@@ -2057,15 +2058,23 @@ gui_internal_cmd_set_active_profile(struct gui_priv *this, struct
 		dbg(lvl_error, "Unable to set the vehicle's profile name\n");
 	}
 
+	navit_set_vehicleprofile_name(this->nav,profilename);
+	
+	save_vehicle_xml(v);
+
     // Notify Navit that the routing should be re-done if this is the
     // active vehicle.
 	if (gui_internal_is_active_vehicle(this, v)) {
-		struct attr vehicle;
-		vehicle.type=attr_vehicle;
 		vehicle.u.vehicle=v;
-		navit_set_attr(this->nav, &vehicle);
 	}
-	save_vehicle_xml(v);
+	else {
+
+		vehicle.u.vehicle=NULL;
+	}
+	
+	vehicle.type=attr_vehicle;
+	navit_set_attr(this->nav, &vehicle);
+
 	
 	gui_internal_prune_menu_count(this, 1, 0);
 	gui_internal_menu_vehicle_settings(this, v, vehicle_name);
diff --git a/navit/main.c b/navit/main.c
index 986bcb13b..25dcb5267 100644
--- a/navit/main.c
+++ b/navit/main.c
@@ -81,9 +81,9 @@ setenv(char *var, char *val, int overwrite)
  * '~'  replaced with HOME
 */
 static char *environment_vars[][5]={
-	{"NAVIT_LIBDIR",      ":",          "::/navit",      ":\\lib",      ":/lib"},
-	{"NAVIT_SHAREDIR",    ":",          ":/share/navit", ":",           ":/share"},
-	{"NAVIT_LOCALEDIR",   ":/../locale",":/share/locale",":\\locale",   ":/locale"},
+	{"NAVIT_LIBDIR",      ":",          ":/"LIB_DIR,     ":\\lib",      ":/lib"},
+	{"NAVIT_SHAREDIR",    ":",          ":/"SHARE_DIR,   ":",           ":/share"},
+	{"NAVIT_LOCALEDIR",   ":/../locale",":/"LOCALE_DIR,  ":\\locale",   ":/locale"},
 	{"NAVIT_USER_DATADIR",":",          "~/.navit",      ":\\data",     ":/home"},
 	{"NAVIT_LOGFILE",     NULL,         NULL,            ":\\navit.log",NULL},
 	{"NAVIT_LIBPREFIX",   "*/.libs/",   NULL,            NULL,          NULL},
diff --git a/navit/navit.c b/navit/navit.c
index 3f4678032..42fb74dab 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -3269,7 +3269,7 @@ navit_set_vehicleprofile(struct navit *this_, struct vehicleprofile *vp)
 	return 1;
 }
 
-static int
+int
 navit_set_vehicleprofile_name(struct navit *this_, char *name)
 {
 	struct attr attr;
@@ -3296,17 +3296,23 @@ navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv)
 		if (navit_set_vehicleprofile_name(this_, attr.u.str))
 			return;
 	}
-	if (!navit_set_vehicleprofile_name(this_,"car")) {
-		/* We do not have a fallback "car" profile
-		* so lets set any profile */
-		GList *l;
-		l=this_->vehicleprofiles;
-		if (l) {
-		    this_->vehicleprofile=l->data;
-		    if (this_->route)
-			route_set_profile(this_->route, this_->vehicleprofile);
+	if (!this_->vehicleprofile) { // When deactivating vehicle, keep the last profile if any
+		if (!navit_set_vehicleprofile_name(this_,"car")) {
+			/* We do not have a fallback "car" profile
+			* so lets set any profile */
+			GList *l;
+			l=this_->vehicleprofiles;
+			if (l) {
+		    		this_->vehicleprofile=l->data;
+		    		if (this_->route)
+				route_set_profile(this_->route, this_->vehicleprofile);
+			}
 		}
 	}
+	else {
+		if (this_->route)
+			route_set_profile(this_->route, this_->vehicleprofile);
+	}
 }
 
 /**
diff --git a/navit/navit.h b/navit/navit.h
index e8cc29078..898ff6cff 100644
--- a/navit/navit.h
+++ b/navit/navit.h
@@ -117,6 +117,7 @@ struct navigation *navit_get_navigation(struct navit *this_);
 struct displaylist *navit_get_displaylist(struct navit *this_);
 void navit_layout_switch(struct navit *n);
 int navit_set_vehicle_by_name(struct navit *n, const char *name);
+int navit_set_vehicleprofile_name(struct navit *this_, char *name);
 int navit_set_layout_by_name(struct navit *n, const char *name);
 void navit_disable_suspend(void);
 int navit_block(struct navit *this_, int block);
diff --git a/navit/xpm/CMakeLists.txt b/navit/xpm/CMakeLists.txt
index a2ce9e4b4..c9153839a 100644
--- a/navit/xpm/CMakeLists.txt
+++ b/navit/xpm/CMakeLists.txt
@@ -66,9 +66,14 @@ macro(add_scale_targets IMAGE_SRC IMAGE_NAME)
    endforeach()
 endmacro()
 
-install(FILES  desktop_icons/navit.desktop DESTINATION share/applications)
-install(FILES  desktop_icons/22x22/navit.png DESTINATION share/icons/hicolor/22x22/apps)
-install(FILES  desktop_icons/128x128/navit.png DESTINATION share/icons/hicolor/128x128/apps)
+if(NOT DEFINED NAVIT_BINARY)
+   set(NAVIT_BINARY navit CACHE STRING "Navit binary name  not defined")
+endif()
+#patch binary name in desktop file
+configure_file(desktop_icons/navit.desktop.in desktop_icons/${PACKAGE}.desktop)
+install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/desktop_icons/${PACKAGE}.desktop DESTINATION share/applications)
+install(FILES  desktop_icons/22x22/navit.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${PACKAGE}.png)
+install(FILES  desktop_icons/128x128/navit.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${PACKAGE}.png)
 #install(FILES  bench.xpm DESTINATION )
 
 if (USE_SVG OR SVG2PNG)
diff --git a/navit/xpm/desktop_icons/navit.desktop b/navit/xpm/desktop_icons/navit.desktop.in
index 4c3233707..81486b7c6 100644
--- a/navit/xpm/desktop_icons/navit.desktop
+++ b/navit/xpm/desktop_icons/navit.desktop.in
@@ -6,8 +6,8 @@ Name[fr]=Navit
 Comment=The open source vector based navigation program with routing engine
 Comment[de]=Ein vektorbasiertes Navigationsprogramm
 Comment[fr]=Le logiciel opensource de navigation vectorielle
-Exec=navit
-Icon=navit
+Exec=@NAVIT_BINARY@
+Icon=@PACKAGE@
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index de83bb52b..1967005b4 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -84,7 +84,7 @@ foreach (LANG ${LANGUAGES})
       COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo" "${PROJECT_BINARY_DIR}/locale/${LANG}/LC_MESSAGES/navit.mo"
    )
    SET(MOFILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo ${MOFILES})
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES RENAME navit.mo)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.mo DESTINATION ${LOCALE_DIR}/${LANG}/LC_MESSAGES RENAME ${PACKAGE}.mo)
 endforeach(LANG ${LANGUAGES})
 
 add_custom_target(locales ALL DEPENDS  ${MOFILES})
diff --git a/po/de.po.in b/po/de.po.in
index aba5a314f..7ff0ba0e6 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -41,8 +41,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-08-25 22:29+0000\n"
-"Last-Translator: Mathias Klein <ma_klein@gmx.de>\n"
+"PO-Revision-Date: 2017-01-12 18:37+0000\n"
+"Last-Translator: Steffen <zintor@lycos.com>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2014,9 +2014,10 @@ msgstr "Höhenprofil"
 
 msgid "please install a map *.heightlines.bin to provide elevationdata"
 msgstr ""
+"Bitte installiere eine Karte *.heightlines.bin, um Höhendaten bereitzustellen"
 
 msgid "The route must cross at least 2 heightlines"
-msgstr ""
+msgstr "Die Route muss mindestens zwei Höhenlinien kreuzen"
 
 msgid "Route Description"
 msgstr "Wegbeschreibung"
@@ -2565,7 +2566,7 @@ msgid "Window Mode"
 msgstr "Fenstermodus"
 
 msgid "Layers"
-msgstr ""
+msgstr "Ebenen"
 
 msgid "Description"
 msgstr "Beschreibung"
@@ -2821,6 +2822,16 @@ msgstr ""
 "derzeit angewählte Engine kann Ihre Sprache nicht wiedergeben. Soll das "
 "System den Voice-Download Dialog öffnen?"
 
+#. 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 ""
+
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
+msgstr ""
+
 #, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "anschließend verlassen Sie den Kreisverkehr an der %1$s %2$s"