Update:branch:Updating qt5 branch with trunkqt5

161 files changed, 2437 insertions, 756 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf942edf6..d354383ce 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,6 +603,10 @@ if (APPLE OR USE_UIKIT)
    set(BUILD_BUNDLE TRUE CACHE BOOLEAN "build an osx bundle")
 endif()
 
+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")
 
 find_program(BZCAT NAMES bzcat)
@@ -613,6 +617,9 @@ if (SAMPLE_MAP)
    elseif(NOT BZCAT)
       cfg_feature(SAMPLE_MAP "downloading binary map because of missing bzcat" TRUE)
       set(DOWNLOAD_SAMPLE_MAP TRUE)
+   elseif(NOT BUILD_MAPTOOL)
+      cfg_feature(SAMPLE_MAP "downloading binary map because maptool compilation is disabled" TRUE)
+      set(DOWNLOAD_SAMPLE_MAP TRUE)
    endif(CMAKE_CROSSCOMPILING)
 endif(SAMPLE_MAP)
 
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..568255875
--- /dev/null
+++ b/README.md
@@ -0,0 +1,76 @@
+[![Build Status](https://img.shields.io/circleci/project/github/navit-gps/navit/trunk.svg)](https://circleci.com/gh/navit-gps/navit)
+
+NavIT
+=====
+
+Navit is a open source (GPL) car navigation system with routing engine.
+
+It's modular design is capable of using vector maps of various formats
+for routing and rendering of the displayed map. It's even possible to
+use multiple maps at a time.
+
+The GTK+ or SDL user interfaces are designed to work well with touch
+screen displays. Points of Interest of various formats are displayed
+on the map.
+
+The current vehicle position is either read from gpsd or directly from
+NMEA GPS sensors.
+
+The routing engine not only calculates an optimal route to your
+destination, but also generates directions and even speaks to you.
+
+Navit currently speaks over 70 languages!
+
+You can help translating via our web based translation page :
+ http://translations.launchpad.net/navit/trunk/+pots/navit
+
+
+For help or more information, please refer to the wiki :
+ http://wiki.navit-project.org
+
+If you don't know where to start, we recommend you to read the 
+Interactive Help : http://wiki.navit-project.org/index.php/Interactive_help
+
+
+Maps:
+=====
+
+The best navigation system is useless without maps. Those three maps
+are known to work:
+
+- OpenStreetMaps : display, routing, but street name search isn't complete
+ (see http://wiki.navit-project.org/index.php/OpenStreetMaps )
+
+- Grosser Reiseplaner and compliant maps : full support
+ (see http://wiki.navit-project.org/index.php/European_maps )
+
+- Garmin maps : display, routing, search is being worked on
+ (see http://wiki.navit-project.org/index.php/Garmin_maps )
+
+
+GPS Support:
+============
+
+Navit read the current vehicle position :
+- directly from a file
+- from gpsd (local or remote)
+- from udp server (friends tracking) (experimental)
+
+
+Routing algorithm
+=================
+
+NavIt uses a Dijkstra algorithm for routing. The routing starts at the
+destination by assigning a value to each point directly connected to
+destination point. The value represents the estimated time needed to
+pass this distance.
+
+Now the point with the lowest value is choosen using the Fibonacci
+heap and a value is assigned to connected points whos are
+unevaluated or whos current value ist greater than the new one.
+
+The search is repeated until the origin is found.
+
+Once the origin is reached, all that needs to be done is to follow the
+points with the lowest values to the destination.
+
diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake
index 9f5473b4b..7c8190667 100755
--- a/Toolchain/arm-eabi.cmake
+++ b/Toolchain/arm-eabi.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME GNU)
 
 set(ANDROID TRUE)
-set(ANDROID_API_VERSION 8 CACHE STRING "Andriod API Version")
+set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version")
 set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version")
 set(ANDROID_ARCH "armeabi" CACHE STRING "Android architecture")
 
diff --git a/Toolchain/arm-linux.cmake b/Toolchain/arm-linux.cmake
new file mode 100644
index 000000000..c85a8a6dc
--- /dev/null
+++ b/Toolchain/arm-linux.cmake
@@ -0,0 +1,14 @@
+set ( CMAKE_SYSTEM_NAME GNU )
+
+# specify the cross compiler
+find_program ( CMAKE_C_COMPILER NAMES arm-linux-gcc )
+find_program ( CMAKE_CXX_COMPILER NAMES arm-linux-g++ )
+
+set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )
+set ( CMAKE_FIND_ROOT_PATH ${TOMTOM_SDK_DIR} )
+
+set ( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
+set ( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+set ( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+set ( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
+add_definitions(-D_GNU_SOURCE)
diff --git a/ci/build.sh b/ci/build.sh
new file mode 100644
index 000000000..7f8f46279
--- /dev/null
+++ b/ci/build.sh
@@ -0,0 +1,7 @@
+echo "$# build script (s) to run"
+
+for i in $(seq 1 $#); do
+	eval s=\$$i
+	echo "Starting build script #$i : $s"
+	bash -e $s
+done
diff --git a/ci/build_android.sh b/ci/build_android.sh
index a063bf2fa..5e9794a07 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -4,12 +4,15 @@ grn='\e[0;32m'
 yel='\e[1;33m'
 off='\e[0m'
 
+wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
+[ -d ~/android-ndk-r13 ] || unzip -q -d ~ android-ndk-r13-linux-x86_64.zip
+
 # setup var's to perform environment setup and cmake
 export START_PATH=~/
 export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
 export CMAKE_FILE=$SOURCE_PATH"/Toolchain/arm-eabi.cmake"
 
-export ANDROID_NDK="/usr/local/android-ndk/"
+export ANDROID_NDK=~/android-ndk-r13
 export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin"
  
 export ANDROID_SDK="/usr/local/android-sdk-linux/"
@@ -39,14 +42,14 @@ else
   echo
 fi
 
-mkdir -p $BUILD_PATH
+[ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH
 cd $BUILD_PATH
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
 android list targets
 mkdir $CIRCLE_ARTIFACTS/android/
 cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/android/
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=21 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH
 make || exit 1
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
   make apkg-release && mv navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-release-unsigned.apk || exit 1
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh
index 6755ad347..022b7f5af 100644
--- a/ci/build_android_x86.sh
+++ b/ci/build_android_x86.sh
@@ -1,17 +1,22 @@
 export START_PATH=~/
 export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
 export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake"
-export ANDROID_NDK="/usr/local/android-ndk/"
+export ANDROID_NDK=~/android-ndk-r13
 export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bin"
 export ANDROID_SDK="/usr/local/android-sdk-linux/"
 export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
+export BUILD_PATH=$START_PATH"/android-x86"
 
-mkdir android-x86 && cd android-x86
+wget -nv -c http://dl.google.com/android/repository/android-ndk-r13-linux-x86_64.zip
+unzip -q -d ~ android-ndk-r13-linux-x86_64.zip
+
+[ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH
+cd $BUILD_PATH
 
 android list targets
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=21 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ../ || exit -1
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH || exit -1
 make || exit -1
 
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 4f90d5d98..5cbd2039a 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,9 +1,15 @@
+sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev
+
+cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE"
+
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
+	# If we are building the official trunk code, push an update to coverity
+	wget -nv -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
 	tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
 	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
 	
 	mkdir bin && cd bin
-	cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n
+	cov-build --dir cov-int cmake ../ ${cmake_opts}
 	cov-build --dir cov-int make || exit -1
 	tar czvf navit.tgz cov-int
 	
@@ -13,9 +19,18 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
   --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
   --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
   https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME
+
+	# Then update the translation template on launchpad
+	sed -i '/INTEGER/d' po/navit.pot
+	cp po/navit.pot $CIRCLE_ARTIFACTS/
+	curl "https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -H "$lp_cookie" -H "Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -F file=@po/navit.pot | grep title
+
 else
 	mkdir bin && cd bin
-	cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n|| exit -1
+	cmake ../ ${cmake_opts} || exit -1
 	make  || exit -1
 fi
-cp -r navit/xpm $CIRCLE_ARTIFACTS
+
+if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
+	cp -r navit/xpm $CIRCLE_ARTIFACTS
+fi
diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
new file mode 100644
index 000000000..6a8582be1
--- /dev/null
+++ b/ci/build_tomtom_minimal.sh
@@ -0,0 +1,211 @@
+#!/bin/sh
+# this builds navit for tomtom
+# in case you want to build a plugin for tomtom use build_tomtom_plugin.sh instead
+# in case you want to build a standalone system
+# https://github.com/george-hopkins/opentom
+# https://github.com/gefin/opentom
+
+set -e
+
+export ARCH=arm-linux
+cp Toolchain/$ARCH.cmake /tmp
+
+# toolchain
+export TOMTOM_SDK_DIR=/opt/tomtom-sdk
+mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk 
+export PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root
+export PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH
+export CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include"
+export CPPFLAGS="-I$PREFIX/include -I$PREFIX/usr/include"
+export LDFLAGS="-L$PREFIX/lib -L$PREFIX/usr/lib"
+export CC=$ARCH-gcc
+export CXX=$ARCH-g++
+export LD=$ARCH-ld
+export NM="$ARCH-nm -B"
+export AR=$ARCH-ar
+export RANLIB=$ARCH-ranlib
+export STRIP=$ARCH-strip
+export OBJCOPY=$ARCH-objcopy
+export LN_S="ln -s"
+export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
+JOBS=`getconf _NPROCESSORS_ONLN`
+
+echo "Jobs"
+echo $JOBS
+
+mkdir -p ~/tomtom_assets
+
+if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
+ then 
+  wget -nv -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
+fi
+
+if ! test -f "~/tomtom_assets/libpng-1.6.26.tar.gz"
+ then 
+  wget -nv -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.26.tar.gz -P ~/tomtom_assets
+fi
+
+# toolchain
+cd /tmp
+mkdir -p $TOMTOM_SDK_DIR
+tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR
+
+
+# zlib
+cd /tmp
+wget -nv -c http://zlib.net/zlib-1.2.8.tar.gz
+tar xzf zlib-1.2.8.tar.gz
+cd zlib-1.2.8
+./configure --prefix=$PREFIX
+make -j$JOBS
+make install
+
+# libxml
+cd /tmp/
+wget -nv -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz
+tar xzf libxml2-2.7.8.tar.gz
+cd libxml2-2.7.8/
+./configure --prefix=$PREFIX --host=$ARCH --without-python
+make -j$JOBS
+make install
+
+# libpng
+cd /tmp/
+tar xzf ~/tomtom_assets/libpng-1.6.26.tar.gz
+cd libpng-1.6.26/ 
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+
+cd /tmp
+wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz
+tar xzf freetype-2.5.0.tar.gz
+cd freetype-2.5.0
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+freetype-config --cflags
+
+# glib
+cd /tmp
+wget -nv -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz
+tar xzf glib-2.25.17.tar.gz
+cd glib-2.25.17
+cat > tomtom.cache << EOF
+glib_cv_long_long_format=ll
+glib_cv_stack_grows=no
+glib_cv_uscore=no
+ac_cv_func_posix_getgrgid_r=yes
+ac_cv_func_posix_getpwuid_r=yes
+EOF
+chmod a-w tomtom.cache
+./configure --prefix=$PREFIX --host=$ARCH --cache-file=tomtom.cache
+sed -i "s|cp xgen-gmc gmarshal.c |cp xgen-gmc gmarshal.c \&\& sed -i \"s\|g_value_get_schar\|g_value_get_char\|g\" gmarshal.c |g" gobject/Makefile
+make -j$JOBS
+make install
+
+
+# tslib
+cd /tmp
+rm -rf tslib-svn
+git clone https://github.com/playya/tslib-svn.git
+cd tslib-svn
+sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac
+sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c
+sed -i "124i\#endif" plugins/input-raw.c
+sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c
+sed -i "294i\#endif" plugins/input-raw.c
+sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf # tomtom go 710
+./autogen.sh
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+
+cd /tmp
+wget -nv -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz
+tar xzf SDL-1.2.15.tar.gz
+cd SDL-1.2.15
+wget -nv -c http://tracks.yaina.de/source/sdl-fbcon-notty.patch
+patch -p0 -i sdl-fbcon-notty.patch
+./configure --prefix=$PREFIX --host=$ARCH \
+  --disable-esd --disable-cdrom --disable-joystick --disable-video-x11 \
+  --disable-x11-vm --disable-dga --disable-video-x11-dgamouse \
+  --disable-video-x11-xv --disable-video-x11-xinerama --disable-video-directfb \
+  --enable-video-fbcon --disable-audio CFLAGS="$CFLAGS -DFBCON_NOTTY"
+make -j$JOBS
+make install
+
+# to find sdl-config
+export PATH=$PREFIX/bin:$PATH
+
+# sdl image
+cd /tmp
+wget -nv -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
+tar xzf SDL_image-1.2.12.tar.gz
+cd SDL_image-1.2.12
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+
+# in the end we only want Navit locale
+rm -r $PREFIX/share/locale
+
+
+# navit
+cd ~/navit
+sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/$ARCH.cmake
+mkdir -p build
+cd build
+cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE \
+-DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake \
+-DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
+make -j$JOBS
+make install
+cd ..
+
+
+# creating directories
+OUT_PATH="/tmp/tomtom/sdcard"
+rm -rf $OUT_PATH
+mkdir -p $OUT_PATH
+cd $OUT_PATH
+mkdir -p navit
+cd navit
+mkdir -p bin share
+cd share 
+mkdir -p fonts
+cd ..
+
+
+# navit executable
+cp $PREFIX/bin/navit bin/
+
+
+# fonts
+cp -r ~/navit/navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
+
+# images and xml
+cd share
+mkdir xpm
+cd xpm
+cp $PREFIX/share/navit/xpm/*16.png ./
+cp $PREFIX/share/navit/xpm/*32.png ./
+cp $PREFIX/share/navit/xpm/*48.png ./
+cp $PREFIX/share/navit/xpm/*64.png ./
+cp $PREFIX/share/navit/xpm/nav*.* ./
+cp $PREFIX/share/navit/xpm/country*.png ./
+cd ..
+cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
+mkdir -p maps
+
+
+# locale
+cp -r $PREFIX/share/locale ./
+
+
+cd $OUT_PATH
+zip -r $CIRCLE_ARTIFACTS/navitom_minimal.zip navit
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
new file mode 100644
index 000000000..3080b39c1
--- /dev/null
+++ b/ci/build_tomtom_plugin.sh
@@ -0,0 +1,498 @@
+#!/bin/sh
+# this builds a plugin for tomtom
+# in case you want to build a standalone system
+# https://github.com/george-hopkins/opentom
+# https://github.com/gefin/opentom
+
+set -e
+
+export ARCH=arm-linux
+cp Toolchain/$ARCH.cmake /tmp
+
+# toolchain
+export TOMTOM_SDK_DIR=/opt/tomtom-sdk
+mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk 
+export PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root
+export PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH
+export CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include"
+export CPPFLAGS="-I$PREFIX/include -I$PREFIX/usr/include"
+export LDFLAGS="-L$PREFIX/lib -L$PREFIX/usr/lib"
+export CC=$ARCH-gcc
+export CXX=$ARCH-g++
+export LD=$ARCH-ld
+export NM="$ARCH-nm -B"
+export AR=$ARCH-ar
+export RANLIB=$ARCH-ranlib
+export STRIP=$ARCH-strip
+export OBJCOPY=$ARCH-objcopy
+export LN_S="ln -s"
+export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
+JOBS=`getconf _NPROCESSORS_ONLN`
+
+echo "Jobs"
+echo $JOBS
+
+mkdir -p ~/tomtom_assets
+
+if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
+ then 
+  wget -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
+fi
+
+if ! test -f "~/tomtom_assets/libpng-1.6.26.tar.gz"
+then 
+  wget -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.26.tar.gz -P ~/tomtom_assets
+fi
+
+# toolchain
+cd /tmp
+mkdir -p $TOMTOM_SDK_DIR
+tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR
+
+# espeak
+cd /tmp
+# this one includes the precompiled voices
+wget -c http://freefr.dl.sourceforge.net/project/espeak/espeak/espeak-1.48/espeak-1.48.04-source.zip
+unzip espeak-1.48.04-source.zip
+cd espeak-1.48.04-source
+sed -i "s/PREFIX=\/usr//g" src/Makefile
+sed -i "s/DATADIR=\/usr\/share\/espeak-data/DATADIR=~\/share\/espeak-data/g" src/Makefile
+sed -i "s/AUDIO = portaudio/#AUDIO = portaudio/g" src/Makefile
+sed -i "s/-fvisibility=hidden//g" src/Makefile
+cat src/Makefile
+make -C src
+cd src
+make install
+
+# http://forum.navit-project.org/viewtopic.php?f=17&t=568
+cd /tmp
+cat > /tmp/espeakdsp.c << EOF
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/soundcard.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#define IBUFFERLEN 1024
+#define MAXARGC 30
+
+
+int  main(int argc, char *argv[],char *envp[])
+{
+	int pipefd[2];
+	pid_t cpid;
+	char buf;
+	int co,wp,l,fh;
+	short bufi[IBUFFERLEN],bufo[IBUFFERLEN*2];	 
+	int rate=22050;
+
+	char *newargv[MAXARGC+2];
+
+	for(co=0;co<argc;co++)
+	{
+		if(co>=MAXARGC)break;
+		newargv[co]=argv[co];
+	}
+	newargv[co++]="--stdout";
+	newargv[co++]=NULL;
+
+	if (pipe(pipefd) == -1)
+	{
+		perror("pipe");
+		exit(EXIT_FAILURE);
+	}
+
+	if(setpriority(PRIO_PROCESS,0,-10))
+	perror ("setpriority");
+
+	cpid = fork();
+	if (cpid == -1)
+	{
+		perror("fork");
+		exit(EXIT_FAILURE);
+	}
+
+	if (cpid == 0)
+	{    /* Child writes to pipe */
+
+		close(pipefd[0]);          /* Close unused read end */
+		dup2(pipefd[1],1);	
+		execve("/mnt/sdcard/navit/bin/espeak",newargv,envp);	      
+		perror("exec /mnt/sdcard/navit/bin/espeak");	
+		close(pipefd[1]);          /* Reader will see EOF */
+		wait(NULL);                /* Wait for child */
+		exit(EXIT_SUCCESS);
+
+	} else { /* Parent read from  pipe */
+
+		close(pipefd[1]);          /* Close unused write end */
+
+		l=read(pipefd[0],bufi,64);
+		if(memcmp(bufi,"RIFF",4))
+		{
+			while(l>0)
+			{
+				write(1,bufi,l);
+				l=read(pipefd[0],bufi,IBUFFERLEN);
+			}
+			exit(EXIT_SUCCESS);
+		}
+		l=read(pipefd[0],bufi,IBUFFERLEN);
+		if(l<500)
+		{
+			printf("espeakdsp: avoid noise speaking a empty string\n");
+			exit(EXIT_SUCCESS); 	
+		} 			
+		usleep (50000);
+
+		fh=open("/dev/dsp",O_WRONLY);
+		if(fh<0)
+		{
+			perror("open /dev/dsp");	
+			exit(EXIT_FAILURE);
+		}
+		ioctl(fh, SNDCTL_DSP_SPEED , &rate);
+		ioctl(fh, SNDCTL_DSP_SYNC, 0);
+		while(l)
+		{
+			for(co=0,wp=0;co<IBUFFERLEN;co++)
+			{
+				bufo[wp++]=bufi[co]; /* mono->stereo */
+				bufo[wp++]=bufi[co];
+			}
+			write (fh,bufo,wp);
+			l=read(pipefd[0],bufi,IBUFFERLEN);
+		}
+		ioctl(fh, SNDCTL_DSP_SYNC, 0);
+		close(pipefd[0]);
+		exit(EXIT_SUCCESS);
+	}
+}
+EOF
+arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include espeakdsp.c -o espeakdsp
+
+# zlib
+cd /tmp
+wget -c http://zlib.net/zlib-1.2.8.tar.gz
+tar xzf zlib-1.2.8.tar.gz
+cd zlib-1.2.8
+./configure --prefix=$PREFIX
+make -j$JOBS
+make install
+
+# libxml
+cd /tmp/
+wget -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz
+tar xzf libxml2-2.7.8.tar.gz
+cd libxml2-2.7.8/
+./configure --prefix=$PREFIX --host=$ARCH --without-python
+make -j$JOBS
+make install
+
+# libpng
+cd /tmp/
+tar xzf ~/tomtom_assets/libpng-1.6.26.tar.gz
+cd libpng-1.6.26/ 
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+
+cd /tmp
+wget -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz
+tar xzf freetype-2.5.0.tar.gz
+cd freetype-2.5.0
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+freetype-config --cflags
+
+# glib
+cd /tmp
+wget -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz
+tar xzf glib-2.25.17.tar.gz
+cd glib-2.25.17
+cat > tomtom.cache << EOF
+glib_cv_long_long_format=ll
+glib_cv_stack_grows=no
+glib_cv_uscore=no
+ac_cv_func_posix_getgrgid_r=yes
+ac_cv_func_posix_getpwuid_r=yes
+EOF
+chmod a-w tomtom.cache
+./configure --prefix=$PREFIX --host=$ARCH --cache-file=tomtom.cache
+sed -i "s|cp xgen-gmc gmarshal.c |cp xgen-gmc gmarshal.c \&\& sed -i \"s\|g_value_get_schar\|g_value_get_char\|g\" gmarshal.c |g" gobject/Makefile
+make -j$JOBS
+make install
+
+
+# tslib
+cd /tmp
+rm -rf tslib-svn
+git clone https://github.com/playya/tslib-svn.git
+cd tslib-svn
+sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac
+sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c
+sed -i "124i\#endif" plugins/input-raw.c
+sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c
+sed -i "294i\#endif" plugins/input-raw.c
+sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf # tomtom go 710
+./autogen.sh
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+
+cd /tmp
+wget -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz
+tar xzf SDL-1.2.15.tar.gz
+cd SDL-1.2.15
+wget -c http://tracks.yaina.de/source/sdl-fbcon-notty.patch
+patch -p0 -i sdl-fbcon-notty.patch
+./configure --prefix=$PREFIX --host=$ARCH \
+  --disable-esd --disable-cdrom --disable-joystick --disable-video-x11 \
+  --disable-x11-vm --disable-dga --disable-video-x11-dgamouse \
+  --disable-video-x11-xv --disable-video-x11-xinerama --disable-video-directfb \
+  --enable-video-fbcon --disable-audio CFLAGS="$CFLAGS -DFBCON_NOTTY"
+make -j$JOBS
+make install
+
+# sdl test utilities
+cd test
+./configure --prefix=$PREFIX --host=$ARCH
+make testvidinfo
+cp testvidinfo $PREFIX/usr/bin/
+
+# to find sdl-config
+export PATH=$PREFIX/bin:$PATH
+
+# sdl image
+cd /tmp
+wget -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
+tar xzf SDL_image-1.2.12.tar.gz
+cd SDL_image-1.2.12
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
+
+
+# in the end we only want Navit locale
+rm -r $PREFIX/share/locale
+
+cat > ~/navit/navit/xpm/tomtom_minus.svg << EOF
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
+<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
+<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 60 0 L -60 0"/>
+</svg>
+EOF
+
+cat > ~/navit/navit/xpm/tomtom_plus.svg << EOF
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
+<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
+<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 0 60 L 0 -60 M 60 0 L -60 0"/>
+</svg>
+EOF
+
+
+# navit
+cd ~/navit
+sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/$ARCH.cmake
+mkdir -p build
+cd build
+cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE \
+-DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake \
+-DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
+make -j$JOBS
+make install
+cd ..
+
+
+# creating directories
+OUT_PATH="/tmp/tomtom/sdcard"
+rm -rf $OUT_PATH
+mkdir -p $OUT_PATH
+cd $OUT_PATH
+mkdir -p navit SDKRegistry
+cd navit
+mkdir -p bin lib share sdl ts
+cd share 
+mkdir -p fonts
+cd ..
+
+
+cp $PREFIX/lib/libfreetype.so.6 lib
+cp $PREFIX/lib/libSDL-1.2.so.0 lib
+cp $PREFIX/lib/libSDL_image-1.2.so.0 lib
+cp $PREFIX/lib/libfreetype.so.6 lib
+cp $PREFIX/lib/libgio-2.0.so lib
+cp $PREFIX/lib/libglib-2.0.so lib/libglib-2.0.so.0
+cp $PREFIX/lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0
+cp $PREFIX/lib/libgobject-2.0.so lib/libgobject-2.0.so.0
+cp $PREFIX/lib/libgthread-2.0.so lib/libgthread-2.0.so.0
+cp $PREFIX/lib/libpng16.so.16 lib
+cp $PREFIX/lib/libts-1.0.so.0 lib
+cp $PREFIX/lib/libxml2.so.2 lib
+cp $PREFIX/lib/libz.so.1 lib
+cp $PREFIX/etc/ts.conf ts
+cp $TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/lib/libstdc++.so.5 lib
+
+# flite
+# cp $PREFIX/bin/flite* bin/
+
+# SDL testvidinfo
+cp $PREFIX/usr/bin/testvidinfo sdl/
+
+# navit executable and wrapper
+cp $PREFIX/bin/navit bin/
+cat > bin/navit-wrapper << 'EOF'
+#!/bin/sh
+
+cd /mnt/sdcard/navit/bin
+
+# Set some paths.
+export PATH=$PATH:/mnt/sdcard/navit/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib:/mnt/sdcard/LoquendoTTS/lib
+export HOME=/mnt/sdcard/navit
+export NAVIT_LIBDIR=/mnt/sdcard/navit/lib/navit
+export NAVIT_SHAREDIR=/mnt/sdcard/navit/share
+export NAVIT_LOCALEDIR=/mnt/sdcard/navit/share/locale
+
+# tslib requirements.
+export TSLIB_CONSOLEDEVICE=none
+export TSLIB_FBDEVICE=/dev/fb
+export TSLIB_TSDEVICE=/dev/ts
+export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
+export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
+export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
+
+# SDL requirements.
+export SDL_MOUSEDRV=TSLIB
+export SDL_MOUSEDEV=$TSLIB_TSDEVICE
+export SDL_NOMOUSE=1
+export SDL_FBDEV=/dev/fb
+export SDL_VIDEODRIVER=fbcon
+export SDL_AUDIODRIVER=dsp
+
+# Set time zone.
+export TZ="CEDT-01:00:00CEST-02:00:00,M3.4.0,M10.4.0"
+
+# Set language.
+export LANG=en_US
+
+export ESPEAK_DATA_PATH=/mnt/sdcard/navit/share
+
+# Run Navit.
+if /mnt/sdcard/navit/sdl/testvidinfo | grep 480x272
+then
+	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/tomtom480.xml 2>/mnt/sdcard/navit/navit.log&
+# tomtom320xml is not provided yet
+# elif  /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240
+# then
+# 	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log&
+else
+	exit 1
+fi
+
+# Kill TTN while Navit is running.
+killall ttn
+
+while [ $? -eq 0 ]
+do
+echo "\0" > /dev/watchdog
+sleep 10
+ps | grep -v grep | grep -v wrapper | grep navit
+done
+
+/sbin/reboot
+
+EOF
+chmod a+rx bin/navit-wrapper
+
+# fonts
+cp -r ~/navit/navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
+
+# ts
+cp -r $PREFIX/lib/ts $OUT_PATH/navit/lib/
+cp $PREFIX/bin/ts_* $OUT_PATH/navit/ts/
+
+# images and xml
+cd share
+mkdir xpm
+cd xpm
+cp $PREFIX/share/navit/xpm/*16.png ./
+cp $PREFIX/share/navit/xpm/*32.png ./
+cp $PREFIX/share/navit/xpm/*48.png ./
+cp $PREFIX/share/navit/xpm/*64.png ./
+cp $PREFIX/share/navit/xpm/nav*.* ./
+cp $PREFIX/share/navit/xpm/country*.png ./
+cd ..
+cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
+mkdir -p maps
+
+
+# locale
+cp -r $PREFIX/share/locale ./
+
+# espeak
+cp -r ~/share/espeak-data ./
+cp $PREFIX/bin/espeak $OUT_PATH/navit/bin/
+cp $PREFIX/lib/libespeak.so.1 $OUT_PATH/navit/lib
+
+mv /tmp/espeakdsp $OUT_PATH/navit/bin/
+
+# add a menu button
+cat > $OUT_PATH/SDKRegistry/navit.cap << EOF
+Version|100|
+AppName|navit-wrapper|
+AppPath|/mnt/sdcard/navit/bin/|
+AppIconFile|navit.bmp|
+AppMainTitle|Navit|
+AppPort|2001|
+COMMAND|CMD|hallo|navit.bmp|Navit|
+EOF
+
+
+convert $PREFIX/share/icons/hicolor/128x128/apps/navit.png  -type truecolor -crop 100x100+12+28 -resize 48x48 $OUT_PATH/SDKRegistry/navit.bmp
+convert -background none ~/navit/navit/xpm/tomtom_plus.svg -resize 80x80 $OUT_PATH/navit/share/xpm/tomtom_plus_80_80.png
+convert -background none ~/navit/navit/xpm/tomtom_minus.svg -resize 80x80 $OUT_PATH/navit/share/xpm/tomtom_minus_80_80.png
+
+cat > $OUT_PATH/SDKRegistry/ts.cap << EOF
+Version|100|
+AppName|ts-wrapper|
+AppPath|/mnt/sdcard/navit/ts/|
+AppIconFile||
+AppMainTitle|Touchscreen|
+AppPort||
+COMMAND|CMD|hallo||Touchscreen|
+EOF
+
+
+cat > $OUT_PATH/navit/ts/ts-wrapper << EOF
+#!/bin/sh
+
+cd /mnt/sdcard
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib
+
+export TSLIB_CONSOLEDEVICE=none
+export TSLIB_FBDEVICE=/dev/fb
+export TSLIB_TSDEVICE=/dev/ts
+export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
+export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
+export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
+
+/mnt/sdcard/navit/ts/ts_calibrate
+/mnt/sdcard/navit/ts/ts_test
+EOF
+
+cd $OUT_PATH
+zip -r $CIRCLE_ARTIFACTS/navitom.zip navit SDKRegistry
diff --git a/ci/build_win32.sh b/ci/build_win32.sh
new file mode 100644
index 000000000..de5156843
--- /dev/null
+++ b/ci/build_win32.sh
@@ -0,0 +1,8 @@
+sudo apt-get install mingw32 mingw32-binutils mingw32-runtime default-jdk nsis
+
+mkdir win32
+pushd win32
+cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package
+popd
+
+cp win32/*.exe $CIRCLE_ARTIFACTS/
diff --git a/ci/merge_i18n_update.sh b/ci/merge_i18n_update.sh
new file mode 100644
index 000000000..2d62cf0ad
--- /dev/null
+++ b/ci/merge_i18n_update.sh
@@ -0,0 +1,4 @@
+git rebase master
+git checkout master
+git merge --squash ${CIRCLE_BRANCH}
+git commit
diff --git a/ci/submit_i18n_pr.sh b/ci/submit_i18n_pr.sh
deleted file mode 100644
index 517740a7c..000000000
--- a/ci/submit_i18n_pr.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-wget https://github.com/github/hub/releases/download/v2.2.1/hub-linux-amd64-2.2.1.tar.gz
-tar xvfz hub-linux-amd64-2.2.1.tar.gz
-sudo mv hub-linux-amd64-2.2.1/hub /usr/local/bin/
-sudo chmod +x /usr/local/bin/hub
-
-
-cat > ~/.config/hub << EOF
-github.com:
-- user: ${HUB_USER}
-  oauth_token: ${HUB_TOKEN}
-  protocol: https
-EOF
-
-hub pull-request -b trunk -m "Automatic translation import"
diff --git a/circle.yml b/circle.yml
index fc29cb3aa..d00c9f624 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,44 +6,30 @@ dependencies:
     - ~/.android
     - ~/android
     - "~/assets/"
+    - ~/tomtom_assets
   pre:
     - "[ -d ~/assets ] || mkdir ~/assets"
     - "[ -d ~/android ] || mkdir ~/android"
-    - wget -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
     - sudo apt-get update
-    - sudo apt-get install cmake
-    - sudo apt-get install libpng12-dev
-    - sudo apt-get install librsvg2-bin 
-    - sudo apt-get install libfreetype6-dev
-    - sudo apt-get install libdbus-glib-1-dev
-    - sudo apt-get install g++
     - bash ci/update_version.sh prepare
-    - bash ci/build_linux.sh
-    - sed -i '/INTEGER/d' bin/po/navit.pot
-    - cp bin/po/navit.pot $CIRCLE_ARTIFACTS/
-    - "[ $CIRCLE_PROJECT_USERNAME != navit-gps ] || curl \"https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -H \"$lp_cookie\" -H \"Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload\" -F file=@bin/po/navit.pot | grep title"
 # Android build    
     - sudo apt-get install gettext
     - sudo apt-get install libsaxonb-java
 # for aapt
     - sudo apt-get install lib32stdc++6
     - sudo apt-get install lib32z1
-    - bash ci/build_android.sh
-    - bash ci/build_android_x86.sh
-# Windows build
-    - sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
-    - sudo apt-get install default-jdk nsis
-# for sys/select.h
-#    - sudo apt-get install -y libc6-dev
-    - mkdir win32
-    - cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package:
-        pwd: win32/
-    - cp win32/*.exe $CIRCLE_ARTIFACTS/
 # For python testing with junit reporting
-    - sudo pip install junit-xml
-#
-    - ls -la $CIRCLE_ARTIFACTS
+    - sudo apt-get install python-gobject libdbus-glib-1-dev python-dev
+    - pip install junit-xml dbus-python
+    - ln -s /usr/lib/python2.7/dist-packages/gobject /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
+    - ln -s /usr/lib/python2.7/dist-packages/glib /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
 test:
+
+  override:
+    - bash ci/build.sh:
+        parallel: true
+        files:
+          - ci/build_*.sh
   post:
     - sed -i -e 's@name="Local GPS" profilename="car" enabled="yes" active="1"@name="Local GPS" profilename="car" enabled="no" active="0"@' navit.xml:
         pwd: bin/navit/
@@ -71,7 +57,7 @@ deployment:
     branch: /i18n.*/
     owner: navit-gps
     commands:
-      - bash ci/submit_i18n_pr.sh
+      - bash ci/merge_i18n_update.sh
 notify:
   webhooks:
     - url: http://62.210.125.30:8000/
diff --git a/config.h.cmake b/config.h.cmake
index abc3d0ebc..4774efbaf 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -6,6 +6,7 @@
 #cmakedefine HAVE_API_WIN32_BASE 1
 #cmakedefine HAVE_API_WIN32 1
 #cmakedefine HAVE_API_WIN32_CE 1
+#cmakedefine HAVE_API_TOMTOM 1
 #cmakedefine HAVE_GLIB 1
 #cmakedefine HAVE_GMODULE 1
 #cmakedefine HAVE_GETCWD 1
diff --git a/navit/Makefile.am b/navit/Makefile.am
index 7115a6c6e..16cb81d58 100644
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -213,6 +213,7 @@ if SOURCE_MODE_SVN
 else
 	echo "#define SVN_VERSION \"@SOURCE_MODE@\"" >>version.h.tmp
 endif
+	echo "#define GIT_VERSION \"$(shell git describe --abbrev=8 --dirty --always --tags)\"" >>version.h.tmp
 	echo "#define NAVIT_VARIANT \"@NAVIT_VARIANT@\"" >>version.h.tmp
 	if ! diff version.h.tmp version.h >/dev/null 2>/dev/null; \
 	then \
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index a0c61bd72..c8578df07 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -301,7 +301,8 @@ public class Navit extends Activity
 		NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);	// Grab a handle to the NotificationManager

 		Notification NavitNotification = new Notification(R.drawable.ic_notify, getString(R.string.notification_ticker), System.currentTimeMillis());	// Create a new notification, with the text string to show when the notification first appears

 		PendingIntent appIntent = PendingIntent.getActivity(getApplicationContext(), 0, getIntent(), 0);

-		NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", getString(R.string.notification_event_default), appIntent);	// Set the text in the notification

+//		FIXME : needs a fix for sdk 23

+//		NavitNotification.setLatestEventInfo(getApplicationContext(), "Navit", getString(R.string.notification_event_default), appIntent);	// Set the text in the notification

 		NavitNotification.flags|=Notification.FLAG_ONGOING_EVENT;	// Ensure that the notification appears in Ongoing

 		nm.notify(R.string.app_name, NavitNotification);	// Set the notification

 		

diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 031331f68..a41ab52be 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -369,7 +369,7 @@ public class NavitGraphics
 		{
 			float x = a.x - b.x;
 			float y = a.y - b.y;
-			return FloatMath.sqrt(x * x + y * y);
+			return (float)Math.sqrt(x * x + y * y);
 		}
 
 		private PointF getFloatValue(Object instance, Object argument)
diff --git a/navit/event.c b/navit/event.c
index 96d2e0dd8..667e5bdc3 100644
--- a/navit/event.c
+++ b/navit/event.c
@@ -129,7 +129,7 @@ event_request_system(const char *system, const char *requestor)
 		}
 		return 1;
 	}
-	event_type_new=plugin_get_event_type(system);
+	event_type_new=plugin_get_category_event(system);
         if (! event_type_new) {
 		dbg(lvl_error,"unsupported event system '%s' requested from '%s'\n", system, requestor);
                 return 0;
diff --git a/navit/event_glib.c b/navit/event_glib.c
index 9ffb12cbc..e9bad6c40 100644
--- a/navit/event_glib.c
+++ b/navit/event_glib.c
@@ -196,5 +196,5 @@ event_glib_new(struct event_methods *meth)
 void
 event_glib_init(void)
 {
-	plugin_register_event_type("glib", event_glib_new);
+	plugin_register_category_event("glib", event_glib_new);
 }
diff --git a/navit/font/freetype/font_freetype.c b/navit/font/freetype/font_freetype.c
index f41eff314..0508c5870 100644
--- a/navit/font/freetype/font_freetype.c
+++ b/navit/font/freetype/font_freetype.c
@@ -658,7 +658,7 @@ font_freetype_new(void *meth)
 void
 plugin_init(void)
 {
-	plugin_register_font_type("freetype", font_freetype_new);
+	plugin_register_category_font("freetype", font_freetype_new);
 #ifdef HAVE_FONTCONFIG
 	FcInit();
 #endif
diff --git a/navit/graphics.c b/navit/graphics.c
index 1813a8c36..7680d96ce 100644
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -274,7 +274,7 @@ struct graphics * graphics_new(struct attr *parent, struct attr **attrs)
                 return NULL;
         }
 
-	graphicstype_new=plugin_get_graphics_type(type_attr->u.str);
+	graphicstype_new=plugin_get_category_graphics(type_attr->u.str);
 	if (! graphicstype_new) {
 		dbg(lvl_error,"Failed to load graphics plugin %s.\n", type_attr->u.str);
 		return NULL;
diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c
index 41f441c96..0d6aa30d2 100644
--- a/navit/graphics/android/graphics_android.c
+++ b/navit/graphics/android/graphics_android.c
@@ -1198,6 +1198,6 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug,"enter\n");
-        plugin_register_graphics_type("android", graphics_android_new);
-	plugin_register_event_type("android", event_android_new);
+        plugin_register_category_graphics("android", graphics_android_new);
+	plugin_register_category_event("android", event_android_new);
 }
diff --git a/navit/graphics/gd/graphics_gd.c b/navit/graphics/gd/graphics_gd.c
index 908007a0e..3ef6c520b 100644
--- a/navit/graphics/gd/graphics_gd.c
+++ b/navit/graphics/gd/graphics_gd.c
@@ -826,7 +826,7 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
 	dbg(lvl_debug,"enter\n");
 	ret=g_new0(struct graphics_priv, 1);
 	*meth=graphics_methods;
-        font_freetype_new=plugin_get_font_type("freetype");
+        font_freetype_new=plugin_get_category_font("freetype");
         if (!font_freetype_new)
                 return NULL;
         font_freetype_new(&ret->freetype_methods);
@@ -855,7 +855,7 @@ graphics_gd_new(struct navit *nav, struct graphics_methods *meth, struct attr **
 	struct font_priv * (*font_freetype_new)(void *meth);
 	struct graphics_priv *ret;
 	event_request_system("glib","graphics_gd_new");
-        font_freetype_new=plugin_get_font_type("freetype");
+        font_freetype_new=plugin_get_category_font("freetype");
         if (!font_freetype_new)
                 return NULL;
 	*meth=graphics_methods;
@@ -881,5 +881,5 @@ graphics_gd_new(struct navit *nav, struct graphics_methods *meth, struct attr **
 void
 plugin_init(void)
 {
-        plugin_register_graphics_type("gd", graphics_gd_new);
+        plugin_register_category_graphics("gd", graphics_gd_new);
 }
diff --git a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 9d6dd998b..387003c40 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -1081,7 +1081,7 @@ static struct graphics_priv *
 graphics_gtk_drawing_area_new_helper(struct graphics_methods *meth)
 {
 	struct font_priv * (*font_freetype_new)(void *meth);
-	font_freetype_new=plugin_get_font_type("freetype");
+	font_freetype_new=plugin_get_category_font("freetype");
 	if (!font_freetype_new)
 		return NULL;
 	struct graphics_priv *this=g_new0(struct graphics_priv,1);
@@ -1150,5 +1150,5 @@ plugin_init(void)
 #ifdef HAVE_API_WIN32
 	setlocale(LC_NUMERIC, "C"); /* WIN32 gtk resets LC_NUMERIC */
 #endif
-	plugin_register_graphics_type("gtk_drawing_area", graphics_gtk_drawing_area_new);
+	plugin_register_category_graphics("gtk_drawing_area", graphics_gtk_drawing_area_new);
 }
diff --git a/navit/graphics/null/graphics_null.c b/navit/graphics/null/graphics_null.c
index ce4dc6de2..ecac7d528 100644
--- a/navit/graphics/null/graphics_null.c
+++ b/navit/graphics/null/graphics_null.c
@@ -354,6 +354,6 @@ event_null_new(struct event_methods *meth)
 void
 plugin_init(void)
 {
-        plugin_register_graphics_type("null", graphics_null_new);
-	plugin_register_event_type("null", event_null_new);
+        plugin_register_category_graphics("null", graphics_null_new);
+	plugin_register_category_event("null", event_null_new);
 }
diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c
index da82cd107..98230f0dc 100644
--- a/navit/graphics/opengl/graphics_opengl.c
+++ b/navit/graphics/opengl/graphics_opengl.c
@@ -1440,7 +1440,7 @@ static struct graphics_priv *
 graphics_opengl_new_helper(struct graphics_methods *meth)
 {
 	struct font_priv *(*font_freetype_new) (void *meth);
-	font_freetype_new = plugin_get_font_type("freetype");
+	font_freetype_new = plugin_get_category_font("freetype");
 
 	if (!font_freetype_new) {
 		return NULL;
@@ -1817,6 +1817,6 @@ event_opengl_new(struct event_methods *meth)
 void
 plugin_init(void)
 {
-	plugin_register_graphics_type("opengl", graphics_opengl_new);
-	plugin_register_event_type("opengl", event_opengl_new);
+	plugin_register_category_graphics("opengl", graphics_opengl_new);
+	plugin_register_category_event("opengl", event_opengl_new);
 }
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index 1cdb92796..c4411252b 100644
--- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
@@ -859,7 +859,7 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct
 		return NULL;
 #endif
 #ifdef QT_QPAINTER_USE_FREETYPE
-	font_freetype_new=(struct font_priv *(*)(void *))plugin_get_font_type("freetype");
+	font_freetype_new=(struct font_priv *(*)(void *))plugin_get_category_font("freetype");
 	if (!font_freetype_new) {
 		dbg(lvl_error,"no freetype\n");
 		return NULL;
@@ -926,9 +926,9 @@ static struct graphics_priv * graphics_qt_qpainter_new(struct navit *nav, struct
 //##############################################################################################################
 void plugin_init(void)
 {
-        plugin_register_graphics_type("qt_qpainter", graphics_qt_qpainter_new);
+        plugin_register_category_graphics("qt_qpainter", graphics_qt_qpainter_new);
 #ifdef QT_QPAINTER_USE_EVENT_QT
-        plugin_register_event_type("qt", event_qt_new);
+        plugin_register_category_event("qt", event_qt_new);
 #endif
 }
 
diff --git a/navit/graphics/sdl/event.c b/navit/graphics/sdl/event.c
index cd4b81802..f96b079b3 100644
--- a/navit/graphics/sdl/event.c
+++ b/navit/graphics/sdl/event.c
@@ -377,5 +377,5 @@ event_sdl_new(struct event_methods* methods) {
 /* ---------- SDL Eventhandling ---------- */
 
 void sdl_event_init(void) {
-	plugin_register_event_type("sdl", event_sdl_new);
+	plugin_register_category_event("sdl", event_sdl_new);
 }
diff --git a/navit/graphics/sdl/event_sdl.c b/navit/graphics/sdl/event_sdl.c
index d640d5edb..28fe4fafb 100644
--- a/navit/graphics/sdl/event_sdl.c
+++ b/navit/graphics/sdl/event_sdl.c
@@ -339,5 +339,5 @@ event_sdl_new(struct event_methods* methods)
 void
 event_sdl_register(void)
 {
-   plugin_register_event_type("sdl", event_sdl_new);
+   plugin_register_category_event("sdl", event_sdl_new);
 }
diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c
index b0cc66776..b1a9c17b9 100644
--- a/navit/graphics/sdl/graphics_sdl.c
+++ b/navit/graphics/sdl/graphics_sdl.c
@@ -986,7 +986,7 @@ overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct poin
 
 
     struct font_priv *(*font_freetype_new) (void *meth);
-    font_freetype_new = plugin_get_font_type ("freetype");
+    font_freetype_new = plugin_get_category_font ("freetype");
 
     if (!font_freetype_new)
     {
@@ -1407,7 +1407,7 @@ graphics_sdl_new(struct navit *nav, struct graphics_methods *meth, struct attr *
     this->cbl = cbl;
 
     /* initialize fonts */
-    font_freetype_new = plugin_get_font_type("freetype");
+    font_freetype_new = plugin_get_category_font("freetype");
 
 	if (!font_freetype_new) {
 			g_free(this);
@@ -1852,9 +1852,9 @@ void
 plugin_init(void)
 {
 #ifdef USE_WEBOS
-    plugin_register_event_type("sdl", event_sdl_new);
+    plugin_register_category_event("sdl", event_sdl_new);
 #endif
-    plugin_register_graphics_type("sdl", graphics_sdl_new);
+    plugin_register_category_graphics("sdl", graphics_sdl_new);
 }
 
 // vim: sw=4 ts=8
diff --git a/navit/graphics/win32/graphics_win32.c b/navit/graphics/win32/graphics_win32.c
index 609e61ce8..3d8fa351d 100644
--- a/navit/graphics/win32/graphics_win32.c
+++ b/navit/graphics/win32/graphics_win32.c
@@ -1845,6 +1845,6 @@ static struct event_priv *
 void
 plugin_init(void)
 {
-    plugin_register_graphics_type("win32", graphics_win32_new);
-    plugin_register_event_type("win32", event_win32_new);
+    plugin_register_category_graphics("win32", graphics_win32_new);
+    plugin_register_category_event("win32", event_win32_new);
 }
diff --git a/navit/gui.c b/navit/gui.c
index ab16d8a9e..9b2ba4971 100644
--- a/navit/gui.c
+++ b/navit/gui.c
@@ -45,7 +45,7 @@ gui_new(struct attr *parent, struct attr **attrs)
 		return NULL;
 	}
 
-        guitype_new=plugin_get_gui_type(type_attr->u.str);
+        guitype_new=plugin_get_category_gui(type_attr->u.str);
         if (! guitype_new)
                 return NULL;
 
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index 71bd26315..1741a54a0 100644
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -808,5 +808,5 @@ plugin_init(void)
 #endif
 
 
-	plugin_register_gui_type("gtk", gui_gtk_new);
+	plugin_register_category_gui("gtk", gui_gtk_new);
 }
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index cf7db42a7..fd450b57c 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -3118,12 +3118,14 @@ static struct gui_internal_widget_methods gui_internal_widget_methods = {
 	gui_internal_set_default_background,
 };
 
-
-/*
- * @brief Displays Route information
+/**
+ * @brief finds the intersection point of 2 lines
+ *
+ * @param coord a1, a2, b1, b2 : coords of the start and 
+ * end of the first and the second line
+ * @param coord res, will become the coords of the intersection if found
+ * @return : TRUE if intersection found, otherwise FALSE
  */
-/* FIXME where is the implementation? */
-
 int
 line_intersection(struct coord* a1, struct coord *a2, struct coord * b1, struct coord *b2, struct coord *res)
 {
@@ -3141,18 +3143,19 @@ line_intersection(struct coord* a1, struct coord *a2, struct coord * b1, struct
                 b = -b;
         }
         if (a < 0 || b < 0)
-                return 0;
+                return FALSE;
         if (a > n || b > n)
-                return 0;
+                return FALSE;
 	if (n == 0) {
 		dbg(lvl_info,"a=%d b=%d n=%d\n", a, b, n);
 		dbg(lvl_info,"a1=0x%x,0x%x ad %d,%d\n", a1->x, a1->y, adx, ady);
 		dbg(lvl_info,"b1=0x%x,0x%x bd %d,%d\n", b1->x, b1->y, bdx, bdy);
-		dbg_assert(n != 0);
+		dbg(lvl_info,"No intersection found, lines assumed parallel ?\n");
+		return FALSE;
 	}
         res->x = a1->x + a * adx / n;
         res->y = a1->y + a * ady / n;
-        return 1;
+        return TRUE;
 }
 
 struct heightline *
@@ -3182,18 +3185,6 @@ item_get_heightline(struct item *item)
 	return ret;
 }
 
-
-/*
- * @brief Displays Route Height Profile
- *
- * @li The name of the active vehicle
- * @param wm The button that was pressed.
- * @param v Unused
- */
-/* FIXME where is the implementation? */
-
-
-
 /**
  * @brief Called when the route is updated.
  */
@@ -3461,5 +3452,5 @@ static struct gui_priv * gui_internal_new(struct navit *nav, struct gui_methods
 //##############################################################################################################
 void plugin_init(void)
 {
-	plugin_register_gui_type("internal", gui_internal_new);
+	plugin_register_category_gui("internal", gui_internal_new);
 }
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index 12de558fb..d26bd677d 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -446,13 +446,21 @@ gui_internal_cmd2_setting_layout(struct gui_priv *this, char *function, struct a
 	navit_attr_iter_destroy(iter);
 	gui_internal_menu_render(this);
 }
+
+/*
+ * @brief Displays Route Height Profile
+ *
+ * displays a heightprofile if a route is active and 
+ * some heightinfo is provided by means of a map
+ *
+ * the name of the file providing the heightlines must
+ * comply with *.heightlines.bin
+ * 
+ */
 static void
 gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
-
-
 	struct widget * menu, *box;
-
 	struct map * map=NULL;
 	struct map_rect * mr=NULL;
 	struct route * route;
@@ -460,17 +468,18 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 	struct mapset *ms;
 	struct mapset_handle *msh;
 	int x,i,first=1,dist=0;
+	int diagram_points_count = 0;
 	struct coord c,last,res;
 	struct coord_rect rbbox,dbbox;
 	struct map_selection sel;
 	struct heightline *heightline,*heightlines=NULL;
 	struct diagram_point *min,*diagram_point,*diagram_points=NULL;
+	struct point p[2];
 	sel.next=NULL;
 	sel.order=18;
 	sel.range.min=type_height_line_1;
 	sel.range.max=type_height_line_3;
 
-
 	menu=gui_internal_menu(this,_("Height Profile"));
 	box = gui_internal_box_new(this, gravity_left_top| orientation_vertical | flags_fill | flags_expand);
 	gui_internal_widget_append(menu, box);
@@ -491,11 +500,24 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 			}
 		}
 		map_rect_destroy(mr);
+		mr = NULL;
 		ms=navit_get_mapset(this->nav);
 		if (!first && ms) {
+			int heightmap_installed = FALSE;
 			msh=mapset_open(ms);
 			while ((map=mapset_next(msh, 1))) {
-				mr=map_rect_new(map, &sel);
+				struct attr name_attr;
+				if (map_get_attr(map, attr_name, &name_attr, NULL)){
+					dbg(lvl_debug,"map name = %s\n",name_attr.u.str);
+					if (strstr(name_attr.u.str,".heightlines.bin")){
+						dbg(lvl_info,"reading heightlines from map %s\n",name_attr.u.str);
+						mr=map_rect_new(map, &sel);
+						heightmap_installed = TRUE;
+					}
+					else {
+						dbg(lvl_debug,"ignoring map %s\n",name_attr.u.str);
+					}
+				}
 				if (mr) {
 					while((item = map_rect_get_item(mr))) {
 						if (item->type >= sel.range.min && item->type <= sel.range.max) {
@@ -507,9 +529,20 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 						}
 					}
 					map_rect_destroy(mr);
+					mr = NULL;
 				}
 			}
 			mapset_close(msh);
+			if (!heightmap_installed){
+				char *text;
+				struct widget *w;
+				text=g_strdup_printf("%s",_("please install a map *.heightlines.bin to provide elevationdata"));
+				gui_internal_widget_append(box, w=gui_internal_label_new(this, text));
+				w->flags=gravity_bottom_center|orientation_horizontal|flags_fill;
+				g_free(text);
+				gui_internal_menu_render(this);
+				return;
+			}
 		}
 	}
 	map=NULL;
@@ -539,7 +572,8 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 										diagram_point->c.y=heightline->height;
 										diagram_point->next=diagram_points;
 										diagram_points=diagram_point;
-										dbg(lvl_info,"%d %d\n", diagram_point->c.x, diagram_point->c.y);
+										diagram_points_count ++;
+										dbg(lvl_debug,"%d %d\n", diagram_point->c.x, diagram_point->c.y);
 									}
 								}
 							}
@@ -550,18 +584,30 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 				}
 				last=c;
 			}
-
 		}
 	}
-
+	while (heightlines){
+		heightline=heightlines;
+		heightlines=heightlines->next;
+		g_free(heightline);
+	}
 	if(mr)
 		map_rect_destroy(mr);
 
-	gui_internal_menu_render(this);
-
-	if(!diagram_points) 
+	if(diagram_points_count < 2){
+		char *text;
+		struct widget *w;
+		text=g_strdup_printf("%s",_("The route must cross at least 2 heightlines"));
+		gui_internal_widget_append(box, w=gui_internal_label_new(this, text));
+		w->flags=gravity_bottom_center|orientation_horizontal|flags_fill;
+		g_free(text);
+		gui_internal_menu_render(this);
+		if(diagram_points)
+			g_free(diagram_points);
 		return;
+	}
 
+	gui_internal_menu_render(this);
 	first=1;
 	diagram_point=diagram_points;
 	while (diagram_point) {
@@ -573,38 +619,42 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 			coord_rect_extend(&dbbox, &diagram_point->c);
 		diagram_point=diagram_point->next;
 	}
-	dbg(lvl_info,"%d %d %d %d\n", dbbox.lu.x, dbbox.lu.y, dbbox.rl.x, dbbox.rl.y);
+	dbg(lvl_debug,"%d %d %d %d\n", dbbox.lu.x, dbbox.lu.y, dbbox.rl.x, dbbox.rl.y);
 	if (dbbox.rl.x > dbbox.lu.x && dbbox.lu.x*100/(dbbox.rl.x-dbbox.lu.x) <= 25)
 		dbbox.lu.x=0;
 	if (dbbox.lu.y > dbbox.rl.y && dbbox.rl.y*100/(dbbox.lu.y-dbbox.rl.y) <= 25)
 		dbbox.rl.y=0;
-	dbg(lvl_info,"%d,%d %dx%d\n", box->p.x, box->p.y, box->w, box->h);
+	dbg(lvl_debug,"%d,%d %dx%d\n", box->p.x, box->p.y, box->w, box->h);
 	x=dbbox.lu.x;
 	first=1;
-	for (;;) {
-		struct point p[2];
-		min=NULL;
-		diagram_point=diagram_points;
-		while (diagram_point) {
-			if (diagram_point->c.x >= x && (!min || min->c.x > diagram_point->c.x))
-				min=diagram_point;
-			diagram_point=diagram_point->next;
+	if (diagram_points_count > 1 && dbbox.rl.x != dbbox.lu.x && dbbox.lu.y != dbbox.rl.y){
+		for (;;) {
+			min=NULL;
+			diagram_point=diagram_points;
+			while (diagram_point) {
+				if (diagram_point->c.x >= x && (!min || min->c.x > diagram_point->c.x))
+					min=diagram_point;
+				diagram_point=diagram_point->next;
+			}
+			if (! min)
+				break;
+			p[1].x=(min->c.x-dbbox.lu.x)*(box->w-10)/(dbbox.rl.x-dbbox.lu.x)+box->p.x+5;
+			p[1].y=(box->h)-5-(min->c.y-dbbox.rl.y)*(box->h-10)/(dbbox.lu.y-dbbox.rl.y)+box->p.y;
+			dbg(lvl_debug,"%d,%d=%d,%d\n",min->c.x, min->c.y, p[1].x,p[1].y);
+			graphics_draw_circle(this->gra, this->foreground, &p[1], 2);
+			if (first)
+				first=0;
+			else
+				graphics_draw_lines(this->gra, this->foreground, p, 2);
+			p[0]=p[1];
+			x=min->c.x+1;
 		}
-		if (! min)
-			break;
-		p[1].x=(min->c.x-dbbox.lu.x)*(box->w-10)/(dbbox.rl.x-dbbox.lu.x)+box->p.x+5;
-		p[1].y=(min->c.y-dbbox.rl.y)*(box->h-10)/(dbbox.lu.y-dbbox.rl.y)+box->p.y+5;
-		dbg(lvl_info,"%d,%d=%d,%d\n",min->c.x, min->c.y, p[1].x,p[1].y);
-		graphics_draw_circle(this->gra, this->foreground, &p[1], 2);
-		if (first)
-			first=0;
-		else
-			graphics_draw_lines(this->gra, this->foreground, p, 2);
-		p[0]=p[1];
-		x=min->c.x+1;
 	}
-
-
+	while (diagram_points){
+		diagram_point=diagram_points;
+		diagram_points=diagram_points->next;
+		g_free(diagram_point);
+	}
 }
 
 static void
@@ -1079,7 +1129,6 @@ error:
 	return;
 }
 
-
 static void
 gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid)
 {
diff --git a/navit/gui/qml/gui_qml.cpp b/navit/gui/qml/gui_qml.cpp
index cee0574bd..7a1016473 100644
--- a/navit/gui/qml/gui_qml.cpp
+++ b/navit/gui/qml/gui_qml.cpp
@@ -473,5 +473,5 @@ static struct gui_priv * gui_qml_new(struct navit *nav, struct gui_methods *meth
 }
 
 void plugin_init(void) {
-    plugin_register_gui_type("qml",gui_qml_new);
+    plugin_register_category_gui("qml",gui_qml_new);
 }
diff --git a/navit/gui/win32/gui_win32.c b/navit/gui/win32/gui_win32.c
index bdbdb357d..8a8cb37b9 100644
--- a/navit/gui/win32/gui_win32.c
+++ b/navit/gui/win32/gui_win32.c
@@ -639,5 +639,5 @@ static struct gui_priv *win32_gui_new( struct navit *nav, struct gui_methods *me
 
 void plugin_init(void)
 {
-	plugin_register_gui_type("win32", win32_gui_new);
+	plugin_register_category_gui("win32", win32_gui_new);
 }
diff --git a/navit/map.c b/navit/map.c
index 51cda59be..2736da9f8 100644
--- a/navit/map.c
+++ b/navit/map.c
@@ -24,7 +24,7 @@
  * This file contains the code that makes navit able to load maps. Because
  * navit is able to open maps in different formats, this code does not handle
  * any map format itself. This is done by map plugins which register to this
- * code by calling plugin_register_map_type().
+ * code by calling plugin_register_category_map().
  *
  * When opening a new map, the map plugin will return a pointer to a map_priv
  * struct, which can be defined by the map plugin and contains whatever private
@@ -99,7 +99,7 @@ map_new(struct attr *parent, struct attr **attrs)
 		dbg(lvl_error,"missing type\n");
 		return NULL;
 	}
-	maptype_new=plugin_get_map_type(type->u.str);
+	maptype_new=plugin_get_category_map(type->u.str);
 	if (! maptype_new) {
 		dbg(lvl_error,"invalid type '%s'\n", type->u.str);
 		return NULL;
diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c
index 4ca4c6bf5..6b5108659 100644
--- a/navit/map/binfile/binfile.c
+++ b/navit/map/binfile/binfile.c
@@ -2848,6 +2848,6 @@ plugin_init(void)
 	if (sizeof(struct zip_cd) != 46) {
 		dbg(lvl_error,"error: sizeof(struct zip_cd)=%zu\n",sizeof(struct zip_cd));
 	}
-	plugin_register_map_type("binfile", map_new_binfile);
+	plugin_register_category_map("binfile", map_new_binfile);
 }
 
diff --git a/navit/map/csv/csv.c b/navit/map/csv/csv.c
index ea36432d1..2726e8ab9 100644
--- a/navit/map/csv/csv.c
+++ b/navit/map/csv/csv.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -864,7 +865,8 @@ map_new_csv(struct map_methods *meth, struct attr **attrs, struct callback_list
 	  	fclose(fp);
 	  }
 	  else {
-		dbg(lvl_error,"Error opening csv map file %s, starting with empty map\n", m->filename);
+		dbg(lvl_error,"Error opening csv map file '%s': %s\n", m->filename, strerror(errno));
+		return NULL;
 	  }
 	} else {
 	  	dbg(lvl_debug,"No data attribute, starting with in-memory map\n");
@@ -878,6 +880,6 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug,"csv: plugin_init\n");
-	plugin_register_map_type("csv", map_new_csv);
+	plugin_register_category_map("csv", map_new_csv);
 }
 
diff --git a/navit/map/filter/filter.c b/navit/map/filter/filter.c
index 63817ecc7..cecae7fc0 100644
--- a/navit/map/filter/filter.c
+++ b/navit/map/filter/filter.c
@@ -430,6 +430,6 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug,"filter: plugin_init\n");
-	plugin_register_map_type("filter", map_filter_new);
+	plugin_register_category_map("filter", map_filter_new);
 }
 
diff --git a/navit/map/garmin/garmin.c b/navit/map/garmin/garmin.c
index 609bcab0e..d00cb9794 100644
--- a/navit/map/garmin/garmin.c
+++ b/navit/map/garmin/garmin.c
@@ -993,5 +993,5 @@ gmap_new(struct map_methods *meth, struct attr **attrs, struct callback_list *cb
 void
 plugin_init(void)
 {
-	plugin_register_map_type("garmin", gmap_new);
+	plugin_register_category_map("garmin", gmap_new);
 }
diff --git a/navit/map/garmin_img/garmin_img.c b/navit/map/garmin_img/garmin_img.c
index 58fe489da..f7dccf89c 100644
--- a/navit/map/garmin_img/garmin_img.c
+++ b/navit/map/garmin_img/garmin_img.c
@@ -1508,6 +1508,6 @@ map_new_garmin_img(struct map_methods *meth, struct attr **attrs)
 void
 plugin_init(void)
 {
-	plugin_register_map_type("garmin_img", map_new_garmin_img);
+	plugin_register_category_map("garmin_img", map_new_garmin_img);
 }
 
diff --git a/navit/map/mg/map.c b/navit/map/mg/map.c
index 9b0805e2d..13561e154 100644
--- a/navit/map/mg/map.c
+++ b/navit/map/mg/map.c
@@ -609,5 +609,5 @@ map_new_mg(struct map_methods *meth, struct attr **attrs, struct callback_list *
 void
 plugin_init(void)
 {
-	plugin_register_map_type("mg", map_new_mg);
+	plugin_register_category_map("mg", map_new_mg);
 }
diff --git a/navit/map/shapefile/shapefile.c b/navit/map/shapefile/shapefile.c
index e67aaafee..e3eb4b723 100644
--- a/navit/map/shapefile/shapefile.c
+++ b/navit/map/shapefile/shapefile.c
@@ -682,7 +682,7 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug,"shapefile: plugin_init\n");
-	plugin_register_map_type("shapefile", map_new_shapefile);
+	plugin_register_category_map("shapefile", map_new_shapefile);
 }
 
 /************************************************************************/
diff --git a/navit/map/textfile/textfile.c b/navit/map/textfile/textfile.c
index d70f989f9..43be12368 100644
--- a/navit/map/textfile/textfile.c
+++ b/navit/map/textfile/textfile.c
@@ -394,6 +394,6 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug,"textfile: plugin_init\n");
-	plugin_register_map_type("textfile", map_new_textfile);
+	plugin_register_category_map("textfile", map_new_textfile);
 }
 
diff --git a/navit/maptool/maptool.h b/navit/maptool/maptool.h
index 7fde891dd..eca708591 100644
--- a/navit/maptool/maptool.h
+++ b/navit/maptool/maptool.h
@@ -115,11 +115,11 @@ struct item_bin_sink {
 	void *priv_data[8];
 	GList *sink_funcs;
 };
-
+#define NODE_ID_BITS 56
 struct node_item {
-	unsigned int id;
-	char ref_way;
 	struct coord c;
+	unsigned long long int nd_id:NODE_ID_BITS;
+	char ref_way;
 };
 
 struct zip_info;
@@ -131,7 +131,7 @@ struct country_table;
  * Must be at least 64 bit wide because IDs will soon exceed 32 bit.
  */
 typedef unsigned long long int osmid;
-#define OSMID_FMT LONGLONG_FMT
+#define OSMID_FMT ULONGLONG_FMT
 
 /** Files needed for processing a relation. */
 struct files_relation_processing {
@@ -418,3 +418,6 @@ int zip_get_zipnum(struct zip_info *info);
 void zip_set_zipnum(struct zip_info *info, int num);
 void zip_close(struct zip_info *info);
 void zip_destroy(struct zip_info *info);
+
+/* Break compilation on 32 bit architectures, as we're going to cast osmid's to gpointer to use them as keys to GHashTable's */
+struct maptool_force_64 {char s[sizeof(gpointer)<sizeof(osmid)?-1:1];};
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index 131d7f0eb..f30b06365 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -120,10 +120,16 @@ char *attr_strings[attr_string_last];
 
 char *osm_types[]={"unknown","node","way","relation"};
 
-#define REF_MARKER (1 << 30)
-#define IS_REF(c) ((c).x == REF_MARKER)
-#define GET_REF(c) ((unsigned)(c).y)
-#define SET_REF(c,ref) do { (c).x = REF_MARKER; (c).y = ref ; } while(0)
+/*
+ * These macros are designed to handle maptool internal node id reference representation. This representation does not leak 
+ * to binfile, so it's safe to change it without breaking binfile binary compatibility.
+ * Currently it keeps low 31 bits in y coordinate and up to 30 high order bits in x coordinate, allowing for 61 bit osm node id in total.
+ */
+#define REF_MARKER (1ull << 30)
+#define REF_MASK (3ull << 30)
+#define IS_REF(c) (((c).x & REF_MASK)==REF_MARKER)
+#define GET_REF(c) ((((osmid)(c).x & ~REF_MARKER)<<31) + (c).y )
+#define SET_REF(c,ref) do { (c).x = REF_MARKER | ((osmid)(ref)>>31); (c).y = (osmid)(ref) & 0x7fffffffull; } while(0)
 
 /* Table of country codes with possible is_in spellings. 
  *  Note: If you update this list, check also country array in country.c 
@@ -397,7 +403,6 @@ struct country_table {
 
 static char *attrmap={
 	"n	*=*			point_unkn\n"
-//	"n	Annehmlichkeit=Hochsitz	poi_hunting_stand\n"
 	"?	addr:housenumber=*	house_number\n"
 	"?	aeroway=aerodrome	poi_airport\n"
 	"?	aeroway=airport		poi_airport\n"
@@ -508,7 +513,7 @@ static char *attrmap={
 	"?	shop=car_repair		poi_repair_service\n"
 	"?	shop=clothes		poi_shop_apparel\n"
 	"?	shop=convenience	poi_shop_grocery\n"
-	"?	shop=drogist		poi_shop_drugstore\n"
+	"?	shop=chemist		poi_shop_drugstore\n"
 	"?	shop=florist		poi_shop_florist\n"
 	"?	shop=fruit		poi_shop_fruit\n"
 	"?	shop=furniture		poi_shop_furniture\n"
@@ -793,7 +798,7 @@ build_attrmap_line(char *line)
 		kvl=NULL;
 		if (!(idx=(int)(long)g_hash_table_lookup(attr_hash, kv))) {
 			idx=attr_present_count++;
-			g_hash_table_insert(attr_hash, kv, (gpointer)(long)idx);
+			g_hash_table_insert(attr_hash, kv, (gpointer)(long long)idx);
 		}
 		attr_mapping=g_realloc(attr_mapping, sizeof(struct attr_mapping)+(attr_mapping_count+1)*sizeof(int));
 		attr_mapping->attr_present_idx[attr_mapping_count++]=idx;
@@ -926,7 +931,7 @@ item_bin_get_nodeid(struct item_bin *ib)
 osmid
 item_bin_get_wayid(struct item_bin *ib)
 {
-	long long *ret=item_bin_get_attr(ib, attr_osm_wayid, NULL);
+	unsigned long long *ret=item_bin_get_attr(ib, attr_osm_wayid, NULL);
 	if (ret)
 		return *ret;
 	return 0;
@@ -1325,8 +1330,9 @@ node_buffer_to_hash(void)
 {
 	int i,count=node_buffer.size/sizeof(struct node_item);
 	struct node_item *ni=(struct node_item *)node_buffer.base;
+
 	for (i = 0 ; i < count ; i++)
-		g_hash_table_insert(node_hash, (gpointer)(long)(ni[i].id), (gpointer)(long)i);
+		g_hash_table_insert(node_hash, (gpointer)(long long)(ni[i].nd_id), (gpointer)(long long)i);
 }
 
 void
@@ -1374,23 +1380,24 @@ osm_add_node(osmid id, double lat, double lon)
       osmid_attr_value=id;
 
       current_node=allocate_node_item_in_buffer();
-      current_node->id=id;
+      dbg_assert(id < ((2ull<<NODE_ID_BITS)-1));
+      current_node->nd_id=id;
       current_node->ref_way=0;
       current_node->c.x=lon*6371000.0*M_PI/180;
       current_node->c.y=log(tan(M_PI_4+lat*M_PI/360))*6371000.0;
       if (! node_hash) {
-	      if (current_node->id > id_last_node) {
-		      id_last_node=current_node->id;
+	      if (current_node->nd_id > id_last_node) {
+		      id_last_node=current_node->nd_id;
 	      } else {
 		      fprintf(stderr,"INFO: Nodes out of sequence (new " OSMID_FMT " vs old " OSMID_FMT "), adding hash\n",
-			(osmid)current_node->id, id_last_node);
+			(osmid)current_node->nd_id, id_last_node);
 		      node_hash=g_hash_table_new(NULL, NULL);
 		      node_buffer_to_hash();
 	      }
       } else
-	      if (!g_hash_table_lookup(node_hash, (gpointer)(long)(current_node->id)))
-		      g_hash_table_insert(node_hash, (gpointer)(long)(current_node->id),
-			  (gpointer)(long)(current_node-(struct node_item *)node_buffer.base));
+	      if (!g_hash_table_lookup(node_hash, (gpointer)(long long)(current_node->nd_id)))
+		      g_hash_table_insert(node_hash, (gpointer)(long long)(current_node->nd_id),
+			  (gpointer)(long long)(current_node-(struct node_item *)node_buffer.base));
 	      else {
                       remove_last_node_item_from_buffer();
 		      nodeid=0;
@@ -1415,21 +1422,21 @@ node_item_find_index_in_ordered_list(osmid id)
       long long node_count=node_buffer.size/sizeof(struct node_item);
       long long search_step=node_count>4 ? node_count/4 : 1;
       long long search_index=node_count/2;
-      if (node_buffer_base[0].id > id)
+      if (node_buffer_base[0].nd_id > id)
 	      return -1;
-      if (node_buffer_base[node_count-1].id < id)
+      if (node_buffer_base[node_count-1].nd_id < id)
 	      return -1;
-      while (node_buffer_base[search_index].id != id) {
+      while (node_buffer_base[search_index].nd_id != id) {
 #if 0
 	      fprintf(stderr,"search_index=%d node_count=%d search_step=%d id=%d node_buffer_base[search_index].id=%d\n",
 		  search_index, node_count, search_step, id, node_buffer_base[search_index].id);
 #endif
-	      if (node_buffer_base[search_index].id < id) {
+	      if (node_buffer_base[search_index].nd_id < id) {
 		      search_index+=search_step;
 		      if (search_step == 1) {
 			      if (search_index >= node_count)
 				      return -1;
-			      if (node_buffer_base[search_index].id > id)
+			      if (node_buffer_base[search_index].nd_id > id)
 				      return -1;
 		      } else {
 			      if (search_index >= node_count)
@@ -1440,7 +1447,7 @@ node_item_find_index_in_ordered_list(osmid id)
 		      if (search_step == 1) {
 			      if (search_index < 0)
 				      return -1;
-			      if (node_buffer_base[search_index].id < id)
+			      if (node_buffer_base[search_index].nd_id < id)
 				      return -1;
 		      } else {
 			      if (search_index < 0)
@@ -1461,7 +1468,7 @@ node_item_get(osmid id)
       if (node_hash) {
             // Use g_hash_table_lookup_extended instead of g_hash_table_lookup
             // to distinguish a key with a value 0 from a missing key.
-            if (!g_hash_table_lookup_extended (node_hash, (gpointer)(long)(id), NULL,
+            if (!g_hash_table_lookup_extended (node_hash, (gpointer)(id), NULL,
                                            (gpointer)&result_index)) {
                   result_index=-1;
             }
@@ -1755,9 +1762,9 @@ osm_end_way(struct maptool_osm *osm)
 		return;
 
 	if (dedupe_ways_hash) {
-		if (g_hash_table_lookup(dedupe_ways_hash, (gpointer)(long)wayid))
+		if (g_hash_table_lookup(dedupe_ways_hash, (gpointer)(long long)wayid))
 			return;
-		g_hash_table_insert(dedupe_ways_hash, (gpointer)(long)wayid, (gpointer)1);
+		g_hash_table_insert(dedupe_ways_hash, (gpointer)(long long)wayid, (gpointer)1);
 	}
 
 	count=attr_longest_match(attr_mapping_way, attr_mapping_way_count, types, sizeof(types)/sizeof(enum item_type));
@@ -3002,8 +3009,8 @@ write_item_way_subsection_index(FILE *out, FILE *out_index, FILE *out_graph, str
 	idx[0]=item_bin_get_wayid(orig);
 	idx[1]=ftello(out);
 	if (way_hash) {
-		if (!(g_hash_table_lookup_extended(way_hash, (gpointer)(long)idx[0], NULL, NULL)))
-			g_hash_table_insert(way_hash, (gpointer)(long)idx[0], (gpointer)(long)idx[1]);
+		if (!(g_hash_table_lookup_extended(way_hash, (gpointer)(long long)idx[0], NULL, NULL)))
+			g_hash_table_insert(way_hash, (gpointer)(long long)idx[0], (gpointer)(long long)idx[1]);
 	} else {
 		if (!last_id || *last_id != idx[0])
 			dbg_assert(fwrite(idx, sizeof(idx), 1, out_index)==1);
@@ -3067,6 +3074,7 @@ resolve_ways(FILE *in, FILE *out)
 				c[i].x=ni->c.x;
 				c[i].y=ni->c.y;
 			}
+
 		}
 		item_bin_write(ib,out);
 	}
@@ -3122,7 +3130,6 @@ map_resolve_coords_and_split_at_intersections(FILE *in, FILE *out, FILE *out_ind
 	struct item_bin *ib;
 	struct node_item *ni;
 	long long last_id=0;
-
 	processed_nodes=processed_nodes_out=processed_ways=processed_relations=processed_tiles=0;
 	sig_alrm(0);
 	while ((ib=read_item(in))) {
diff --git a/navit/maptool/osm_o5m.c b/navit/maptool/osm_o5m.c
index 1ca3b1c3c..d6957067d 100644
--- a/navit/maptool/osm_o5m.c
+++ b/navit/maptool/osm_o5m.c
@@ -16,7 +16,7 @@ struct o5m {
 	int error;
 
 	int lat, lon, uid, version;
-	long long id, rid[3], changeset;
+	unsigned long long id, rid[3], changeset;
 	time_t timestamp;
 	char *user;
 };
@@ -49,24 +49,24 @@ static unsigned long long
 get_uval(unsigned char **p)
 {
 	unsigned char c;
-	long long ret=0;
+	unsigned long long ret=0;
 	int shift=0;
 
 	for (;;) {
 		c=*((*p)++);
-		ret+=((long long)c & 0x7f) << shift;
+		ret+=((unsigned long long)c & 0x7f) << shift;
 		if (!(c & 0x80)) 
 			return ret;
 		shift+=7;
 	}
 }
 
-static unsigned long long
+static long long
 get_sval(unsigned char **p)
 {
-	long long ret=get_uval(p);
+	unsigned long long ret=get_uval(p);
 	if (ret & 1) {
-		return -((ret >> 1)+1);
+		return -((long long)(ret >> 1)+1);
 	} else {
 		return ret >> 1;
 	}
diff --git a/navit/maptool/osm_relations.c b/navit/maptool/osm_relations.c
index 1ad04a281..591ca7d9d 100644
--- a/navit/maptool/osm_relations.c
+++ b/navit/maptool/osm_relations.c
@@ -135,7 +135,7 @@ relations_process(struct relations *rel, FILE *nodes, FILE *ways)
 {
 	char buffer[128];
 	struct item_bin *ib=(struct item_bin *)buffer;
-	long long *id;
+	osmid *id;
 	struct coord *c=(struct coord *)(ib+1),cn={0,0};
 	struct node_item *ni;
 	GList *l;
@@ -146,7 +146,7 @@ relations_process(struct relations *rel, FILE *nodes, FILE *ways)
 		item_bin_add_attr_longlong(ib, attr_osm_nodeid, 0);
 		id=item_bin_get_attr(ib, attr_osm_nodeid, NULL);
 		while ((ni=read_node_item(nodes))) {
-			*id=ni->id;
+			*id=ni->nd_id;
 			*c=ni->c;
 			l=g_hash_table_lookup(rel->member_hash[0], id);
 			while (l) {
diff --git a/navit/navigation.c b/navit/navigation.c
index 92b73796d..cdad6331c 100644
--- a/navit/navigation.c
+++ b/navit/navigation.c
@@ -4444,7 +4444,7 @@ navigation_set_route(struct navigation *this_, struct route *route)
 void
 navigation_init(void)
 {
-	plugin_register_map_type("navigation", navigation_map_new);
+	plugin_register_category_map("navigation", navigation_map_new);
 }
 
 struct object_func navigation_func = {
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 8c2d16e68..eb2191963 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -88,13 +88,14 @@ Navigation</text></img>
 				<img cond='fullscreen==1' src='gui_leave_fullscreen' onclick='fullscreen=0'><text>Window Mode</text></img>
 				<img cond='navit.pitch==0' src='gui_map' onclick='navit.pitch=pitch;redraw_map();back_to_map()'><text>3D</text></img>
 				<img cond='navit.pitch!=0' src='gui_map' onclick='navit.pitch=0;redraw_map();back_to_map()'><text>2D</text></img>
+				<a href='#Settings Layers'><img src='gui_layers'><text>Layers</text></img></a>
 			</a>
 			<a name='Tools'><text>Tools</text>
 				<img src='gui_actions' onclick='locale()'><text>Show Locale</text></img>
 			</a>
 			<a name='Route'><text>Route</text>
 				<img src='gui_actions' onclick='route_description()'><text>Description</text></img>
-				<img src='gui_actions' onclick='route_height_profile()'><text>Height Profile</text></img>
+				<img src='gui_heightprofile' onclick='route_height_profile()'><text>Height Profile</text></img>
 				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='cursor_still' onclick='waypoints()'><text>Waypoints</text></img>
 				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='gui_stop' onclick='navit.route_remove_last_waypoint()'><text>Drop last 
 Waypoint</text></img>
@@ -122,6 +123,17 @@ Waypoint</text></img>
 								"","navit.mapset.map[@data==%{se}].active=%{d}*",map.data,!map.active,"redraw_map();refresh();");
 				</script>
 			</a>
+			<a name='Settings Layers' class='clist'><text>Layers</text>
+				<script>
+					foreach(layer;navit.layout.layer)
+						if (layer.name)
+							img("centry",layer.active?"gui_active":"gui_inactive",layer.name,
+							"","navit.layout.layer[@name==%{se}].active=%{d}*",layer.name,!layer.active,"redraw_map();refresh();");
+						else
+							img("centry",layer.active?"gui_active":"gui_inactive",
+								"","navit.layout.layer[@name==%{se}].active=%{d}*",layer.name,!layer.active,"redraw_map();refresh();");
+				</script>
+			</a>
 			<a name='Settings Vehicles' class='clist'><text>Vehicle</text>
 				<script>
 					foreach(vehicle;navit.vehicle)
@@ -152,7 +164,9 @@ Waypoint</text></img>
 		]]></gui>
 		<!-- for a debug log -->
 		<log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
-		<!-- osd items allow to position display and control items directly on top of the map: -->
+		<!-- osd items allow to position display and control items directly on top of the map.
+		You can find a list of all the available OSDs items here:
+		http://wiki.navit-project.org/index.php/OSD -->
 		<osd enabled="no" type="compass"/>
 		<osd enabled="no" type="navigation_next_turn"/> 
 
@@ -643,14 +657,28 @@ Waypoint</text></img>
 				<itemgra item_types="border_state" order="0-">
 					<polyline color="#808080" width="1"/>
 				</itemgra>
-				<itemgra item_types="height_line_1" order="0-">
-					<polyline color="#000000" width="4"/>
+			</layer>
+			<layer name="heightlines">
+				<itemgra item_types="height_line_1" order="7">
+					<polyline color="#000000" width="1"/>
 				</itemgra>
-				<itemgra item_types="height_line_2" order="0-">
+				<itemgra item_types="height_line_1" order="8-">
+					<polyline color="#000000" width="3"/>
+					<text text_size="8"/>
+				</itemgra>
+				<itemgra item_types="height_line_2" order="8">
+					<polyline color="#000000" width="1"/>
+				</itemgra>
+				<itemgra item_types="height_line_2" order="9-">
 					<polyline color="#000000" width="2"/>
+					<text text_size="8"/>
+				</itemgra>
+				<itemgra item_types="height_line_3" order="9-11">
+					<polyline color="#000000" width="1"/>
 				</itemgra>
-				<itemgra item_types="height_line_3" order="0-">
+				<itemgra item_types="height_line_3" order="12-">
 					<polyline color="#000000" width="1"/>
+					<text text_size="8"/>
 				</itemgra>
 			</layer>
 			<layer name="streets">
diff --git a/navit/osd.c b/navit/osd.c
index a2b88b0ad..a0c9183d1 100644
--- a/navit/osd.c
+++ b/navit/osd.c
@@ -52,7 +52,7 @@ osd_new(struct attr *parent, struct attr **attrs)
 
 	if (! type)
 		return NULL;
-        new=plugin_get_osd_type(type->u.str);
+        new=plugin_get_category_osd(type->u.str);
         if (! new) {
 		dbg(lvl_error, "invalid OSD type '%s'\n", type->u.str);
                 return NULL;
diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c
index 4d38591e2..9b43a160b 100644
--- a/navit/osd/core/osd_core.c
+++ b/navit/osd/core/osd_core.c
@@ -3880,21 +3880,21 @@ osd_auxmap_new(struct navit *nav, struct osd_methods *meth, struct attr **attrs)
 void
 plugin_init(void)
 {
-	plugin_register_osd_type("compass", osd_compass_new);
-	plugin_register_osd_type("navigation_next_turn", osd_nav_next_turn_new);
-	plugin_register_osd_type("button", osd_button_new);
-	plugin_register_osd_type("toggle_announcer", osd_nav_toggle_announcer_new);
-	plugin_register_osd_type("speed_warner", osd_speed_warner_new);
-	plugin_register_osd_type("speed_cam", osd_speed_cam_new);
-	plugin_register_osd_type("text", osd_text_new);
-	plugin_register_osd_type("gps_status", osd_gps_status_new);
-	plugin_register_osd_type("volume", osd_volume_new);
-	plugin_register_osd_type("scale", osd_scale_new);
-	plugin_register_osd_type("image", osd_image_new);
-	plugin_register_osd_type("stopwatch", osd_stopwatch_new);
-	plugin_register_osd_type("odometer", osd_odometer_new);
-	plugin_register_osd_type("auxmap", osd_auxmap_new);
-	plugin_register_osd_type("cmd_interface", osd_cmd_interface_new);
-	plugin_register_osd_type("route_guard", osd_route_guard_new);
-	plugin_register_osd_type("navigation_status", osd_navigation_status_new);
+	plugin_register_category_osd("compass", osd_compass_new);
+	plugin_register_category_osd("navigation_next_turn", osd_nav_next_turn_new);
+	plugin_register_category_osd("button", osd_button_new);
+	plugin_register_category_osd("toggle_announcer", osd_nav_toggle_announcer_new);
+	plugin_register_category_osd("speed_warner", osd_speed_warner_new);
+	plugin_register_category_osd("speed_cam", osd_speed_cam_new);
+	plugin_register_category_osd("text", osd_text_new);
+	plugin_register_category_osd("gps_status", osd_gps_status_new);
+	plugin_register_category_osd("volume", osd_volume_new);
+	plugin_register_category_osd("scale", osd_scale_new);
+	plugin_register_category_osd("image", osd_image_new);
+	plugin_register_category_osd("stopwatch", osd_stopwatch_new);
+	plugin_register_category_osd("odometer", osd_odometer_new);
+	plugin_register_category_osd("auxmap", osd_auxmap_new);
+	plugin_register_category_osd("cmd_interface", osd_cmd_interface_new);
+	plugin_register_category_osd("route_guard", osd_route_guard_new);
+	plugin_register_category_osd("navigation_status", osd_navigation_status_new);
 }
diff --git a/navit/plugin.c b/navit/plugin.c
index 2edf9ed74..8c61bc9b7 100644
--- a/navit/plugin.c
+++ b/navit/plugin.c
@@ -378,9 +378,9 @@ plugins_destroy(struct plugins *pls)
 }
 
 static void *
-find_by_name(enum plugin_type type, const char *name)
+find_by_name(enum plugin_category category, const char *name)
 {
-	GList *name_list=plugin_types[type];
+	GList *name_list=plugin_categories[category];
 	while (name_list) {
 		struct name_val *nv=name_list->data;
 		if (!g_ascii_strcasecmp(nv->name, name))
@@ -391,23 +391,23 @@ find_by_name(enum plugin_type type, const char *name)
 }
 
 void *
-plugin_get_type(enum plugin_type type, const char *type_name, const char *name)
+plugin_get_category(enum plugin_category category, const char *category_name, const char *name)
 {
 	GList *plugin_list;
 	struct plugin *pl;
 	char *mod_name, *filename=NULL, *corename=NULL;
 	void *result=NULL;
 
-	dbg(lvl_debug, "type=\"%s\", name=\"%s\"\n", type_name, name);
+	dbg(lvl_debug, "category=\"%s\", name=\"%s\"\n", category_name, name);
 
-	if ((result=find_by_name(type, name))) {
+	if ((result=find_by_name(category, name))) {
 		return result;
 	}
 	if (!pls)
 		return NULL;
 	plugin_list=pls->list;
-	filename=g_strjoin("", "lib", type_name, "_", name, NULL);
-	corename=g_strjoin("", "lib", type_name, "_", "core", NULL);
+	filename=g_strjoin("", "lib", category_name, "_", name, NULL);
+	corename=g_strjoin("", "lib", category_name, "_", "core", NULL);
 	while (plugin_list) {
 		pl=plugin_list->data;
 		if ((mod_name=g_strrstr(pl->name, "/")))
@@ -421,7 +421,7 @@ plugin_get_type(enum plugin_type type, const char *type_name, const char *name)
 					plugin_set_active(pl, 0);
 			if (plugin_get_active(pl)) 
 				plugin_call_init(pl);
-			if ((result=find_by_name(type, name))) {
+			if ((result=find_by_name(category, name))) {
 				g_free(filename);
 				g_free(corename);
 				return result;
diff --git a/navit/plugin.h b/navit/plugin.h
index 23901b4ed..4687a6460 100644
--- a/navit/plugin.h
+++ b/navit/plugin.h
@@ -25,16 +25,32 @@ extern "C" {
 
 struct plugin;
 
-enum plugin_type {
-	plugin_type_graphics,
-	plugin_type_gui,
-	plugin_type_map,
-	plugin_type_osd,
-	plugin_type_speech,
-	plugin_type_vehicle,
-	plugin_type_event,
-	plugin_type_font,
-	plugin_type_last,
+/**
+ * @brief All existing plugin categories.
+ *
+ * Plugins are grouped into categories. Plugins within one category offer the same
+ * functionality (GUI, graphics, map etc.). Consequently the category determines the API
+ * 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,
+	/** Dummy for last entry. */
+	plugin_category_last,
 };
 #endif
 
@@ -44,7 +60,7 @@ struct popup_item;
 #undef PLUGIN_FUNC1
 #undef PLUGIN_FUNC3
 #undef PLUGIN_FUNC4
-#undef PLUGIN_TYPE
+#undef PLUGIN_CATEGORY
 #define PLUGIN_PROTO(name,...) void name(__VA_ARGS__)
 
 #ifdef PLUGIN_C
@@ -81,25 +97,25 @@ struct name_val {
 	void *val;
 };
 
-GList *plugin_types[plugin_type_last];
+GList *plugin_categories[plugin_category_last];
 
-#define PLUGIN_TYPE(type,newargs) \
-struct type##_priv; \
-struct type##_methods; \
+#define PLUGIN_CATEGORY(category,newargs) \
+struct category##_priv; \
+struct category##_methods; \
 void \
-plugin_register_##type##_type(const char *name, struct type##_priv *(*new_) newargs) \
+plugin_register_category_##category(const char *name, struct category##_priv *(*new_) newargs) \
 { \
         struct name_val *nv; \
         nv=g_new(struct name_val, 1); \
         nv->name=g_strdup(name); \
 	nv->val=new_; \
-	plugin_types[plugin_type_##type]=g_list_append(plugin_types[plugin_type_##type], nv); \
+	plugin_categories[plugin_category_##category]=g_list_append(plugin_categories[plugin_category_##category], nv); \
 } \
  \
 void * \
-plugin_get_##type##_type(const char *name) \
+plugin_get_category_##category(const char *name) \
 { \
-	return plugin_get_type(plugin_type_##type, #type, name); \
+	return plugin_get_category(plugin_category_##category, #category, name); \
 } 
 
 #else
@@ -115,11 +131,11 @@ void plugin_call_##name(t1 p1,t2 p2,t3 p3);
 void plugin_register_##name(void(*func)(t1 p1,t2 p2,t3 p3,t4 p4));	\
 void plugin_call_##name(t1 p1,t2 p2,t3 p3,t4 p4);
 
-#define PLUGIN_TYPE(type,newargs) \
-struct type##_priv; \
-struct type##_methods; \
-void plugin_register_##type##_type(const char *name, struct type##_priv *(*new_) newargs); \
-void *plugin_get_##type##_type(const char *name);
+#define PLUGIN_CATEGORY(category,newargs) \
+struct category##_priv; \
+struct category##_methods; \
+void plugin_register_category_##category(const char *name, struct category##_priv *(*new_) newargs); \
+void *plugin_get_category_##category(const char *name);
 
 #endif
 
@@ -148,7 +164,7 @@ struct plugins *plugins_new(void);
 struct plugin *plugin_new(struct attr *parent, struct attr ** attrs);
 void plugins_init(struct plugins *pls);
 void plugins_destroy(struct plugins *pls);
-void *plugin_get_type(enum plugin_type type, const char *type_name, const char *name);
+void *plugin_get_category(enum plugin_category category, const char *category_name, const char *name);
 /* end of prototypes */
 
 #ifdef __cplusplus
diff --git a/navit/plugin/j1850/j1850.c b/navit/plugin/j1850/j1850.c
index b4648bcfe..26e18057d 100644
--- a/navit/plugin/j1850/j1850.c
+++ b/navit/plugin/j1850/j1850.c
@@ -502,5 +502,5 @@ plugin_init(void)
 	struct attr callback,navit;
 	struct attr_iter *iter;
 
-	plugin_register_osd_type("j1850", osd_j1850_new);
+	plugin_register_category_osd("j1850", osd_j1850_new);
 }
diff --git a/navit/plugin/pedestrian/pedestrian.c b/navit/plugin/pedestrian/pedestrian.c
index 444543694..7e5a4361d 100644
--- a/navit/plugin/pedestrian/pedestrian.c
+++ b/navit/plugin/pedestrian/pedestrian.c
@@ -1369,8 +1369,8 @@ plugin_init(void)
 	(*jnienv)->CallVoidMethod(jnienv, android_activity, Activity_setRequestedOrientation, 0);
 #endif
 	
-    	plugin_register_osd_type("marker", osd_marker_new);
-	plugin_register_map_type("route_occluded", map_route_occluded_new);
+    	plugin_register_category_osd("marker", osd_marker_new);
+	plugin_register_category_map("route_occluded", map_route_occluded_new);
 	callback.type=attr_callback;
 	callback.u.callback=callback_new_attr_0(callback_cast(pedestrian_navit), attr_navit);
 	config_add_attr(config, &callback);
diff --git a/navit/plugin_def.h b/navit/plugin_def.h
index 01acea7bf..985160e6f 100644
--- a/navit/plugin_def.h
+++ b/navit/plugin_def.h
@@ -23,11 +23,11 @@ struct callback_list;
 struct gui;
 PLUGIN_FUNC1(draw, struct container *, co)
 PLUGIN_FUNC3(popup, struct container *, map, struct popup *, p, struct popup_item **, list)
-PLUGIN_TYPE(graphics, (struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl)) 
-PLUGIN_TYPE(gui, (struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui)) 
-PLUGIN_TYPE(map, (struct map_methods *meth, struct attr **attrs, struct callback_list *cbl)) 
-PLUGIN_TYPE(osd, (struct navit *nav, struct osd_methods *meth, struct attr **attrs))
-PLUGIN_TYPE(speech, (struct speech_methods *meth, struct attr **attrs, struct attr *parent)) 
-PLUGIN_TYPE(vehicle, (struct vehicle_methods *meth, struct callback_list *cbl, struct attr **attrs)) 
-PLUGIN_TYPE(event, (struct event_methods *meth)) 
-PLUGIN_TYPE(font, (void *meth)) 
+PLUGIN_CATEGORY(graphics, (struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl))
+PLUGIN_CATEGORY(gui, (struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui))
+PLUGIN_CATEGORY(map, (struct map_methods *meth, struct attr **attrs, struct callback_list *cbl))
+PLUGIN_CATEGORY(osd, (struct navit *nav, struct osd_methods *meth, struct attr **attrs))
+PLUGIN_CATEGORY(speech, (struct speech_methods *meth, struct attr **attrs, struct attr *parent))
+PLUGIN_CATEGORY(vehicle, (struct vehicle_methods *meth, struct callback_list *cbl, struct attr **attrs))
+PLUGIN_CATEGORY(event, (struct event_methods *meth))
+PLUGIN_CATEGORY(font, (void *meth))
diff --git a/navit/route.c b/navit/route.c
index 3fdc38964..e367c3855 100644
--- a/navit/route.c
+++ b/navit/route.c
@@ -4202,8 +4202,8 @@ route_attr_iter_destroy(struct attr_iter *iter)
 void
 route_init(void)
 {
-	plugin_register_map_type("route", route_map_new);
-	plugin_register_map_type("route_graph", route_graph_map_new);
+	plugin_register_category_map("route", route_map_new);
+	plugin_register_category_map("route_graph", route_graph_map_new);
 }
 
 void
diff --git a/navit/speech.c b/navit/speech.c
index d3b09ae3a..cabd998dc 100644
--- a/navit/speech.c
+++ b/navit/speech.c
@@ -45,7 +45,7 @@ speech_new(struct attr *parent, struct attr **attrs)
 		return NULL;
 	}
 	dbg(lvl_debug,"type='%s'\n", attr->u.str);
-	speech_new=plugin_get_speech_type(attr->u.str);
+	speech_new=plugin_get_category_speech(attr->u.str);
 	dbg(lvl_debug,"new=%p\n", speech_new);
 	if (! speech_new) {
 		dbg(lvl_error,"wrong type '%s'\n", attr->u.str);
diff --git a/navit/speech/android/speech_android.c b/navit/speech/android/speech_android.c
index 3323245aa..2b3f2612c 100644
--- a/navit/speech/android/speech_android.c
+++ b/navit/speech/android/speech_android.c
@@ -145,5 +145,5 @@ speech_android_new(struct speech_methods *meth, struct attr **attrs, struct attr
 void
 plugin_init(void)
 {
-	plugin_register_speech_type("android", speech_android_new);
+	plugin_register_category_speech("android", speech_android_new);
 }
diff --git a/navit/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c
index 49252f346..490811ce5 100644
--- a/navit/speech/cmdline/speech_cmdline.c
+++ b/navit/speech/cmdline/speech_cmdline.c
@@ -261,5 +261,5 @@ speechd_new(struct speech_methods *meth, struct attr **attrs, struct attr *paren
 void
 plugin_init(void)
 {
-	plugin_register_speech_type("cmdline", speechd_new);
+	plugin_register_category_speech("cmdline", speechd_new);
 }
diff --git a/navit/speech/dbus/speech_dbus.c b/navit/speech/dbus/speech_dbus.c
index 53ab46f03..0fdfb71ab 100644
--- a/navit/speech/dbus/speech_dbus.c
+++ b/navit/speech/dbus/speech_dbus.c
@@ -73,5 +73,5 @@ speech_dbus_new(struct speech_methods *meth, struct attr **attrs, struct attr *p
 void
 plugin_init(void)
 {
-	plugin_register_speech_type("dbus", speech_dbus_new);
+	plugin_register_category_speech("dbus", speech_dbus_new);
 }
diff --git a/navit/speech/espeak/speak.c b/navit/speech/espeak/speak.c
index 523679b38..329a05d01 100644
--- a/navit/speech/espeak/speak.c
+++ b/navit/speech/espeak/speak.c
@@ -514,5 +514,5 @@ espeak_new(struct speech_methods *meth, struct attr **attrs, struct attr *parent
 void
 plugin_init(void)
 {
-	plugin_register_speech_type("espeak", espeak_new);
+	plugin_register_category_speech("espeak", espeak_new);
 }
diff --git a/navit/speech/speech_dispatcher/speech_speech_dispatcher.c b/navit/speech/speech_dispatcher/speech_speech_dispatcher.c
index 05228187c..d22b3f795 100644
--- a/navit/speech/speech_dispatcher/speech_speech_dispatcher.c
+++ b/navit/speech/speech_dispatcher/speech_speech_dispatcher.c
@@ -77,5 +77,5 @@ speechd_new(struct speech_methods *meth, struct attr **attrs, struct attr *attr)
 void
 plugin_init(void)
 {
-	plugin_register_speech_type("speech_dispatcher", speechd_new);
+	plugin_register_category_speech("speech_dispatcher", speechd_new);
 }
diff --git a/navit/track.c b/navit/track.c
index 7e9f6fdff..5c16e4261 100644
--- a/navit/track.c
+++ b/navit/track.c
@@ -1227,5 +1227,5 @@ tracking_map_new(struct map_methods *meth, struct attr **attrs, struct callback_
 void
 tracking_init(void)
 {
-	plugin_register_map_type("tracking", tracking_map_new);
+	plugin_register_category_map("tracking", tracking_map_new);
 }
diff --git a/navit/types.h b/navit/types.h
index 987b42a71..b91e01bd8 100644
--- a/navit/types.h
+++ b/navit/types.h
@@ -29,9 +29,11 @@ typedef int32_t s32;
 typedef uint32_t u32;
 
 #ifdef HAVE_API_WIN32_BASE
+#define ULONGLONG_FMT "%I64u"
 #define LONGLONG_FMT "%I64d"
 #define LONGLONG_HEX_FMT "%I64x"
 #else
+#define ULONGLONG_FMT "%llu"
 #define LONGLONG_FMT "%lld"
 #define LONGLONG_HEX_FMT "%llx"
 #endif
diff --git a/navit/vehicle.c b/navit/vehicle.c
index a280fb024..33cecb0e9 100644
--- a/navit/vehicle.c
+++ b/navit/vehicle.c
@@ -122,7 +122,7 @@ vehicle_new(struct attr *parent, struct attr **attrs)
 		*colon = '\0';
 	dbg(lvl_debug, "source='%s' type='%s'\n", source->u.str, type);
 
-	vehicletype_new = plugin_get_vehicle_type(type);
+	vehicletype_new = plugin_get_category_vehicle(type);
 	if (!vehicletype_new) {
 		dbg(lvl_error, "invalid source '%s': unknown type '%s'\n", source->u.str, type);
 		g_free(type);
diff --git a/navit/vehicle/android/vehicle_android.c b/navit/vehicle/android/vehicle_android.c
index d4b784a0e..89882d048 100644
--- a/navit/vehicle/android/vehicle_android.c
+++ b/navit/vehicle/android/vehicle_android.c
@@ -292,5 +292,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("android", vehicle_android_new_android);
+	plugin_register_category_vehicle("android", vehicle_android_new_android);
 }
diff --git a/navit/vehicle/demo/vehicle_demo.c b/navit/vehicle/demo/vehicle_demo.c
index c5cf7e045..59a119204 100644
--- a/navit/vehicle/demo/vehicle_demo.c
+++ b/navit/vehicle/demo/vehicle_demo.c
@@ -298,5 +298,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("demo", vehicle_demo_new);
+	plugin_register_category_vehicle("demo", vehicle_demo_new);
 }
diff --git a/navit/vehicle/file/vehicle_file.c b/navit/vehicle/file/vehicle_file.c
index f7a0024b9..bb6134042 100644
--- a/navit/vehicle/file/vehicle_file.c
+++ b/navit/vehicle/file/vehicle_file.c
@@ -1046,8 +1046,8 @@ vehicle_file_new_file(struct vehicle_methods
 void plugin_init(void)
 {
 	dbg(lvl_debug, "vehicle_file:plugin_init:enter\n");
-	plugin_register_vehicle_type("file", vehicle_file_new_file);
-	plugin_register_vehicle_type("pipe", vehicle_file_new_file);
-	plugin_register_vehicle_type("socket", vehicle_file_new_file);
-	plugin_register_vehicle_type("serial", vehicle_file_new_file);
+	plugin_register_category_vehicle("file", vehicle_file_new_file);
+	plugin_register_category_vehicle("pipe", vehicle_file_new_file);
+	plugin_register_category_vehicle("socket", vehicle_file_new_file);
+	plugin_register_category_vehicle("serial", vehicle_file_new_file);
 }
diff --git a/navit/vehicle/file/vehicle_pipe.c b/navit/vehicle/file/vehicle_pipe.c
index 0750edef3..420390d4e 100644
--- a/navit/vehicle/file/vehicle_pipe.c
+++ b/navit/vehicle/file/vehicle_pipe.c
@@ -23,5 +23,5 @@
 void
 plugin_init(void)
 {
-	plugin_get_vehicle_type("file");
+	plugin_get_category_vehicle("file");
 }
diff --git a/navit/vehicle/file/vehicle_serial.c b/navit/vehicle/file/vehicle_serial.c
index 0750edef3..420390d4e 100644
--- a/navit/vehicle/file/vehicle_serial.c
+++ b/navit/vehicle/file/vehicle_serial.c
@@ -23,5 +23,5 @@
 void
 plugin_init(void)
 {
-	plugin_get_vehicle_type("file");
+	plugin_get_category_vehicle("file");
 }
diff --git a/navit/vehicle/file/vehicle_socket.c b/navit/vehicle/file/vehicle_socket.c
index 0750edef3..420390d4e 100644
--- a/navit/vehicle/file/vehicle_socket.c
+++ b/navit/vehicle/file/vehicle_socket.c
@@ -23,5 +23,5 @@
 void
 plugin_init(void)
 {
-	plugin_get_vehicle_type("file");
+	plugin_get_category_vehicle("file");
 }
diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c
index 73d9e648d..a8c29cd97 100644
--- a/navit/vehicle/gpsd/vehicle_gpsd.c
+++ b/navit/vehicle/gpsd/vehicle_gpsd.c
@@ -471,5 +471,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("gpsd", vehicle_gpsd_new_gpsd);
+	plugin_register_category_vehicle("gpsd", vehicle_gpsd_new_gpsd);
 }
diff --git a/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c b/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
index dda774e35..fa5eb8780 100644
--- a/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
+++ b/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c
@@ -244,5 +244,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("gpsd_dbus", vehicle_gpsd_dbus_new);
+	plugin_register_category_vehicle("gpsd_dbus", vehicle_gpsd_dbus_new);
 }
diff --git a/navit/vehicle/gypsy/vehicle_gypsy.c b/navit/vehicle/gypsy/vehicle_gypsy.c
index 2ff9389f7..589e53a3f 100644
--- a/navit/vehicle/gypsy/vehicle_gypsy.c
+++ b/navit/vehicle/gypsy/vehicle_gypsy.c
@@ -493,5 +493,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("gypsy", vehicle_gypsy_new_gypsy);
+	plugin_register_category_vehicle("gypsy", vehicle_gypsy_new_gypsy);
 }
diff --git a/navit/vehicle/iphone/vehicle_iphone.c b/navit/vehicle/iphone/vehicle_iphone.c
index 4c25c0235..94fec114a 100644
--- a/navit/vehicle/iphone/vehicle_iphone.c
+++ b/navit/vehicle/iphone/vehicle_iphone.c
@@ -161,5 +161,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("iphone", vehicle_iphone_new);
+	plugin_register_category_vehicle("iphone", vehicle_iphone_new);
 }
diff --git a/navit/vehicle/maemo/vehicle_maemo.c b/navit/vehicle/maemo/vehicle_maemo.c
index 661202d67..d686a6a03 100644
--- a/navit/vehicle/maemo/vehicle_maemo.c
+++ b/navit/vehicle/maemo/vehicle_maemo.c
@@ -325,5 +325,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("maemo", vehicle_maemo_new_maemo);
+	plugin_register_category_vehicle("maemo", vehicle_maemo_new_maemo);
 }
diff --git a/navit/vehicle/null/vehicle_null.c b/navit/vehicle/null/vehicle_null.c
index 134538cc3..643945c71 100644
--- a/navit/vehicle/null/vehicle_null.c
+++ b/navit/vehicle/null/vehicle_null.c
@@ -179,5 +179,5 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("null", vehicle_null_new_null);
+	plugin_register_category_vehicle("null", vehicle_null_new_null);
 }
diff --git a/navit/vehicle/webos/vehicle_webos.c b/navit/vehicle/webos/vehicle_webos.c
index e0a849b97..a5bba4bce 100644
--- a/navit/vehicle/webos/vehicle_webos.c
+++ b/navit/vehicle/webos/vehicle_webos.c
@@ -381,6 +381,6 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("webos", vehicle_webos_new);
+	plugin_register_category_vehicle("webos", vehicle_webos_new);
 }
 
diff --git a/navit/vehicle/wince/vehicle_wince.c b/navit/vehicle/wince/vehicle_wince.c
index 8dd3e40db..38cab3f1c 100644
--- a/navit/vehicle/wince/vehicle_wince.c
+++ b/navit/vehicle/wince/vehicle_wince.c
@@ -949,6 +949,6 @@ void
 plugin_init(void)
 {
 	dbg(lvl_debug, "enter\n");
-	plugin_register_vehicle_type("wince", vehicle_wince_new);
-	plugin_register_vehicle_type("file", vehicle_wince_new);
+	plugin_register_category_vehicle("wince", vehicle_wince_new);
+	plugin_register_category_vehicle("file", vehicle_wince_new);
 }
diff --git a/navit/xpm/gui_heightprofile.svg b/navit/xpm/gui_heightprofile.svg
new file mode 100644
index 000000000..0d80b5c12
--- /dev/null
+++ b/navit/xpm/gui_heightprofile.svg
@@ -0,0 +1,20 @@
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+ <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ for Navit -->
+ <defs>
+  <linearGradient y2="0%" x2="100%" y1="0%" x1="0%" id="grad1">
+   <stop stop-color="rgb(90,90,90)" offset="0%"/>
+   <stop stop-color="rgb(175,175,175)" offset="100%"/>
+  </linearGradient>
+ </defs>
+ <g>
+  <title>Layer 1</title>
+  <polygon transform="translate(0, -3)" id="svg_2" fill="url(#grad1)" points="10,165 30,165 60,80 75,120 85,120 115,20 160,180 190,180 190,190 10,190"/>
+  <line id="svg_3" fill="none" stroke="gainsboro" stroke-width="6" y2="165" x2="30" y1="165" x1="10"/>
+  <line id="svg_4" fill="none" stroke="gainsboro" stroke-width="6" y2="80" x2="60" y1="165" x1="30" stroke-linecap="round"/>
+  <line id="svg_5" fill="none" stroke="gainsboro" stroke-width="6" y2="120" x2="75" y1="80" x1="60" stroke-linecap="round"/>
+  <line id="svg_6" fill="none" stroke="gainsboro" stroke-width="6" y2="120" x2="85" y1="120" x1="75" stroke-linecap="round"/>
+  <line id="svg_7" fill="none" stroke="gainsboro" stroke-width="6" y2="20" x2="115" y1="120" x1="85" stroke-linecap="round"/>
+  <line id="svg_8" fill="none" stroke="gainsboro" stroke-width="6" y2="180" x2="160" y1="20" x1="115" stroke-linecap="round"/>
+  <line id="svg_9" fill="none" stroke="gainsboro" stroke-width="6" y2="180" x2="190" y1="180" x1="160"/>
+ </g>
+</svg>
diff --git a/navit/xpm/gui_layers.svg b/navit/xpm/gui_layers.svg
new file mode 100644
index 000000000..810b5a1d6
--- /dev/null
+++ b/navit/xpm/gui_layers.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<!-- Created with Inkscape (http://www.inkscape.org/) -->

+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="18.02128" height="18" id="svg5952">

+  <defs id="defs5954">

+    <linearGradient id="linearGradient2485-94">

+      <stop id="stop2486-7" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>

+      <stop id="stop2487-83" style="stop-color:#aaaaaa;stop-opacity:1" offset="1"/>

+    </linearGradient>

+    <linearGradient id="linearGradient5704-5">

+      <stop id="stop5706-120" style="stop-color:#5a5a5a;stop-opacity:1" offset="0"/>

+      <stop id="stop5708-16" style="stop-color:#000000;stop-opacity:1" offset="1"/>

+    </linearGradient>

+    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4351" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-173.95451)"/>

+    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4353" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-173.95451)"/>

+    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4356" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-170.95451)"/>

+    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4358" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-170.95451)"/>

+    <linearGradient x1="974.19751" y1="182.46863" x2="979.80444" y2="184.8026" id="linearGradient4362" xlink:href="#linearGradient2485-94" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-167.95454)"/>

+    <linearGradient x1="968.88806" y1="178.31856" x2="977.93347" y2="181.70978" id="linearGradient4364" xlink:href="#linearGradient5704-5" gradientUnits="userSpaceOnUse" gradientTransform="translate(-963.97872,-167.95454)"/>

+  </defs>

+  <metadata id="metadata5957">

+    <rdf:RDF>

+      <cc:Work rdf:about="">

+        <dc:format>image/svg+xml</dc:format>

+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>

+        <dc:title/>

+      </cc:Work>

+    </rdf:RDF>

+  </metadata>

+  <use transform="translate(-961.86731,-168.04527)" id="use13602" x="0" y="0" width="1250" height="1250" xlink:href="#rect12856"/>

+  <path d="m 5.5212776,14.545453 11.0000004,0 -4,-4.9999999 -11.0000004,0 4,4.9999999 z" id="use8977" style="color:#000000;fill:url(#linearGradient4362);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4364);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>

+  <path d="m 5.5212776,11.545483 11.0000004,0 -4,-4.9999999 -11.0000004,0 4,4.9999999 z" id="use8059" style="color:#000000;fill:url(#linearGradient4356);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4358);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>

+  <path d="m 5.5212776,8.5454831 11.0000004,0 -4,-5 -11.0000004,0 4,5 z" id="use8061" style="color:#000000;fill:url(#linearGradient4351);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4353);stroke-width:0.99994743;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"/>

+</svg>
\ No newline at end of file
diff --git a/navit/xslt/iphone.xslt b/navit/xslt/iphone.xslt
index f15d04938..1e9540503 100644
--- a/navit/xslt/iphone.xslt
+++ b/navit/xslt/iphone.xslt
@@ -4,6 +4,7 @@
    <xsl:param name="ICON_SMALL" select="32"/>
    <xsl:param name="ICON_MEDIUM" select="32"/>
    <xsl:param name="ICON_BIG" select="64"/>
+   <xsl:param name="OSD_USE_OVERLAY">yes</xsl:param>
    
    <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/>
    <xsl:include href="osd_minimum.xslt"/>
diff --git a/navit/xslt/tomtom.xslt b/navit/xslt/tomtom.xslt
new file mode 100644
index 000000000..3e34d9224
--- /dev/null
+++ b/navit/xslt/tomtom.xslt
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude" version="1.0">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="config"/>
+	</xsl:template>
+
+	<xsl:template match="config">
+		<xsl:copy>
+			<xsl:apply-templates select="navit"/>
+		</xsl:copy>
+	</xsl:template>	
+
+	<xsl:template match="navit">
+		<xsl:copy>
+			<xsl:attribute name="zoom">32</xsl:attribute>
+			<xsl:attribute name="tracking">1</xsl:attribute>
+			<xsl:attribute name="orientation">-1</xsl:attribute>
+			<xsl:attribute name="autozoom_active">1</xsl:attribute>
+			<xsl:attribute name="recent_dest">25</xsl:attribute>
+			<graphics type="sdl" w="480" h="272" bpp="16" frame="0" flags="1"/>
+			<xsl:copy-of select="gui[@type='internal']"/>
+			<osd enabled="yes" type="text" x="80" y="0" w="320" h="40" font_size="360" align="0" label="${{tracking.item.street_name}} ${{tracking.item.street_name_systematic}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="80" y="232" w="80" h="40" font_size="360" align="0" label="${{navigation.item[1].length[named]}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="160" y="232" w="240" h="40" font_size="360" align="0" label="${{vehicle.position_speed}} / ${{tracking.item.route_speed}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="400" y="232" w="80" h="40" font_size="360" align="0" label="${{navigation.item.destination_length[named]}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="400" y="192" w="80" h="40" font_size="360" align="0" label="${{navigation.item.destination_time[arrival]}}" background_color="#00008080"/>
+			<osd enabled="yes" type="compass" x="400" y="80" w="80" h="112" background_color="#00008080" font_size="300"/>
+			<osd enabled="yes" type="gps_status" x="0" y="80" w="80" h="40" background_color="#00008080"/>
+			<osd enabled="yes" type="speed_warner" x="0" y="120" w="80" h="72" background_color="#00008080" font_size="300"/>
+			<osd enabled="yes" type="navigation_next_turn" x="0" y="192" w="80" h="80" icon_w="48" icon_h="48" icon_src="%s_wh_48_48.png" background_color="#00008080"/> 
+			<osd enabled="yes" type="button" x="400" y="0" command="zoom_in()" src="tomtom_plus_80_80.png"/>
+			<osd enabled="yes" type="button" x="0" y="0" command="zoom_out()" src="tomtom_minus_80_80.png"/>
+			<vehicle name="Local GPS" profilename="car" enabled="yes" active="yes" follow="1" source="file:/var/run/gpspipe">
+			<!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
+				<log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,position_radius" data="/mnt/sdcard/navit/track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/>
+			</vehicle>
+			<vehicle name="Demo" profilename="car" enabled="yes" active="no" follow="1" source="demo://" speed="100"/>
+			<xsl:copy-of select="tracking"/>
+			
+			<xsl:copy-of select="vehicleprofile[@name='car']"/>
+			<xsl:copy-of select="vehicleprofile[@name='car_shortest']"/>
+			<xsl:copy-of select="vehicleprofile[@name='car_avoid_tolls']"/>
+			<xsl:copy-of select="vehicleprofile[@name='bike']"/>
+			<xsl:copy-of select="vehicleprofile[@name='pedestrian']"/>
+			
+			<xsl:copy-of select="route"/>
+			<xsl:copy-of select="navigation"/>
+
+			<xsl:comment>Use espeak.</xsl:comment>
+			<speech type="cmdline" data="/mnt/sdcard/navit/bin/espeakdsp -v en '%s'"/>
+
+			<mapset enabled="yes">
+				<map type="binfile" enabled="yes" data="$NAVIT_SHAREDIR/maps/*.bin"/>
+			</mapset>
+			<xsl:copy-of select="layer"/>
+			<xsl:copy-of select="layout"/>
+		</xsl:copy>
+	</xsl:template>
+</xsl:transform>
diff --git a/po/Makefile.am b/po/Makefile.am
index 7da7f1135..15d8b7b93 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -5,7 +5,6 @@ CLEANFILES = $(CATALOGS) navit.pot
 # keep this sorted
 EXTRA_DIST = @POIFILES@ \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDialogs.java \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitGraphics.java \
@@ -33,7 +32,6 @@ POTFILES  = \
 	$(top_srcdir)/navit/gui/internal/gui_internal_widget.c \
 	$(top_srcdir)/navit/osd/core/osd_core.c \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java \
-	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitAndroidOverlay.java \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDialogs.java \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitDownloadSelectMapActivity.java \
 	$(top_srcdir)/navit/android/src/org/navitproject/navit/NavitGraphics.java \
diff --git a/po/af.po.in b/po/af.po.in
index 1db7d22aa..04af45fca 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -1,5 +1,5 @@
 # Afrikaans translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Andre Hugo https://launchpad.net/~cortexhugo
@@ -1968,6 +1968,12 @@ msgstr "Uitleg"
 msgid "Height Profile"
 msgstr "Hoë profiel"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Roete Beskrywing"
 
@@ -2023,10 +2029,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2044,6 +2046,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2504,6 +2510,9 @@ msgstr "Volskerm"
 msgid "Window Mode"
 msgstr "Venster Modus"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Beskrywing"
 
diff --git a/po/ar.po.in b/po/ar.po.in
index 83acf2b97..51655456e 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -1,5 +1,5 @@
 # Arabic translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1983,6 +1983,12 @@ msgstr "التصميم"
 msgid "Height Profile"
 msgstr "لمحة عن الإرتفاع"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "وصف الطريق"
 
@@ -2038,10 +2044,6 @@ msgstr "إبحث"
 msgid "Towns"
 msgstr "البلدات"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "الطريق إلى هنا"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2059,6 +2061,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "الطريق إلى هنا"
+
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -2519,6 +2525,9 @@ msgstr "ملء الشاشة"
 msgid "Window Mode"
 msgstr "نمط النافذة"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "الوصف"
 
diff --git a/po/ast.po.in b/po/ast.po.in
index 42ecf6209..02fe9cb07 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -1,5 +1,5 @@
 # Asturian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Xuacu Saturio https://launchpad.net/~xuacusk8
@@ -1962,6 +1962,12 @@ msgstr "Disposición"
 msgid "Height Profile"
 msgstr "Perfil d'altures"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descripción de ruta"
 
@@ -2017,10 +2023,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2038,6 +2040,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2498,6 +2504,9 @@ msgstr "Pantalla completa"
 msgid "Window Mode"
 msgstr "Mou ventana"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Descripción"
 
diff --git a/po/be.po.in b/po/be.po.in
index e02daf6bc..561f630f7 100644
--- a/po/be.po.in
+++ b/po/be.po.in
@@ -1,5 +1,5 @@
 # Belarusian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Anatoli Putseyeu https://launchpad.net/~st-shadow-by
@@ -1965,6 +1965,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2020,10 +2026,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2041,6 +2043,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2497,6 +2503,9 @@ msgstr "Поўнаэкранны рэжым"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Апісанне"
 
diff --git a/po/bs.po.in b/po/bs.po.in
index 0fccf3047..c6c8e8506 100644
--- a/po/bs.po.in
+++ b/po/bs.po.in
@@ -1,5 +1,5 @@
 # Bosnian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1966,6 +1966,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2021,10 +2027,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2042,6 +2044,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2498,6 +2504,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/ca.po.in b/po/ca.po.in
index da8d5c12a..4c41bcd79 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -8,7 +8,7 @@
 # KaZeR https://launchpad.net/~kazer
 # Marc Coll Carrillo https://launchpad.net/~marc-coll-carrillo
 # Sergi Gomis https://launchpad.net/~paloky3
-# Xevib https://launchpad.net/~xbarnada
+# Xavier Barnada https://launchpad.net/~xbarnada
 # beamspot https://launchpad.net/~benrouravkg
 # juliwoodbcn https://launchpad.net/~julianlozano
 # kualsevol https://launchpad.net/~ojuanv
@@ -1973,6 +1973,12 @@ msgstr "Disposició"
 msgid "Height Profile"
 msgstr "Perfil d'alçada"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descripció de la ruta"
 
@@ -2028,10 +2034,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2049,6 +2051,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2509,6 +2515,9 @@ msgstr "Pantalla completa"
 msgid "Window Mode"
 msgstr "Mode de la finestra"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Descripció"
 
diff --git a/po/ckb.po.in b/po/ckb.po.in
index a48992145..ab8a5a1eb 100644
--- a/po/ckb.po.in
+++ b/po/ckb.po.in
@@ -1,5 +1,5 @@
 # Kurdish (Sorani) translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # kosar https://launchpad.net/~kosar-belana
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/cs.po.in b/po/cs.po.in
index c958a198d..ab05a9c48 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -1982,6 +1982,12 @@ msgstr "Rozvržení"
 msgid "Height Profile"
 msgstr "Výškový profil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Popis trasy"
 
@@ -2522,6 +2528,9 @@ msgstr "Celá obrazovka"
 msgid "Window Mode"
 msgstr "V okně"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Popis"
 
diff --git a/po/cy.po.in b/po/cy.po.in
index ec301d2b6..9171574a7 100644
--- a/po/cy.po.in
+++ b/po/cy.po.in
@@ -1966,6 +1966,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2498,6 +2504,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/da.po.in b/po/da.po.in
index 0eefeb263..2bd2cee87 100644
--- a/po/da.po.in
+++ b/po/da.po.in
@@ -5,6 +5,7 @@
 # Esben Aaberg https://launchpad.net/~esben-aaberg
 # Fennek https://launchpad.net/~ng-fennek
 # Glenn https://launchpad.net/~glenn-mh-dk
+# Glenn Sommer https://launchpad.net/~glemsom
 # Jørgen Elgaard Larsen https://launchpad.net/~jel-elgaard
 # Kennet https://launchpad.net/~kharpsoe
 # Lasse Luttermann https://launchpad.net/~lasse-luttermann
@@ -1971,6 +1972,12 @@ msgstr "Layout"
 msgid "Height Profile"
 msgstr "Lodret profil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Route Beskrivelse"
 
@@ -2026,10 +2033,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2047,6 +2050,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2507,6 +2514,9 @@ msgstr "Fuldskærm"
 msgid "Window Mode"
 msgstr "Vinduestilstand"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Beskrivelse"
 
diff --git a/po/de.po.in b/po/de.po.in
index 0972a361d..3ff969ec8 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -1,5 +1,5 @@
 # German translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Achim Behrens https://launchpad.net/~k1l
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-09-14 07:17+0000\n"
+"PO-Revision-Date: 2016-08-25 22:29+0000\n"
 "Last-Translator: Mathias Klein <ma_klein@gmx.de>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -1730,7 +1730,7 @@ msgstr "Setze Karte auf %ld, %ld \n"
 
 #, c-format
 msgid "Set next visit to %ld, %ld \n"
-msgstr ""
+msgstr "Setze nächsten Besuch auf %ld, %ld \n"
 
 msgid "POI search"
 msgstr "POI Suche"
@@ -2011,6 +2011,12 @@ msgstr "Erscheinungsbild"
 msgid "Height Profile"
 msgstr "Höhenprofil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Wegbeschreibung"
 
@@ -2066,10 +2072,6 @@ msgstr "Suche"
 msgid "Towns"
 msgstr "Städte"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Ziel setzen"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Kartendaten (c) von OpenStreetMap unter ODbL"
 
@@ -2092,6 +2094,10 @@ msgstr ""
 "Entschuldigung. Derzeit untestützen wir auf Android keine Karten die größer "
 "als 3,8Gigabyte sind. Bitte wählen Sie eine kleinere Karte aus."
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Ziel setzen"
+
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2557,6 +2563,9 @@ msgstr "Vollbildmodus"
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Beschreibung"
 
diff --git a/po/de_CH.po.in b/po/de_CH.po.in
index 84f3abf63..d30c18584 100644
--- a/po/de_CH.po.in
+++ b/po/de_CH.po.in
@@ -1,5 +1,5 @@
 # German (Switzerland) translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/el.po.in b/po/el.po.in
index f85f6d63e..9da1b8087 100644
--- a/po/el.po.in
+++ b/po/el.po.in
@@ -1,5 +1,5 @@
 # Greek translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1968,6 +1968,12 @@ msgstr "Διάταξη"
 msgid "Height Profile"
 msgstr "Ύψος προφίλ"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Περιγραφή Διαδρομής"
 
@@ -2023,10 +2029,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2044,6 +2046,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2502,6 +2508,9 @@ msgstr "Πλήρης Οθόνη"
 msgid "Window Mode"
 msgstr "Λειτουργία παραθύρων"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Περιγραφή"
 
diff --git a/po/en_AU.po.in b/po/en_AU.po.in
index e6e8a2c61..50842f620 100644
--- a/po/en_AU.po.in
+++ b/po/en_AU.po.in
@@ -1,5 +1,5 @@
 # English (Australia) translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Athol Mullen https://launchpad.net/~athol-mullen
@@ -1964,6 +1964,12 @@ msgstr "Layout"
 msgid "Height Profile"
 msgstr "Height Profile"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Route Description"
 
@@ -2019,10 +2025,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2040,6 +2042,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2500,6 +2506,9 @@ msgstr "FullScreen"
 msgid "Window Mode"
 msgstr "Window Mode"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Description"
 
diff --git a/po/en_CA.po.in b/po/en_CA.po.in
index 67b3066e1..fa624bc71 100644
--- a/po/en_CA.po.in
+++ b/po/en_CA.po.in
@@ -1,5 +1,5 @@
 # English (Canada) translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Frank Bax https://launchpad.net/~drw06g0w-qaens-52bk9e55
@@ -1961,6 +1961,12 @@ msgstr "Layout"
 msgid "Height Profile"
 msgstr "Height Profile"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Route Description"
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr "Fullscreen"
 msgid "Window Mode"
 msgstr "Window Mode"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Description"
 
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index 24cc83b7c..fec19d509 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -1980,6 +1980,12 @@ msgstr "Layout"
 msgid "Height Profile"
 msgstr "Height Profile"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Route Description"
 
@@ -2521,6 +2527,9 @@ msgstr "Fullscreen"
 msgid "Window Mode"
 msgstr "Window Mode"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Description"
 
diff --git a/po/eo.po.in b/po/eo.po.in
index 265ed1601..62a0a7128 100644
--- a/po/eo.po.in
+++ b/po/eo.po.in
@@ -1,5 +1,5 @@
 # Esperanto translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1966,6 +1966,12 @@ msgstr "Aranĝo"
 msgid "Height Profile"
 msgstr "Altimetrio"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Priskribo de irvojo"
 
@@ -2021,10 +2027,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2042,6 +2044,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2502,6 +2508,9 @@ msgstr "Tutekrane"
 msgid "Window Mode"
 msgstr "Fenestra reĝimo"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Priskribo"
 
diff --git a/po/es.po.in b/po/es.po.in
index 5dc6ce45e..4946a6233 100644
--- a/po/es.po.in
+++ b/po/es.po.in
@@ -1982,6 +1982,12 @@ msgstr "Diseño"
 msgid "Height Profile"
 msgstr "Perfil de altura"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descripción de ruta"
 
@@ -2529,6 +2535,9 @@ msgstr "Pantalla completa"
 msgid "Window Mode"
 msgstr "Modo ventana"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Descripción"
 
diff --git a/po/et.po.in b/po/et.po.in
index 2e234a608..23781e008 100644
--- a/po/et.po.in
+++ b/po/et.po.in
@@ -1,5 +1,5 @@
 # Estonian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Andres Kaaber https://launchpad.net/~imapi
@@ -1968,6 +1968,12 @@ msgstr "Paigutus"
 msgid "Height Profile"
 msgstr "Kõrgusprofiil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Teekonna kirjeldus"
 
@@ -2023,10 +2029,6 @@ msgstr "Otsing"
 msgid "Towns"
 msgstr "Linnad"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Teekond siia"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Kaardi andmed (c) OpenStreetMap kaasautorid, ODBL"
 
@@ -2044,6 +2046,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Teekond siia"
+
 msgid "Cancel"
 msgstr "Keeldu"
 
@@ -2506,6 +2512,9 @@ msgstr "Täisekraan"
 msgid "Window Mode"
 msgstr "Aknarežiim"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Kirjeldus"
 
diff --git a/po/eu.po.in b/po/eu.po.in
index 7d8b37eea..d0de74d5d 100644
--- a/po/eu.po.in
+++ b/po/eu.po.in
@@ -1,5 +1,5 @@
 # Basque translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Inaki Saez https://launchpad.net/~inaki-saez
@@ -1963,6 +1963,12 @@ msgstr "Antolaketa"
 msgid "Height Profile"
 msgstr "Garaiera ikusi"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Ibilbidearen nondik-norakoa"
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2499,6 +2505,9 @@ msgstr "Pantaila osoa"
 msgid "Window Mode"
 msgstr "Lehio modua"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Zehazketa"
 
diff --git a/po/fa.po.in b/po/fa.po.in
index e4254d32a..96767686f 100644
--- a/po/fa.po.in
+++ b/po/fa.po.in
@@ -1,5 +1,5 @@
 # Persian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 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
@@ -1963,6 +1963,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/fi.po.in b/po/fi.po.in
index bbe3cda1a..5662696a4 100644
--- a/po/fi.po.in
+++ b/po/fi.po.in
@@ -1,5 +1,5 @@
 # Finnish translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Eero https://launchpad.net/~eero+launchpad
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-07-19 03:58+0000\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
+"Last-Translator: Timo Jyrinki <Unknown>\n"
 "Language-Team: Ossi Berg <o.berg@mail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1973,6 +1973,12 @@ msgstr "Pohja"
 msgid "Height Profile"
 msgstr "Korkeusprofiili"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Reitin kuvaus"
 
@@ -2028,10 +2034,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2049,6 +2051,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2509,6 +2515,9 @@ msgstr "Koko ruutu"
 msgid "Window Mode"
 msgstr "Ikkunatila"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Kuvaus"
 
diff --git a/po/fil.po.in b/po/fil.po.in
index 8178227f6..a882e9f6d 100644
--- a/po/fil.po.in
+++ b/po/fil.po.in
@@ -1,5 +1,5 @@
 # Filipino translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # chito https://launchpad.net/~cnuarin
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/fo.po.in b/po/fo.po.in
index dff6442e8..f713a82aa 100644
--- a/po/fo.po.in
+++ b/po/fo.po.in
@@ -1,5 +1,5 @@
 # Faroese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Cyberish https://launchpad.net/~cyberish
@@ -1963,6 +1963,12 @@ msgstr "Snið"
 msgid "Height Profile"
 msgstr "Hæddar profilur"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Rutulýsing"
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr "Fullur skermur"
 msgid "Window Mode"
 msgstr "Vindeyga støða"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Frágreiðing"
 
diff --git a/po/fr.po.in b/po/fr.po.in
index 6601c0754..5300b85d2 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -6,6 +6,7 @@
 # Breizh_Punisher https://launchpad.net/~lemeura
 # Deuchnord https://launchpad.net/~jerome-logiciels-id
 # Elodie https://launchpad.net/~elodie
+# Fred https://launchpad.net/~frederi1
 # Fred https://launchpad.net/~jelk
 # Gaël Ecorchard https://launchpad.net/~galou-breizh
 # Jean-Marc https://launchpad.net/~m-balthazar
@@ -30,8 +31,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-07-14 23:11+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2016-09-29 12:45+0000\n"
+"Last-Translator: Fred <frederi1@gmail.com>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1999,6 +2000,13 @@ msgstr "Thème"
 msgid "Height Profile"
 msgstr "Profil de hauteur"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+"Veuillez installer la carte *.heightlines.bin pour afficher le nivellement."
+
+msgid "The route must cross at least 2 heightlines"
+msgstr "La route doit au minimum passer par deux lignes de niveau"
+
 msgid "Route Description"
 msgstr "Description de la route"
 
@@ -2543,6 +2551,9 @@ msgstr "Plein écran"
 msgid "Window Mode"
 msgstr "Mode fenêtré"
 
+msgid "Layers"
+msgstr "Couches"
+
 msgid "Description"
 msgstr "Description"
 
diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in
index 8619100ee..68d798ee5 100644
--- a/po/fr_CH.po.in
+++ b/po/fr_CH.po.in
@@ -1,5 +1,5 @@
 # French/Switzerland translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1966,6 +1966,12 @@ msgstr "Thème"
 msgid "Height Profile"
 msgstr "Profil de hauteur"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Description de la route"
 
@@ -2021,10 +2027,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2042,6 +2044,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2502,6 +2508,9 @@ msgstr "Plein écran"
 msgid "Window Mode"
 msgstr "Mode fenêtré"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Description"
 
diff --git a/po/fy.po.in b/po/fy.po.in
index 678db39dd..5b3e798cb 100644
--- a/po/fy.po.in
+++ b/po/fy.po.in
@@ -1,5 +1,5 @@
 # Frisian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # 205 https://launchpad.net/~205-z
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/gl.po.in b/po/gl.po.in
index d1a30c2f7..e4cb41cd6 100644
--- a/po/gl.po.in
+++ b/po/gl.po.in
@@ -1,5 +1,5 @@
 # Galician translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Iván Pérez https://launchpad.net/~ivan.perez-keera.es
@@ -1965,6 +1965,12 @@ msgstr "Disposición"
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2020,10 +2026,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2041,6 +2043,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2499,6 +2505,9 @@ msgstr "Pantalla completa"
 msgid "Window Mode"
 msgstr "Modo de xanela"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Descrición"
 
diff --git a/po/he.po.in b/po/he.po.in
index f07d2bb07..2fb3df1eb 100644
--- a/po/he.po.in
+++ b/po/he.po.in
@@ -1,10 +1,9 @@
 # Hebrew translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Evgeniy Ginzburg https://launchpad.net/~nad-oby
 # KaZeR https://launchpad.net/~kazer
-# Liel Fridman https://launchpad.net/~lielft
 # Nadav https://launchpad.net/~nadavz
 # Yaron https://launchpad.net/~sh-yaron
 # rintintin https://launchpad.net/~yonatanhak-gmail
@@ -1967,6 +1966,12 @@ msgstr "מערך"
 msgid "Height Profile"
 msgstr "פרופיל גובה"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2022,10 +2027,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2043,6 +2044,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2503,6 +2508,9 @@ msgstr "מסך מלא"
 msgid "Window Mode"
 msgstr "מצב חלון"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "תיאור"
 
diff --git a/po/hi.po.in b/po/hi.po.in
index ceaa91806..ba0d20e10 100644
--- a/po/hi.po.in
+++ b/po/hi.po.in
@@ -1,5 +1,5 @@
 # Hindi translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1963,6 +1963,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/hr.po.in b/po/hr.po.in
index e0e956f00..c39cad97e 100644
--- a/po/hr.po.in
+++ b/po/hr.po.in
@@ -1,5 +1,5 @@
 # Croatian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1968,6 +1968,12 @@ msgstr "Izgled"
 msgid "Height Profile"
 msgstr "Visinski profil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Opis rute"
 
@@ -2023,10 +2029,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2044,6 +2046,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2504,6 +2510,9 @@ msgstr "Cijeli ekran"
 msgid "Window Mode"
 msgstr "Prozorski način"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Opis"
 
diff --git a/po/hu.po.in b/po/hu.po.in
index a7237f69c..c4ec926a7 100644
--- a/po/hu.po.in
+++ b/po/hu.po.in
@@ -1980,6 +1980,12 @@ msgstr "Elrendezés"
 msgid "Height Profile"
 msgstr "Magassági profil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Útvonalleírás"
 
@@ -2035,10 +2041,6 @@ msgstr "Keres"
 msgid "Towns"
 msgstr "Városok"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Útvonal ide"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Térkép adatok (c) OpenStreeMap közreműködők, ODBL"
 
@@ -2058,6 +2060,10 @@ msgstr ""
 "Jelenleg Androidon a 3.8GB-nál nagyobb térképek nem támogatottak, kérem "
 "válasszon egy kisebbet."
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Útvonal ide"
+
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -2518,6 +2524,9 @@ msgstr "Teljes képernyő"
 msgid "Window Mode"
 msgstr "Ablak mód"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Leírás"
 
diff --git a/po/id.po.in b/po/id.po.in
index 706f23f14..302b11212 100644
--- a/po/id.po.in
+++ b/po/id.po.in
@@ -1,5 +1,5 @@
 # Indonesian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Joel-apobae.com https://launchpad.net/~amanda2000
@@ -1965,6 +1965,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr "Profil ketinggian"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Deskripsi rute"
 
@@ -2020,10 +2026,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2041,6 +2043,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2501,6 +2507,9 @@ msgstr "Layar penuh"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Deskripsi"
 
diff --git a/po/it.po.in b/po/it.po.in
index 0d9383edf..c2c557d7e 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -15,7 +15,7 @@
 # Stemby https://launchpad.net/~carlo-stemberger
 # amedeo https://launchpad.net/~amedeo-lanza
 # b3784098 https://launchpad.net/~b3784098
-# ernia https://launchpad.net/~monghitri
+# ernia https://launchpad.net/~ernia
 # giardia https://launchpad.net/~fabriziosm
 # jackyes https://launchpad.net/~jackthebest
 # tomas https://launchpad.net/~tracks-tomyt
@@ -1982,6 +1982,12 @@ msgstr "Layout"
 msgid "Height Profile"
 msgstr "Altimetria"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descrizione del percorso"
 
@@ -2518,6 +2524,9 @@ msgstr "Schermo intero"
 msgid "Window Mode"
 msgstr "Modalità finestra"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Descrizione"
 
diff --git a/po/ja.po.in b/po/ja.po.in
index 8e9f53ce2..66ce52328 100644
--- a/po/ja.po.in
+++ b/po/ja.po.in
@@ -1,5 +1,5 @@
 # Japanese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1963,6 +1963,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr "全画面表示"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/jv.po.in b/po/jv.po.in
index b0e4df660..500c5c750 100644
--- a/po/jv.po.in
+++ b/po/jv.po.in
@@ -1,5 +1,5 @@
 # Javanese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Leonardus Priyo Handono https://launchpad.net/~leonardus-ymail
@@ -1963,6 +1963,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/kk.po.in b/po/kk.po.in
index a31248f77..7f48773a4 100644
--- a/po/kk.po.in
+++ b/po/kk.po.in
@@ -1,5 +1,5 @@
 # Kazakh translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "Language: kk\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/kn.po.in b/po/kn.po.in
index 0158067a2..7a1b13a20 100644
--- a/po/kn.po.in
+++ b/po/kn.po.in
@@ -1,5 +1,5 @@
 # Kannada translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Mahesh Venom https://launchpad.net/~mahesh-venom-73
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/ko.po.in b/po/ko.po.in
index db73da2eb..4c908aa68 100644
--- a/po/ko.po.in
+++ b/po/ko.po.in
@@ -1,5 +1,5 @@
 # Korean translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1958,6 +1958,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2013,10 +2019,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2034,6 +2036,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2490,6 +2496,9 @@ msgstr "전체화면"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/ku.po.in b/po/ku.po.in
index cfa547b99..22f79bbea 100644
--- a/po/ku.po.in
+++ b/po/ku.po.in
@@ -1,5 +1,5 @@
 # Kurdish translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # kosar https://launchpad.net/~kosar-belana
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/lb.po.in b/po/lb.po.in
index 95421f795..a8e5450db 100644
--- a/po/lb.po.in
+++ b/po/lb.po.in
@@ -1,8 +1,7 @@
 # Luxembourgish translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
-# Kevin G https://launchpad.net/~kev912002
 # MaXaM https://launchpad.net/~maxschaal
 
 msgid ""
@@ -1962,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2017,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2038,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2494,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/lt.po.in b/po/lt.po.in
index d33305a80..b1c4a4e68 100644
--- a/po/lt.po.in
+++ b/po/lt.po.in
@@ -1974,6 +1974,12 @@ msgstr "Išdėstymas"
 msgid "Height Profile"
 msgstr "Aukščio profilis"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Maršruto aprašymas"
 
@@ -2516,6 +2522,9 @@ msgstr "Visas ekranas"
 msgid "Window Mode"
 msgstr "Langų režimas"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Aprašas"
 
diff --git a/po/lv.po.in b/po/lv.po.in
index 2ccd61491..8f729a8ca 100644
--- a/po/lv.po.in
+++ b/po/lv.po.in
@@ -1,5 +1,5 @@
 # Latvian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Janis https://launchpad.net/~janis-zl
@@ -1972,6 +1972,12 @@ msgstr "Izklājums"
 msgid "Height Profile"
 msgstr "Augstuma profils"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Maršruta apraksts"
 
@@ -2027,10 +2033,6 @@ msgstr "Meklēt"
 msgid "Towns"
 msgstr "Pilsētas"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Ceļš uz šejieni"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Karte (c) OpenStreetMap contributors, ODBL"
 
@@ -2048,6 +2050,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Ceļš uz šejieni"
+
 msgid "Cancel"
 msgstr "Atcelt"
 
@@ -2510,6 +2516,9 @@ msgstr "Pilnekrāns"
 msgid "Window Mode"
 msgstr "Loga režīms"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Apraksts"
 
diff --git a/po/mk.po.in b/po/mk.po.in
index 35898cc50..d51a99fb3 100644
--- a/po/mk.po.in
+++ b/po/mk.po.in
@@ -1,5 +1,5 @@
 # Macedonian (mk)  translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Dejan Angelov https://launchpad.net/~dejanangelov
@@ -1969,6 +1969,12 @@ msgstr "Изглед"
 msgid "Height Profile"
 msgstr "Висински профил"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Објаснување за патот"
 
@@ -2024,10 +2030,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2045,6 +2047,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2505,6 +2511,9 @@ msgstr "На цел екран"
 msgid "Window Mode"
 msgstr "Работи во прозорец"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Опис"
 
diff --git a/po/ml.po.in b/po/ml.po.in
index edd428786..3658437a3 100644
--- a/po/ml.po.in
+++ b/po/ml.po.in
@@ -1,5 +1,5 @@
 # Malayalam translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Faju https://launchpad.net/~gotoarunk
@@ -1964,6 +1964,12 @@ msgstr "വിന്യാസം"
 msgid "Height Profile"
 msgstr "ഉയര വിവരങ്ങള്‍"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "പാത വിവരണം"
 
@@ -2019,10 +2025,6 @@ msgstr "തിരയുക"
 msgid "Towns"
 msgstr "പട്ടണങ്ങള്‍"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "ഇവിടെ വരെയുള്ള വഴി കാട്ടുക"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "ഭൂപട വിവരങ്ങള്‍ (3) ഓപ്പണ്‍സ്റ്റ്രീറ്റ് മാപ്"
 
@@ -2040,6 +2042,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "ഇവിടെ വരെയുള്ള വഴി കാട്ടുക"
+
 msgid "Cancel"
 msgstr "റദ്ദാക്കുക"
 
@@ -2502,6 +2508,9 @@ msgstr "മുഴുവന്‍ തിരശ്ശീല"
 msgid "Window Mode"
 msgstr "വിന്റൊ മോഡ്"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "വിവരണം"
 
diff --git a/po/mn.po.in b/po/mn.po.in
index 37f96b11d..d9c7c7fff 100644
--- a/po/mn.po.in
+++ b/po/mn.po.in
@@ -1,5 +1,5 @@
 # Mongolian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Enkhbold https://launchpad.net/~enkhbold-baatar
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/mr.po.in b/po/mr.po.in
index 2f0e2ada8..69acbd449 100644
--- a/po/mr.po.in
+++ b/po/mr.po.in
@@ -1,5 +1,5 @@
 # Marathi translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # nagesh https://launchpad.net/~nageshpachorkar
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/nb.po.in b/po/nb.po.in
index 68d88cc74..04b4436e0 100644
--- a/po/nb.po.in
+++ b/po/nb.po.in
@@ -1,5 +1,5 @@
 # Norwegian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -7,15 +7,17 @@
 # Kurt Nielsen https://launchpad.net/~kurtn-penguins
 # Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Skippern https://launchpad.net/~gay-today
+# Svein Jakobsen https://launchpad.net/~svein-jakobsen
 # Thor H. Johansen https://launchpad.net/~thorhajo
 # burner https://launchpad.net/~bendik-xplore
+# kingu https://launchpad.net/~comradekingu
 
 msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 03:59+0000\n"
-"Last-Translator: Michael von Glasow <Unknown>\n"
+"PO-Revision-Date: 2016-11-20 19:22+0000\n"
+"Last-Translator: Svein Jakobsen <svein.jakobsen@gmail.com>\n"
 "Language-Team: Bendik Brenne <bendik@xplore.nu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +79,11 @@ msgstr "sjette avkjøring"
 
 #, c-format
 msgid "%d feet"
-msgstr ""
+msgstr "%d fot"
 
 #, c-format
 msgid "in %d feet"
-msgstr ""
+msgstr "om %d fot"
 
 #, c-format
 msgid "%d.%d miles"
@@ -94,14 +96,14 @@ msgstr ""
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "engelsk mil"
+msgstr[1] "%d engelske mil"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "om ei mil"
+msgstr[1] "om %d engelske mil"
 
 #, c-format
 msgid "%d meters"
@@ -191,7 +193,7 @@ msgstr "Snu når det er mulig"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "mot %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -206,7 +208,7 @@ msgid "Enter the roundabout %s"
 msgstr "Kjør inn i rundkjøringen %s"
 
 msgid "then enter the roundabout"
-msgstr ""
+msgstr "kjør inn i rundkjøringen"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -225,28 +227,28 @@ msgstr "så"
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|right"
-msgstr ""
+msgstr "flett sp%1$s|høyre"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|right"
-msgstr ""
+msgstr "Flett %1$s%2$s|høyre"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "then merge%1$s|left"
-msgstr ""
+msgstr "flett så%1$s|venstre"
 
 #. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
 msgid "Merge %1$s%2$s|left"
-msgstr ""
+msgstr "Flett %1$s%2$s|venstre"
 
 msgid "on your left"
-msgstr ""
+msgstr "på venstresiden"
 
 msgid "on your right"
-msgstr ""
+msgstr "på høyresiden"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
@@ -260,10 +262,10 @@ msgstr ""
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "avkjøring"
 
 msgid "at exit"
-msgstr ""
+msgstr "Ved utgang"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
@@ -313,7 +315,7 @@ msgstr "skarpt "
 
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "ta deretter %1$s til %2$s"
 
 #, c-format
 msgid "Take the %1$s road to the %2$s"
@@ -642,7 +644,7 @@ msgstr "Kapp Verde"
 
 #. 531
 msgid "Curacao"
-msgstr ""
+msgstr "Curacao"
 
 #. 162
 msgid "Christmas Island"
@@ -974,7 +976,7 @@ msgstr "Latvia"
 
 #. 434
 msgid "Libya"
-msgstr ""
+msgstr "Libya"
 
 #. 504
 msgid "Morocco"
@@ -1262,7 +1264,7 @@ msgstr "Surinam"
 
 #. 728
 msgid "South Sudan"
-msgstr ""
+msgstr "Sør-Sudan"
 
 #. 678
 msgid "Sao Tome and Principe"
@@ -1274,7 +1276,7 @@ msgstr "El Salvador"
 
 #. 534
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Saint Martin (Nederlandsk del)"
 
 #. 760
 msgid "Syrian Arab Republic"
@@ -1464,7 +1466,7 @@ msgid ""
 msgstr ""
 
 msgid "unknown street"
-msgstr ""
+msgstr "Ukjent adresse"
 
 #. Safe cast: attr_generic_set_attr does not modify its parameter.
 msgid "Unnamed vehicle"
@@ -1566,7 +1568,7 @@ msgid "_Recalculate"
 msgstr "Omberegn"
 
 msgid "Redraw map"
-msgstr ""
+msgstr "Tegn kartet på nytt"
 
 msgid "_Info"
 msgstr "Info"
@@ -1575,7 +1577,7 @@ msgid "Set _destination"
 msgstr ""
 
 msgid "Opens address search dialog"
-msgstr ""
+msgstr "Åpne søkedialog for adresser"
 
 msgid "_POI search"
 msgstr ""
@@ -1605,7 +1607,7 @@ msgid "_Keep orientation to the North"
 msgstr ""
 
 msgid "Switches map orientation to the north or the vehicle"
-msgstr ""
+msgstr "Bytt kartorientering mellom nord eller kjøretøy"
 
 msgid "_Roadbook"
 msgstr "Kjørebok"
@@ -1626,49 +1628,49 @@ msgid "Data"
 msgstr "Data"
 
 msgid "Pharmacy"
-msgstr ""
+msgstr "Apotek"
 
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurant"
 
 msgid "Restaurant. Fast food"
-msgstr ""
+msgstr "Restaurant / Gatekjøkken"
 
 msgid "Hotel"
-msgstr ""
+msgstr "Hotell"
 
 msgid "Car parking"
-msgstr ""
+msgstr "Parkering"
 
 msgid "Fuel station"
-msgstr ""
+msgstr "Bensinstasjon"
 
 msgid "Bank"
-msgstr ""
+msgstr "Bank"
 
 msgid "Hospital"
-msgstr ""
+msgstr "Sykehus"
 
 msgid "Cinema"
-msgstr ""
+msgstr "Kino"
 
 msgid "Train station"
-msgstr ""
+msgstr "Togstasjon"
 
 msgid "School"
-msgstr ""
+msgstr "Skole"
 
 msgid "Police"
-msgstr ""
+msgstr "Politi"
 
 msgid "Justice"
 msgstr ""
 
 msgid "Taxi"
-msgstr ""
+msgstr "Drosje"
 
 msgid "Shopping"
-msgstr ""
+msgstr "Handleområde"
 
 msgid "Distance from screen center (km)"
 msgstr ""
@@ -1693,7 +1695,7 @@ msgid "POI search"
 msgstr ""
 
 msgid "Select a category"
-msgstr ""
+msgstr "Velg en kategori"
 
 msgid "Select a distance to look for (km)"
 msgstr ""
@@ -1702,19 +1704,19 @@ msgid "Select a POI"
 msgstr ""
 
 msgid " "
-msgstr ""
+msgstr " "
 
 msgid "Category"
-msgstr ""
+msgstr "Kategori."
 
 msgid "Direction"
-msgstr ""
+msgstr "Retning"
 
 msgid "Distance(m)"
-msgstr ""
+msgstr "Avstand"
 
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 msgid "Visit Before"
 msgstr ""
@@ -1835,7 +1837,7 @@ msgid "Replace with waypoints"
 msgstr ""
 
 msgid "Delete Folder"
-msgstr ""
+msgstr "Slett mappe"
 
 #. Adds the Bookmark folders
 msgid "Add Bookmark folder"
@@ -1851,13 +1853,13 @@ msgstr "Bokmerk %s"
 
 #, c-format
 msgid "Download %s"
-msgstr ""
+msgstr "Last ned %s"
 
 msgid "Map Download"
 msgstr ""
 
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 msgid "Download Enabled"
 msgstr ""
@@ -1968,9 +1970,15 @@ msgstr "Utseende"
 msgid "Height Profile"
 msgstr "Høydeprofil"
 
-msgid "Route Description"
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
 msgstr ""
 
+msgid "Route Description"
+msgstr "Rutebeskrivelse"
+
 msgid "Show Locale"
 msgstr ""
 
@@ -1996,10 +2004,10 @@ msgid "House number"
 msgstr "Husnummer"
 
 msgid "Next"
-msgstr ""
+msgstr "Neste."
 
 msgid "Prev"
-msgstr ""
+msgstr "Forrige"
 
 msgid "Return to route!"
 msgstr ""
@@ -2017,16 +2025,12 @@ msgstr ""
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
-msgstr ""
+msgstr "Søk"
 
 #. Android resource: @strings/address_search_towns
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2044,9 +2048,13 @@ msgid ""
 "a smaller one."
 msgstr ""
 
-msgid "Cancel"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
+msgid "Cancel"
+msgstr "Avbryt."
+
 msgid "filenamePath"
 msgstr ""
 
@@ -2059,73 +2067,73 @@ msgid "Whole Planet"
 msgstr ""
 
 msgid "Africa"
-msgstr ""
+msgstr "Afrika"
 
 msgid "Canary Islands"
-msgstr ""
+msgstr "Kanariøyene"
 
 msgid "Asia"
-msgstr ""
+msgstr "Asia"
 
 msgid "Korea"
-msgstr ""
+msgstr "Korea"
 
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 msgid "UAE+Other"
 msgstr ""
 
 msgid "Oceania"
-msgstr ""
+msgstr "Oceania"
 
 msgid "Tasmania"
-msgstr ""
+msgstr "Tasmania"
 
 msgid "Victoria"
-msgstr ""
+msgstr "Victoria"
 
 msgid "New South Wales"
-msgstr ""
+msgstr "New South Wales"
 
 msgid "Europe"
-msgstr ""
+msgstr "Europa"
 
 msgid "Western Europe"
-msgstr ""
+msgstr "Vest-Europa"
 
 msgid "Azores"
-msgstr ""
+msgstr "Azorene"
 
 msgid "BeNeLux"
 msgstr ""
 
 msgid "Alsace"
-msgstr ""
+msgstr "Alsace"
 
 msgid "Aquitaine"
-msgstr ""
+msgstr "Aquitaine"
 
 msgid "Auvergne"
-msgstr ""
+msgstr "Auvergne"
 
 msgid "Basse-Normandie"
 msgstr ""
 
 msgid "Bourgogne"
-msgstr ""
+msgstr "Bourgogne"
 
 msgid "Bretagne"
-msgstr ""
+msgstr "Bretagne"
 
 msgid "Centre"
-msgstr ""
+msgstr "Midtstill"
 
 msgid "Champagne-Ardenne"
 msgstr ""
 
 msgid "Corse"
-msgstr ""
+msgstr "Corse"
 
 msgid "Franche-Comte"
 msgstr ""
@@ -2140,10 +2148,10 @@ msgid "Languedoc-Roussillon"
 msgstr ""
 
 msgid "Limousin"
-msgstr ""
+msgstr "Limousin"
 
 msgid "Lorraine"
-msgstr ""
+msgstr "Lorraine"
 
 msgid "Midi-Pyrenees"
 msgstr ""
@@ -2155,10 +2163,10 @@ msgid "Pays-de-la-Loire"
 msgstr ""
 
 msgid "Picardie"
-msgstr ""
+msgstr "Picardie"
 
 msgid "Poitou-Charentes"
-msgstr ""
+msgstr "Poitou-Charentes"
 
 msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
@@ -2173,7 +2181,7 @@ msgid "Bayern"
 msgstr ""
 
 msgid "Mittelfranken"
-msgstr ""
+msgstr "Mittelfranken"
 
 msgid "Niederbayern"
 msgstr ""
@@ -2194,16 +2202,16 @@ msgid "Unterfranken"
 msgstr ""
 
 msgid "Berlin"
-msgstr ""
+msgstr "Berlin"
 
 msgid "Brandenburg"
-msgstr ""
+msgstr "Brandenburg"
 
 msgid "Bremen"
-msgstr ""
+msgstr "Bremen"
 
 msgid "Hamburg"
-msgstr ""
+msgstr "Hamburg"
 
 msgid "Hessen"
 msgstr ""
@@ -2221,7 +2229,7 @@ msgid "Rheinland-Pfalz"
 msgstr ""
 
 msgid "Saarland"
-msgstr ""
+msgstr "Saarland"
 
 msgid "Sachsen-Anhalt"
 msgstr ""
@@ -2230,7 +2238,7 @@ msgid "Sachsen"
 msgstr ""
 
 msgid "Schleswig-Holstein"
-msgstr ""
+msgstr "Schleswig-Holstein"
 
 msgid "Thueringen"
 msgstr ""
@@ -2242,16 +2250,16 @@ msgid "Galicia"
 msgstr ""
 
 msgid "Scandinavia"
-msgstr ""
+msgstr "Skandinavia"
 
 msgid "England"
-msgstr ""
+msgstr "England"
 
 msgid "Buckinghamshire"
-msgstr ""
+msgstr "Buckinghamshire"
 
 msgid "Cambridgeshire"
-msgstr ""
+msgstr "Cambridgeshire"
 
 msgid "Cumbria"
 msgstr ""
@@ -2260,67 +2268,67 @@ msgid "East yorkshire with hull"
 msgstr ""
 
 msgid "Essex"
-msgstr ""
+msgstr "Essex"
 
 msgid "Herefordshire"
-msgstr ""
+msgstr "Herefordshire"
 
 msgid "Kent"
-msgstr ""
+msgstr "Kent"
 
 msgid "Lancashire"
-msgstr ""
+msgstr "Lancashire"
 
 msgid "Leicestershire"
-msgstr ""
+msgstr "Leicestershire"
 
 msgid "Norfolk"
-msgstr ""
+msgstr "Norfolk"
 
 msgid "Nottinghamshire"
-msgstr ""
+msgstr "Nottinghamshire"
 
 msgid "Oxfordshire"
-msgstr ""
+msgstr "Oxfordshire"
 
 msgid "Shropshire"
-msgstr ""
+msgstr "Shropshire"
 
 msgid "Somerset"
-msgstr ""
+msgstr "Somerset"
 
 msgid "South yorkshire"
 msgstr ""
 
 msgid "Suffolk"
-msgstr ""
+msgstr "Suffolk"
 
 msgid "Surrey"
-msgstr ""
+msgstr "Surrey"
 
 msgid "Wiltshire"
-msgstr ""
+msgstr "Wiltshire"
 
 msgid "Scotland"
-msgstr ""
+msgstr "Skottland"
 
 msgid "Wales"
-msgstr ""
+msgstr "Wales"
 
 msgid "Crete"
-msgstr ""
+msgstr "Kreta"
 
 msgid "North America"
-msgstr ""
+msgstr "Nord-Amerika"
 
 msgid "Alaska"
-msgstr ""
+msgstr "Alaska"
 
 msgid "Hawaii"
-msgstr ""
+msgstr "Hawaii"
 
 msgid "USA"
-msgstr ""
+msgstr "USA"
 
 msgid " (except Alaska and Hawaii)"
 msgstr ""
@@ -2329,85 +2337,85 @@ msgid "Midwest"
 msgstr ""
 
 msgid "Michigan"
-msgstr ""
+msgstr "Michigan"
 
 msgid "Ohio"
-msgstr ""
+msgstr "Ohio"
 
 msgid "Northeast"
-msgstr ""
+msgstr "Nordøst"
 
 msgid "Massachusetts"
-msgstr ""
+msgstr "Massachusetts"
 
 msgid "Vermont"
-msgstr ""
+msgstr "Vermont"
 
 msgid "Pacific"
-msgstr ""
+msgstr "Stillehavet"
 
 msgid "South"
-msgstr ""
+msgstr "Sør"
 
 msgid "Arkansas"
-msgstr ""
+msgstr "Arkansas"
 
 msgid "District of Columbia"
-msgstr ""
+msgstr "District of Columbia"
 
 msgid "Florida"
-msgstr ""
+msgstr "Florida"
 
 msgid "Louisiana"
-msgstr ""
+msgstr "Louisiana"
 
 msgid "Maryland"
-msgstr ""
+msgstr "Maryland"
 
 msgid "Mississippi"
-msgstr ""
+msgstr "Mississippi"
 
 msgid "Oklahoma"
-msgstr ""
+msgstr "Oklahoma"
 
 msgid "Texas"
-msgstr ""
+msgstr "Texas"
 
 msgid "Virginia"
-msgstr ""
+msgstr "Virginia"
 
 msgid "West Virginia"
-msgstr ""
+msgstr "West Virginia"
 
 msgid "West"
-msgstr ""
+msgstr "Vest"
 
 msgid "Arizona"
-msgstr ""
+msgstr "Arizona"
 
 msgid "California"
-msgstr ""
+msgstr "California"
 
 msgid "Colorado"
-msgstr ""
+msgstr "Colorado"
 
 msgid "Idaho"
-msgstr ""
+msgstr "Idaho"
 
 msgid "Montana"
-msgstr ""
+msgstr "Montana"
 
 msgid "New Mexico"
-msgstr ""
+msgstr "New Mexico"
 
 msgid "Nevada"
-msgstr ""
+msgstr "Nevada"
 
 msgid "Oregon"
-msgstr ""
+msgstr "Oregon"
 
 msgid "Utah"
-msgstr ""
+msgstr "Utah"
 
 msgid "Washington State"
 msgstr ""
@@ -2419,11 +2427,11 @@ msgid "Guyane Francaise"
 msgstr ""
 
 msgid "downloading"
-msgstr ""
+msgstr "laster ned"
 
 #. Android resource: @strings/map_download_ready
 msgid "ready"
-msgstr ""
+msgstr "klar"
 
 msgid "Media selected for map storage is not available"
 msgstr ""
@@ -2433,7 +2441,7 @@ msgid "Not enough free space"
 msgstr ""
 
 msgid "Error downloading map!"
-msgstr ""
+msgstr "Feil under nedlastning av kart!"
 
 msgid "Error writing map!"
 msgstr ""
@@ -2443,7 +2451,7 @@ msgstr ""
 
 #. Android resource: @strings/map_download_eta
 msgid "ETA"
-msgstr ""
+msgstr "Beregnet sluttid"
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
@@ -2486,7 +2494,7 @@ msgid ""
 msgstr ""
 
 msgid "Coordinates"
-msgstr ""
+msgstr "Koordinater"
 
 msgid ""
 "Stop\n"
@@ -2504,6 +2512,9 @@ msgstr "Fullskjerm"
 msgid "Window Mode"
 msgstr "Vindusmodus"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -2536,12 +2547,12 @@ msgid "horse"
 msgstr "hest"
 
 msgid "Truck"
-msgstr ""
+msgstr "Lastebil"
 
 #. Strings from android/res/values/strings.xml
 #. Android resource: @strings/yes
 msgid "Yes"
-msgstr ""
+msgstr "Ja."
 
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
@@ -2577,11 +2588,11 @@ msgstr ""
 
 #. Android resource: @strings/optionsmenu_zoom_in
 msgid "Zoom in"
-msgstr ""
+msgstr "Zoom inn"
 
 #. Android resource: @strings/optionsmenu_zoom_out
 msgid "Zoom out"
-msgstr ""
+msgstr "Zoom ut"
 
 #. Android resource: @strings/optionsmenu_download_maps
 msgid "Download maps"
@@ -2641,7 +2652,7 @@ msgstr ""
 
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
-msgstr ""
+msgstr "Søker ..."
 
 #. Android resource: @strings/address_search_not_found
 msgid "Address not found"
@@ -2657,7 +2668,7 @@ msgstr ""
 
 #. Android resource: @strings/address_search_no_results
 msgid "No results found"
-msgstr ""
+msgstr "Fant ingen resultater"
 
 #. Android resource: @strings/address_search_no_text_entered
 msgid "No text entered"
@@ -2669,7 +2680,7 @@ msgstr ""
 
 #. Android resource: @strings/choose_an_action
 msgid "Choose an action"
-msgstr ""
+msgstr "Velg en handling"
 
 #. Android resource: @strings/please_insert_an_sd_card
 msgid "Please insert an SD Card"
@@ -2677,11 +2688,11 @@ msgstr ""
 
 #. Android resource: @strings/backing_up
 msgid "Backing up..."
-msgstr ""
+msgstr "Sikkerhetskopierer..."
 
 #. Android resource: @strings/restoring
 msgid "Restoring..."
-msgstr ""
+msgstr "Gjenoppretter..."
 
 #. Android resource: @strings/failed_to_create_backup_directory
 msgid "Failed to create backup directory"
@@ -2689,7 +2700,7 @@ msgstr ""
 
 #. Android resource: @strings/backup_failed
 msgid "Backup failed"
-msgstr ""
+msgstr "Sikkerhetskopiering feilet"
 
 #. Android resource: @strings/no_backup_found
 msgid "No backup found"
@@ -2723,11 +2734,11 @@ msgstr ""
 
 #. Android resource: @strings/backup
 msgid "Backup"
-msgstr ""
+msgstr "Ta sikkerhetskopi"
 
 #. Android resource: @strings/restore
 msgid "Restore"
-msgstr ""
+msgstr "Gjenopprett"
 
 #. Android resource: @strings/TTS_title_data_missing
 msgid "System text to speech engine data is missing"
diff --git a/po/nds.po.in b/po/nds.po.in
index 53ab20e1a..76b176302 100644
--- a/po/nds.po.in
+++ b/po/nds.po.in
@@ -1970,6 +1970,12 @@ msgstr "Erscheinungsbild"
 msgid "Height Profile"
 msgstr "Höhenprofil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Routenbeschreibung"
 
@@ -2506,6 +2512,9 @@ msgstr "Vollbild"
 msgid "Window Mode"
 msgstr "Fenstermodus"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Beschreibung"
 
diff --git a/po/nl.po.in b/po/nl.po.in
index 337fba7e4..92f587b6d 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -1984,6 +1984,12 @@ msgstr "Opmaak"
 msgid "Height Profile"
 msgstr "Hoogteprofiel"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Routebeschrijving"
 
@@ -2529,6 +2535,9 @@ msgstr "Beeldvullend"
 msgid "Window Mode"
 msgstr "Venstermodus"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Beschrijving"
 
diff --git a/po/nn.po.in b/po/nn.po.in
index 002d8c334..b4d4c66e5 100644
--- a/po/nn.po.in
+++ b/po/nn.po.in
@@ -1,5 +1,5 @@
 # Norwegian Nynorsk translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1964,6 +1964,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr "Høgdeprofil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2019,10 +2025,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2040,6 +2042,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2500,6 +2506,9 @@ msgstr "Heile skjermen"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Beskriving"
 
diff --git a/po/pl.po.in b/po/pl.po.in
index bff4cd27d..cd4bf9dd5 100644
--- a/po/pl.po.in
+++ b/po/pl.po.in
@@ -1982,6 +1982,12 @@ msgstr "Układ kolorów"
 msgid "Height Profile"
 msgstr "Profil wysokości"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Opis trasy"
 
@@ -2524,6 +2530,9 @@ msgstr "Pełny ekran"
 msgid "Window Mode"
 msgstr "Tryb Widoku"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Opis"
 
diff --git a/po/pms.po.in b/po/pms.po.in
index 014bb71bb..e52ac59fb 100644
--- a/po/pms.po.in
+++ b/po/pms.po.in
@@ -1,5 +1,5 @@
 # Piemontese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Simone Briatore https://launchpad.net/~simone-bri
@@ -1961,6 +1961,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2016,10 +2022,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2037,6 +2039,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2493,6 +2499,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/pt.po.in b/po/pt.po.in
index 083416c8f..c5ef693aa 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -1,5 +1,5 @@
 # Portuguese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # CaioNavas https://launchpad.net/~webmaster-caiomnavas
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-09-19 14:04+0000\n"
+"PO-Revision-Date: 2016-10-11 10:00+0000\n"
 "Last-Translator: João Pirralha <joaopirralha@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1987,6 +1987,13 @@ msgstr "Esquema"
 msgid "Height Profile"
 msgstr "Perfil de altitude"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+"por favor instale um mapa *.heightlines.bin para fornecer dados de elevação"
+
+msgid "The route must cross at least 2 heightlines"
+msgstr "A rota deve cruzar pelo menos 2 linhas de altura"
+
 msgid "Route Description"
 msgstr "Descrição da rota"
 
@@ -2042,10 +2049,6 @@ msgstr "Procura"
 msgid "Towns"
 msgstr "Cidades"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Rota para aqui"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Dados do mapa (c) Colaboradores OpenStreetMap, ODBL"
 
@@ -2068,6 +2071,10 @@ msgstr ""
 "Infelizmente não suportamos mapas maiores que 3.8G no Android, por favor "
 "selecione um mais pequeno."
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Rota para aqui"
+
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2532,6 +2539,9 @@ msgstr "Ecrã completo"
 msgid "Window Mode"
 msgstr "Modo de janela"
 
+msgid "Layers"
+msgstr "Camadas"
+
 msgid "Description"
 msgstr "Descrição"
 
diff --git a/po/ro.po.in b/po/ro.po.in
index fedaa591b..28ac5f311 100644
--- a/po/ro.po.in
+++ b/po/ro.po.in
@@ -1,5 +1,5 @@
 # Romanian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Ciprian https://launchpad.net/~c1pr1ancip
@@ -1974,6 +1974,12 @@ msgstr "Dispunere"
 msgid "Height Profile"
 msgstr "Profil înălțime"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descrerea traseului"
 
@@ -2029,10 +2035,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2050,6 +2052,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2510,6 +2516,9 @@ msgstr "Pe tot ecranul"
 msgid "Window Mode"
 msgstr "Mod „fereastră”"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Descriere"
 
diff --git a/po/ru.po.in b/po/ru.po.in
index 835ed0c8c..0f1944e1d 100644
--- a/po/ru.po.in
+++ b/po/ru.po.in
@@ -1990,6 +1990,12 @@ msgstr "Схема"
 msgid "Height Profile"
 msgstr "Профиль высот"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Описание маршрута"
 
@@ -2535,6 +2541,9 @@ msgstr "Во весь экран"
 msgid "Window Mode"
 msgstr "Режим окна"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Описание"
 
diff --git a/po/sc.po.in b/po/sc.po.in
index a0a0be23a..4c3fffbe6 100644
--- a/po/sc.po.in
+++ b/po/sc.po.in
@@ -1,5 +1,5 @@
 # Sardinian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 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
@@ -1962,6 +1962,12 @@ msgstr "Impaghinadura"
 msgid "Height Profile"
 msgstr "Profilu de Pesu"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Descritzione de s'istrada"
 
@@ -2017,10 +2023,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2038,6 +2040,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2498,6 +2504,9 @@ msgstr "A tottu ischermu"
 msgid "Window Mode"
 msgstr "Modalidade Bentanedda"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Descritzione"
 
diff --git a/po/sk.po.in b/po/sk.po.in
index 98f4c2db6..b11a80e2e 100644
--- a/po/sk.po.in
+++ b/po/sk.po.in
@@ -1,5 +1,5 @@
 # Slovak translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Eduard DRUSA https://launchpad.net/~ventyl86
@@ -1976,6 +1976,12 @@ msgstr "Značenie"
 msgid "Height Profile"
 msgstr "Výškovy Profil"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Popis trasy"
 
@@ -2031,10 +2037,6 @@ msgstr "Hľadať"
 msgid "Towns"
 msgstr "Mestá"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Trasovať tu"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Mapové dáta (c) OpenStreetMap contributors, ODBL"
 
@@ -2052,6 +2054,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Trasovať tu"
+
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -2514,6 +2520,9 @@ msgstr "Celá obrazovka"
 msgid "Window Mode"
 msgstr "V okne"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Popis"
 
diff --git a/po/sl.po.in b/po/sl.po.in
index e4d03770a..703178d83 100644
--- a/po/sl.po.in
+++ b/po/sl.po.in
@@ -1,5 +1,5 @@
 # Slovenian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Gregor Koporec https://launchpad.net/~gregork8
@@ -1970,6 +1970,12 @@ msgstr "Razporeditev"
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2025,10 +2031,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2046,6 +2048,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2502,6 +2508,9 @@ msgstr "Celozaslonski način"
 msgid "Window Mode"
 msgstr "Okenski način"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/sq.po.in b/po/sq.po.in
index 92f1f9522..58850e77b 100644
--- a/po/sq.po.in
+++ b/po/sq.po.in
@@ -1,5 +1,5 @@
 # Albanian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Denis Ju https://launchpad.net/~deblenden
@@ -1960,6 +1960,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2015,10 +2021,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2036,6 +2038,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2492,6 +2498,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/sr.po.in b/po/sr.po.in
index b33966b56..00ec61b1d 100644
--- a/po/sr.po.in
+++ b/po/sr.po.in
@@ -1,5 +1,5 @@
 # Serbian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Ivan Janjić https://launchpad.net/~milandd
@@ -1976,6 +1976,12 @@ msgstr "Распоред"
 msgid "Height Profile"
 msgstr "Висински профил"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Опис путање"
 
@@ -2031,10 +2037,6 @@ msgstr "Претражи"
 msgid "Towns"
 msgstr "Градове"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Путања довде"
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Подаци карте (c) доприносиоци Отворене карте улица, ОДБЛ"
 
@@ -2052,6 +2054,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Путања довде"
+
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -2514,6 +2520,9 @@ msgstr "Цео екран"
 msgid "Window Mode"
 msgstr "Режим прозора"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Опис"
 
diff --git a/po/sw.po.in b/po/sw.po.in
index a36786e0a..d1fe07e31 100644
--- a/po/sw.po.in
+++ b/po/sw.po.in
@@ -1,5 +1,5 @@
 # Swahili translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # HinzundKunz https://launchpad.net/~martin-tlustos
@@ -1963,6 +1963,12 @@ msgstr "Mpangilio"
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "maelekezo ya njia"
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr "Skrini-yote"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Ufafanuzi"
 
diff --git a/po/ta.po.in b/po/ta.po.in
index d70ab67ca..74ba7a104 100644
--- a/po/ta.po.in
+++ b/po/ta.po.in
@@ -1,5 +1,5 @@
 # Tamil translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Dinesh Ramalingam https://launchpad.net/~dinodinu+navit
@@ -1963,6 +1963,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr ""
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/te.po.in b/po/te.po.in
index fcb54cace..eb412a536 100644
--- a/po/te.po.in
+++ b/po/te.po.in
@@ -1,5 +1,5 @@
 # Telugu translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1963,6 +1963,12 @@ msgstr "కూర్పు"
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2018,10 +2024,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2041,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2501,9 @@ msgstr "నిండు తెర"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/th.po.in b/po/th.po.in
index e4c36224f..58ac0335d 100644
--- a/po/th.po.in
+++ b/po/th.po.in
@@ -1,5 +1,5 @@
 # Thai translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # mansv68 https://launchpad.net/~mansv68
@@ -1960,6 +1960,12 @@ msgstr "การจัดเรียง"
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr ""
 
@@ -2015,10 +2021,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2036,6 +2038,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2492,6 +2498,9 @@ msgstr "แสดงผลเต็มจอภาพ"
 msgid "Window Mode"
 msgstr ""
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr ""
 
diff --git a/po/tr.po.in b/po/tr.po.in
index 028dec2aa..1802c15a9 100644
--- a/po/tr.po.in
+++ b/po/tr.po.in
@@ -1,5 +1,5 @@
 # Turkish (tr)  translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Abesis https://launchpad.net/~izzetaykutkocak
@@ -1983,6 +1983,12 @@ msgstr "Yerleşim"
 msgid "Height Profile"
 msgstr "Yükseklik Profili"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Rota Açıklaması"
 
@@ -2038,10 +2044,6 @@ msgstr "Ara"
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr "Harita verisi (c) OpenStreetMap destekçileri, ODBL"
 
@@ -2062,6 +2064,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr "İptal"
 
@@ -2520,6 +2526,9 @@ msgstr "Tam Ekran"
 msgid "Window Mode"
 msgstr "Pencere Modu"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Açıklama"
 
diff --git a/po/uk.po.in b/po/uk.po.in
index 87002f006..45c8c0875 100644
--- a/po/uk.po.in
+++ b/po/uk.po.in
@@ -1,5 +1,5 @@
 # Ukrainian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1969,6 +1969,12 @@ msgstr "Розкладка"
 msgid "Height Profile"
 msgstr "Профіль висот"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Опис маршруту"
 
@@ -2024,10 +2030,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2045,6 +2047,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2505,6 +2511,9 @@ msgstr "На весь екран"
 msgid "Window Mode"
 msgstr "Режим вікна"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Опис"
 
diff --git a/po/ur.po.in b/po/ur.po.in
index 2cdfbbac7..e1ffb4b51 100644
--- a/po/ur.po.in
+++ b/po/ur.po.in
@@ -1,5 +1,5 @@
 # Urdu translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
@@ -1965,6 +1965,12 @@ msgstr "بناوٹ"
 msgid "Height Profile"
 msgstr "اونچائی کی پروفائل"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "سفر کی تفصیل"
 
@@ -2020,10 +2026,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2041,6 +2043,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2501,6 +2507,9 @@ msgstr "پوری سکرین"
 msgid "Window Mode"
 msgstr "ونڈو موڈ"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "تفصیل"
 
diff --git a/po/vi.po.in b/po/vi.po.in
index 2965f91b2..54ec62618 100644
--- a/po/vi.po.in
+++ b/po/vi.po.in
@@ -1,11 +1,10 @@
 # Vietnamese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Hoàng Đỗ Can Trực https://launchpad.net/~truc294
 # Le Viet Thanh https://launchpad.net/~lethanhx2k
 # Michael von Glasow https://launchpad.net/~michael-vonglasow
-# Saki https://launchpad.net/~nhkhoi
 
 msgid ""
 msgstr ""
@@ -1963,6 +1962,12 @@ msgstr "Layout"
 msgid "Height Profile"
 msgstr "Thông tin chiều cao"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "Mô tả hành trình"
 
@@ -2018,10 +2023,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2040,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2495,6 +2500,9 @@ msgstr "Toàn màn hình"
 msgid "Window Mode"
 msgstr "Chế độ cửa sổ"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "Mô tả"
 
diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in
index bc55bcaa5..44f5e1cc3 100644
--- a/po/zh_CN.po.in
+++ b/po/zh_CN.po.in
@@ -1,5 +1,5 @@
 # Simplified Chinese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Feng Chao https://launchpad.net/~chaofeng
@@ -1966,6 +1966,12 @@ msgstr "布局"
 msgid "Height Profile"
 msgstr "高度设定"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "到目的地的路线"
 
@@ -2021,10 +2027,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2042,6 +2044,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2498,6 +2504,9 @@ msgstr "全屏"
 msgid "Window Mode"
 msgstr "窗口模式"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "描述"
 
diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in
index cc2604b6b..49fb73c01 100644
--- a/po/zh_HK.po.in
+++ b/po/zh_HK.po.in
@@ -1,11 +1,12 @@
 # Chinese (Hong Kong) translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2016 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # KaZeR https://launchpad.net/~kazer
 # Kyle https://launchpad.net/~kylelover
 # Michael von Glasow https://launchpad.net/~michael-vonglasow
 # Walter Cheuk https://launchpad.net/~wwycheuk
+# icefirewu https://launchpad.net/~icefirewu
 
 msgid ""
 msgstr ""
@@ -1963,6 +1964,12 @@ msgstr ""
 msgid "Height Profile"
 msgstr ""
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr ""
+
+msgid "The route must cross at least 2 heightlines"
+msgstr ""
+
 msgid "Route Description"
 msgstr "路線說明"
 
@@ -2018,10 +2025,6 @@ msgstr ""
 msgid "Towns"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
-
 msgid "Map data (c) OpenStreetMap contributors, ODBL"
 msgstr ""
 
@@ -2039,6 +2042,10 @@ msgid ""
 "a smaller one."
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -2499,6 +2506,9 @@ msgstr "全屏"
 msgid "Window Mode"
 msgstr "視窗模式"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "說明"
 
diff --git a/po/zh_TW.po.in b/po/zh_TW.po.in
index 3f5fd2389..bd136f1e8 100644
--- a/po/zh_TW.po.in
+++ b/po/zh_TW.po.in
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"PO-Revision-Date: 2016-05-15 07:14+0000\n"
+"PO-Revision-Date: 2016-09-12 15:23+0000\n"
 "Last-Translator: icefirewu <icefirewu@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,7 @@ msgstr "%1$s 往 %2$s"
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr "往交流道斜坡"
+msgstr "往交流道匝道"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -309,7 +309,7 @@ msgstr "進入 %1$s 往 %2$s"
 
 #, c-format
 msgid "after %i roads"
-msgstr "經過 %i 條路"
+msgstr "經過 %i 路"
 
 #. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination
 #, c-format
@@ -2503,6 +2503,9 @@ msgstr "全螢幕"
 msgid "Window Mode"
 msgstr "視窗模式"
 
+msgid "Layers"
+msgstr ""
+
 msgid "Description"
 msgstr "備註"