Merge branch 'master' into traffic

77 files changed, 14430 insertions, 16080 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3cc2d1b7f..1cbfd6809 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,23 @@ jobs:
           command: bash scripts/update_doxygen.sh
       - store_artifacts:
           path: /root/project/doc
-  build_android:
+  build_sailfish:
+    machine: true
+    steps:
+      - checkout
+      - run:
+          name: install docker
+          command: circleci-install docker
+      - run:
+          name: make build dir
+          command:  mkdir ../rpmbuild
+      - run:
+          name: run build
+          command: ls -lah ../rpmbuild && docker run -e VERSION_ID=2.2.1.18 -v `pwd`/../rpmbuild:/home/nemo/rpmbuild:rw -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:2.2.1.18-r1 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh
+      - store_artifacts:
+          name: Store rpm
+          path: ../rpmbuild/RPMS/
+  build_android_arm:
     working_directory: ~/code
     docker:
       - image: circleci/android:api-27-alpha
@@ -62,18 +78,18 @@ jobs:
           name: Id
           command: cat /etc/*release
       - run:
-          name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config
+          name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config libprotobuf-c-dev protobuf-c-compiler
           command: |
             sudo apt-get update
-            sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config
-            cmake ./ -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96
+            sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config libprotobuf-c-dev protobuf-c-compiler
+            cmake ./ -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128,192,256 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 -DUSE_PLUGINS=n -DBUILD_MAPTOOL=n -DXSL_PROCESSING=y -DXSLTS=android -DANDROID=y -DSAMPLE_MAP=n
       - run:
           name: Process icons
           command: |
             cd navit/icons
             make
             mkdir ../android/res/drawable-nodpi
-            rename 'y/A-Z/a-z/' *
+            rename 'y/A-Z/a-z/' *.png
             cp *.png ../android/res/drawable-nodpi
             cd ../../
       - run:
@@ -82,20 +98,16 @@ jobs:
             cd po
             make
             mkdir ../navit/android/res/raw
-            rename 'y/A-Z/a-z/' *
+            rename 'y/A-Z/a-z/' *.mo
             cp *.mo ../navit/android/res/raw
             cd ../
       - run:
           name: Process xml's
           command: |
+            make navit_config_xml
             cd navit
-            saxonb-xslt -s:navit_shipped.xml -xsl:xslt/android.xslt -o:navitldpi.xml OSD_SIZE=1 ICON_SMALL=24 ICON_MEDIUM=32 ICON_BIG=48
-            saxonb-xslt -s:navit_shipped.xml -xsl:xslt/android.xslt -o:navitmdpi.xml OSD_SIZE=1.33 ICON_SMALL=32 ICON_MEDIUM=48 ICON_BIG=64
-            saxonb-xslt -s:navit_shipped.xml -xsl:xslt/android.xslt -o:navithdpi.xml OSD_SIZE=2 ICON_SMALL=48 ICON_MEDIUM=64 ICON_BIG=96
-            saxonb-xslt -s:navit_shipped.xml -xsl:xslt/android.xslt -o:navitxhdpi.xml OSD_SIZE=2.67 ICON_SMALL=64 ICON_MEDIUM=96 ICON_BIG=128
-            saxonb-xslt -s:navit_shipped.xml -xsl:xslt/android.xslt -o:navitxxhdpi.xml OSD_SIZE=4 ICON_SMALL=96 ICON_MEDIUM=128 ICON_BIG=192
-            saxonb-xslt -s:navit_shipped.xml -xsl:xslt/android.xslt -o:navitxxxhdpi.xml OSD_SIZE=5.33 ICON_SMALL=128 ICON_MEDIUM=192 ICON_BIG=256
-            mv *dpi.xml android/res/raw
+            mkdir -p ./android/assets
+            cp -R config ./android/assets/
             cd ../
       - run:
          name: Chmod permissions
@@ -148,6 +160,10 @@ jobs:
           destination: reports
       - store_test_results:
           path: test-results
+      - run:
+          name: Update Navit-Download-Center
+          command: |
+            bash scripts/update_download_center.sh
   build_win32:
     docker:
       - image: ubuntu:14.04
@@ -156,7 +172,11 @@ jobs:
       - run:
           name: Build for Windows
           command: |
-            bash scripts/setup_common_requirements.sh
+            apt-get update && xargs -a scripts/setup_14.04_requirements.list apt-get install -y
+            apt-get install -y software-properties-common
+            add-apt-repository -y ppa:george-edison55/cmake-3.x
+            apt-get remove -y cmake
+            apt-get install -y cmake3
             bash scripts/build_win32.sh
       - store_artifacts:
           path: win32/navit.exe
@@ -246,7 +266,10 @@ workflows:
       - build_linux:
           requires:
             - sanity_check
-      - build_android:
+      - build_android_arm:
+          requires:
+            - sanity_check
+      - build_sailfish:
           requires:
             - sanity_check
       - build_win32:
@@ -264,7 +287,7 @@ workflows:
       - run_doxygen:
           requires:
             - build_linux
-            - build_android
+            - build_android_arm
             - build_win32
             - build_wince
             - build_tomtom_minimal
@@ -275,7 +298,7 @@ workflows:
       - merge_trunk_in_master:
           requires:
             - build_linux
-            - build_android
+            - build_android_arm
             - build_win32
             - build_wince
             - build_tomtom_minimal
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..09919cf68
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+sudo: required
+
+language: c
+
+services:
+  - docker
+
+before_install:
+- mkdir ../rpmbuild
+- docker pull hoehnp/sailfishos-platform-sdk:2.2.1.18-r1
+- docker run -e VERSION_ID=2.2.1.18 -v `pwd`:/home/nemo/navit hoehnp/sailfishos-platform-sdk:2.2.1.18-r1 /bin/bash -x /home/nemo/navit/contrib/sailfish/build_sailfish_ci.sh
+
+before_deploy:
+  - provider: pages
+  - skip-cleanup: true
+  - github-token: $GITHUB_TOKEN
+  - keep-history: true
+  - local-history: `pwd`/../rpmbuild/RPMS/armv7hl/
+  - local-history: `pwd`/../rpmbuild/RPMS/i586/
+before_script: skip
+script: skip
+after_success: skip
+after_script: skip
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f92ba4dcb..93ed3eb76 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,12 +150,13 @@ find_package(Glib)
 find_package(Gmodule)
 find_package(ZLIB)
 find_package(Freetype)
-find_library(SDL2MAIN SDL2)
-find_library(SDL2IMAGE SDL2_image)
-find_library(GLES2 GLESv2)
+#find_library(SDL2MAIN SDL2)
+#find_library(SDL2IMAGE SDL2_image)
 find_package(SDL)
-find_package(SDL_ttf)
+#find_package(SDL_ttf)
 find_package(SDL_image)
+
+find_library(GLES2 GLESv2)
 find_package(OpenGL)
 find_package(GLUT)
 find_package(GTK2 2.6 COMPONENTS gtk)
@@ -405,6 +406,7 @@ else()
 endif(FREETYPE_FOUND)
 
 if(SDL_FOUND AND SDLIMAGE_FOUND AND FREETYPE_FOUND)
+	include_directories( ${SDL_INCLUDE_DIR} ${SDL_IMAGE_INCLUDE_DIRS})
 	set(SDL_IMAGE 1)
 	if(SDLTTF_FOUND)
 		set(SDL_TTF 1)
@@ -579,12 +581,6 @@ if(WIN32 OR WINCE)
 	add_plugin(support/win32 "Windows detected" TRUE)
 
 	SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -I ${CMAKE_CURRENT_SOURCE_DIR}/navit/gui/win32/resources <DEFINES> -i <SOURCE> -o <OBJECT>")
-	set_with_reason(support/ezxml "Windows detected" TRUE)
-	set_with_reason(speech/espeak "Windows detected" TRUE)
-	#speech/espeak does use windows threads, and therefore needs only parts of
-	#espeak lib. INTERNAL_ESPEAK_COMPLETE controls this.
-	set_with_reason(INTERNAL_ESPEAK_COMPLETE "Windows detected" FALSE)
-	set_with_reason(support/espeak "Windows detected" TRUE)
 	set_with_reason(binding/win32 "Windows detected" TRUE)
 
 	# vehicle_file is broken for windows. use vehicle_wince instead
@@ -640,6 +636,7 @@ if (WIN32 AND NOT WINCE)
 	set(HAVE_API_WIN32 1)
 	set(HAVE_STDINT_H 1)
 	list(APPEND NAVIT_LIBS winmm)
+	set_with_reason(speech/cmdline "using native tts system of windows instead of espeak" TRUE)
 endif()
 if(WINCE)
 	add_plugin(support/libc "wince detected" TRUE)
@@ -649,6 +646,12 @@ if(WINCE)
 	set(HAVE_PRAGMA_PACK 1)
 	set_with_reason(vehicle/file "wince: currently broken" FALSE)
 	set_with_reason(vehicle/wince "wince detected" TRUE)
+	set_with_reason(support/ezxml "Windows detected" TRUE)
+	set_with_reason(speech/espeak "Windows detected" TRUE)
+	#speech/espeak does use windows threads, and therefore needs only parts of
+	#espeak lib. INTERNAL_ESPEAK_COMPLETE controls this.
+	set_with_reason(INTERNAL_ESPEAK_COMPLETE "Windows detected" FALSE)
+	set_with_reason(support/espeak "Windows detected" TRUE)
 endif()
 if (APPLE OR USE_UIKIT)
 	set_with_reason(vehicle/iphone "apple detected" TRUE)
diff --git a/Toolchain/mingw32.cmake b/Toolchain/mingw32.cmake
index d00e7d6ab..f16eb51ad 100644
--- a/Toolchain/mingw32.cmake
+++ b/Toolchain/mingw32.cmake
@@ -7,6 +7,8 @@ FIND_PROGRAM(CMAKE_RC_COMPILER_INIT NAMES i686-w64-mingw32-windres i686-mingw32-
 
 FIND_PROGRAM(CMAKE_AR NAMES i686-w64-mingw32-ar i686-mingw32-ar i586-mingw32-ar i386-mingw32-ar i586-mingw32msvc-ar mingw32-ar ar.exe)
 
+FIND_PROGRAM(PKG_CONFIG_EXECUTABLE i686-w64-mingw32-pkg-config mingw32-pkg-config)
+
 IF (NOT CMAKE_FIND_ROOT_PATH)
 EXECUTE_PROCESS(
    COMMAND ${CMAKE_C_COMPILER} -print-sysroot
@@ -14,7 +16,6 @@ EXECUTE_PROCESS(
 )
 ENDIF(NOT CMAKE_FIND_ROOT_PATH)
 
-set(PKG_CONFIG_EXECUTABLE "mingw32-pkg-config")
 
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
diff --git a/build.gradle b/build.gradle
index ec95872d8..5d598ab8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,12 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
-        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
@@ -19,6 +19,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
         maven {
             url 'https://maven.google.com/'
diff --git a/cmake/FindProtobuf-c.cmake b/cmake/FindProtobuf-c.cmake
new file mode 100644
index 000000000..170c1a03d
--- /dev/null
+++ b/cmake/FindProtobuf-c.cmake
@@ -0,0 +1,121 @@
+# Locate and configure the Google Protocol Buffers library.
+# Defines the following variables:
+#
+#   PROTOBUF_C_FOUND - Found the Google Protocol Buffers library
+#   PROTOBUF_C_INCLUDE_DIRS - Include directories for Google Protocol Buffers
+#   PROTOBUF_C_LIBRARIES - The protobuf library
+#
+# The following cache variables are also defined:
+#   PROTOBUF_C_LIBRARY - The protobuf library
+#   PROTOBUF_C_PROTOC_LIBRARY   - The protoc library
+#   PROTOBUF_C_INCLUDE_DIR - The include directory for protocol buffers
+#   PROTOBUF_C_PROTOC_EXECUTABLE - The protoc compiler
+#
+#  ====================================================================
+#  Example:
+#
+#   find_package(Protobuf-c REQUIRED)
+#   include_directories(${PROTOBUF_C_INCLUDE_DIRS})
+#
+#   include_directories(${CMAKE_CURRENT_BINARY_DIR})
+#   PROTOBUF_C_GENERATE_C(PROTO_SRCS PROTO_HDRS foo.proto)
+#   add_executable(bar bar.c ${PROTO_SRCS} ${PROTO_HDRS})
+#   target_link_libraries(bar ${PROTOBUF_C_LIBRARY})
+#
+# NOTE: You may need to link against pthreads, depending
+# on the platform.
+#  ====================================================================
+#
+# PROTOBUF_C_GENERATE_C (public function)
+#   SRCS = Variable to define with autogenerated
+#          source files
+#   HDRS = Variable to define with autogenerated
+#          header files
+#   ARGN = proto files
+#
+#  ====================================================================
+
+
+#=============================================================================
+# Copyright 2009 Kitware, Inc.
+# Copyright 2009 Philip Lowman <philip@yhbt.com>
+# Copyright 2008 Esben Mose Hansen, Ange Optimization ApS
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+function(PROTOBUF_C_GENERATE_C SRCS HDRS)
+  if(NOT ARGN)
+    message(SEND_ERROR "Error: PROTOBUF_C_GENERATE_C() called without any proto files")
+    return()
+  endif(NOT ARGN)
+
+  set(${SRCS})
+  set(${HDRS})
+  foreach(FIL ${ARGN})
+    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+    get_filename_component(FIL_WE ${FIL} NAME_WE)
+
+    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb-c.c")
+    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb-c.h")
+
+    add_custom_command(
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb-c.c"
+             "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb-c.h"
+      COMMAND  ${PROTOBUF_C_PROTOC_EXECUTABLE}
+      ARGS --c_out=${CMAKE_CURRENT_BINARY_DIR} --proto_path ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
+      DEPENDS ${ABS_FIL}
+      COMMENT "Running C protocol buffer compiler on ${FIL}"
+      VERBATIM )
+  endforeach()
+
+  set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
+  set(${SRCS} ${${SRCS}} PARENT_SCOPE)
+  set(${HDRS} ${${HDRS}} PARENT_SCOPE)
+endfunction()
+
+
+find_path(PROTOBUF_C_INCLUDE_DIR google/protobuf-c/protobuf-c.h)
+
+# Google's provided vcproj files generate libraries with a "lib"
+# prefix on Windows
+if(WIN32)
+    set(PROTOBUF_C_ORIG_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
+    set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
+endif()
+
+find_library(PROTOBUF_C_LIBRARY NAMES protobuf-c
+             DOC "The Google Protocol Buffers Library"
+)
+find_library(PROTOBUF_C_PROTOC_LIBRARY NAMES protoc-c
+             DOC "The Google Protocol Buffers Compiler Library"
+)
+find_program(PROTOBUF_C_PROTOC_EXECUTABLE NAMES protoc-c
+             DOC "The Google Protocol Buffers Compiler"
+)
+
+mark_as_advanced(PROTOBUF_C_INCLUDE_DIR
+                 PROTOBUF_C_LIBRARY
+                 PROTOBUF_C_PROTOC_LIBRARY
+                 PROTOBUF_C_PROTOC_EXECUTABLE)
+
+# Restore original find library prefixes
+if(WIN32)
+    set(CMAKE_FIND_LIBRARY_PREFIXES "${PROTOBUF_C_ORIG_FIND_LIBRARY_PREFIXES}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PROTOBUF_C DEFAULT_MSG
+    PROTOBUF_C_LIBRARY PROTOBUF_C_INCLUDE_DIR)
+
+if(PROTOBUF_C_FOUND)
+    set(PROTOBUF_C_INCLUDE_DIRS ${PROTOBUF_C_INCLUDE_DIR})
+    set(PROTOBUF_C_LIBRARIES    ${PROTOBUF_C_LIBRARY})
+endif()
diff --git a/contrib/sailfish/build_sailfish_ci.sh b/contrib/sailfish/build_sailfish_ci.sh
new file mode 100755
index 000000000..58d1022f3
--- /dev/null
+++ b/contrib/sailfish/build_sailfish_ci.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#run on the Sailfish OS sdk docker container. Check that rpmbuild directory exists. Remember to export VERSION_ID
+# please don't mess around with those lines without testing,
+# even if some fancy tool tells you to do so to save some pipes.
+# -hoehnp-
+
+if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSION_ID?"; exit 1; fi
+
+# First we need to cd to the directory containing this script and the spec file.
+# Makes calling it directly from docker easier.
+SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
+cd $SCRIPTPATH
+ls -lah /navit
+mkdir $HOME/rpmbuild
+
+#arm devices
+sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-install -R zypper --non-interactive in $(grep "^BuildRequires: " navit-sailfish.spec | sed -e "s/BuildRequires: //")
+sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-build rpmbuild --define "_topdir /home/nemo/rpmbuild" --define "navit_source ${SCRIPTPATH}/../.." -bb navit-sailfish.spec
+#intel devices
+sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-install -R zypper --non-interactive in $(grep "^BuildRequires: " navit-sailfish.spec | sed -e "s/BuildRequires: //")
+sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/nemo/rpmbuild" --define "navit_source ${SCRIPTPATH}/../.." -bb navit-sailfish.spec
+
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec
index 4f97499e4..4f14be872 100755
--- a/contrib/sailfish/navit-sailfish.spec
+++ b/contrib/sailfish/navit-sailfish.spec
@@ -10,7 +10,7 @@ Name: harbour-navit
 Summary: Open Source car navigation system
 #Version: %{navit_version}_%{git_version}
 Version: 0.5.3
-Release: 0
+Release: 1
 License: GPL
 Group: Applications/Productivity
 URL: http://navit-project.org/
@@ -101,6 +101,11 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 
 #       -DMAN_DIR:PATH=share/harbour-navit/man1
 
+%pre
+if [ -d %{_datadir}/harbour-navit/espeak-data ]; then
+    rm -rf %{_datadir}/harbour-navit/espeak-data
+fi
+
 %install
 %make_install
 #copy in sailfish config
@@ -109,6 +114,12 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 %files
 %defattr(644, root, root, 755)
 %{_datadir}/harbour-navit/navit.xml
+%{_datadir}/harbour-navit/navit_layout_bike.xml
+%{_datadir}/harbour-navit/navit_layout_car.xml
+%{_datadir}/harbour-navit/navit_layout_car_android.xml
+%{_datadir}/harbour-navit/navit_layout_car_dark.xml
+%{_datadir}/harbour-navit/navit_layout_car_simple.xml
+%{_datadir}/harbour-navit/navit_layout_th.xml
 %{_datadir}/harbour-navit/icons/
 %{_datadir}/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin
 %{_datadir}/harbour-navit/espeak-data/
@@ -125,6 +136,9 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 
 
 %changelog
+*Mon Oct 01 2018 metalstrolch 0.5.3-1
+- fix rpm updating from 0.5.1 by adding %pre section
+
 *Fri Aug 31 2018 metalstrolch 0.5.3-0
 
 Release 0.5.2 was missing the version number update in the CMakefile. This release fixes this.
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index f6dbe5bb8..ca19ce41d 100644
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -124,21 +124,37 @@ add_custom_command(
 	)
 
 # additional parameter are passed to the stylesheet processor as parameter
-macro(process_xslt SRC_XML DEST_XML)
-	set(XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/navit/navit_shipped.xml" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}" )
+macro(process_xslt SRC_DIR SRC_XML DEST_DIR DEST_XML)
+	set(TMPFOLDER "${DEST_DIR}/${DEST_XML}")
+	# Create a unique temporary name based on the PATH and filename of the target xml file
+	string(REPLACE "/" "_" TMPFOLDER ${TMPFOLDER})
+	string(REPLACE ":" "_" TMPFOLDER ${TMPFOLDER})
+	string(REPLACE "\\" "_" TMPFOLDER ${TMPFOLDER})
+	# Create this unique temporary directory inside ${CMAKE_CURRENT_BINARY_DIR}. This is where we will store our intermediate xml file (called ${SRC_XML}.temp after each xslt pass
+	set(TMPDIR "${CMAKE_CURRENT_BINARY_DIR}/${TMPFOLDER}")
+	set(XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E make_directory "${TMPDIR}")
+	list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/navit/${SRC_XML}" "${TMPDIR}/${SRC_XML}.temp")
+	# Also copy the dtd file in the same directory as the xml file (required by the xslt processor)
+	list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/navit/navit.dtd" "${TMPDIR}/" )
 	if(XSL_PROCESSING)
 		if(NOT XSLTS STREQUAL "")
 			string(REPLACE "," ";" XSLTS "${XSLTS}")
 			foreach(tmp ${XSLTS})
+				# We will run this loop below for each xslt file provided in the XSLTS variable
 				set(XSLT_FILE "${PROJECT_SOURCE_DIR}/navit/xslt/${tmp}.xslt")
 				list(APPEND XSLT_FILES "${XSLT_FILE}")
 				list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E echo  Applying ${tmp}.xslt)
-				compose_xslt_transform_command(CMD "${XSLT_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}.tmp" "${ARGN}")
+				compose_xslt_transform_command(CMD "${XSLT_FILE}" "${TMPDIR}/${SRC_XML}.temp" "${TMPDIR}/${SRC_XML}.output" "${ARGN}")
 				list(APPEND XSLT_COMMANDS ${CMD})
-				list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}.tmp" ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML})
+				list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename "${TMPDIR}/${SRC_XML}.output" "${TMPDIR}/${SRC_XML}.temp")
 			endforeach()
 		endif()
 	endif(XSL_PROCESSING)
+	# Move the final resulting xml file to the target filename and directory (provided in arguments)
+	list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E make_directory ${DEST_DIR})
+	list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename "${TMPDIR}/${SRC_XML}.temp" "${DEST_DIR}/${DEST_XML}")
+	list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E remove "${TMPDIR}/navit.dtd")
+	list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E remove_directory "${TMPDIR}")
 	# Depend on all XSLT files, because the main XSLT file may pull in other files.
 	# Ideally we'd parse the main XSLT file for includes, but that is tricky to do reliably.
 	# Note that this list of files is only updated when (re)running CMake, so if files are
@@ -146,26 +162,58 @@ macro(process_xslt SRC_XML DEST_XML)
 	file(GLOB ALL_XSLT_FILES "${PROJECT_SOURCE_DIR}/navit/xslt/*.xslt")
 	#message(FATAL_ERROR ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML})
 	ADD_CUSTOM_COMMAND(
-		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}
+		OUTPUT ${DEST_DIR}/${DEST_XML}
 		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/navit/xslt/
-		DEPENDS ${SRC_XML} "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" ${ALL_XSLT_FILES}
+		DEPENDS "${SRC_DIR}/${SRC_XML}" "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" ${ALL_XSLT_FILES}
 		${XSLT_COMMANDS}
 		)
 endmacro()
 
+# Give instructions on how to build all navit_*.xml navit_layout_*.xml files, obtained applying relevant xslt tranformation on the source navit_shipped_*.xml files
+# The following XMLCFG_ALL_FILE_PREFIXES variable below lists all xml config files, semicolon is the delimiter
+# For example, it contains layout_navit_car, that will then be used to guess the source filename navit_layout_car_shipped.xml, installed as navit_layout_car.xml (or on android DPI-related files like navit_layout_car_xxxhdpi.xml)
+set(XMLCFG_ALL_FILE_PREFIXES "navit;navit_layout_car;navit_layout_car_dark;navit_layout_car_android;navit_layout_car_simple;navit_layout_bike;navit_layout_th")
 if(ANDROID)
-	process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxxxhdpi.xml OSD_SIZE=5.33 ICON_SMALL=128 ICON_MEDIUM=192 ICON_BIG=256)
-	process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxxhdpi.xml OSD_SIZE=4 ICON_SMALL=96 ICON_MEDIUM=128 ICON_BIG=192)
-	process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxhdpi.xml OSD_SIZE=2.67 ICON_SMALL=64 ICON_MEDIUM=96 ICON_BIG=128)
-	process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navithdpi.xml OSD_SIZE=2 ICON_SMALL=48 ICON_MEDIUM=64 ICON_BIG=96)
-	process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitmdpi.xml OSD_SIZE=1.33 ICON_SMALL=32 ICON_MEDIUM=48 ICON_BIG=64)
-	process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitldpi.xml OSD_SIZE=1 ICON_SMALL=24 ICON_MEDIUM=32 ICON_BIG=48)
-	add_custom_target( navit_config_xml ALL DEPENDS navitxxxhdpi.xml navitxxhdpi.xml navitxhdpi.xml navithdpi.xml navitmdpi.xml navitldpi.xml)
+	# On android, additional xlst transformations are applied to scale the OSD, icons etc... and the size is selected depending on the definition of the screen of the device (xxxhdpi, xxhdpi, ... ldpi)
+	# Files for all screen definitions are shipped inside the android package (suffixed with _xxxhdpi, _xxhdpi etc.), and it is only at runtime that the correct navit_*.xml (corresponding to the current device's resolution) is selected
+	set(XSLT_XXXHDPI_ARGS OSD_SIZE=5.33 ICON_SMALL=128 ICON_MEDIUM=192 ICON_BIG=256)
+	set(XSLT_XXHDPI_ARGS OSD_SIZE=4 ICON_SMALL=96 ICON_MEDIUM=128 ICON_BIG=192)
+	set(XSLT_XHDPI_ARGS OSD_SIZE=2.67 ICON_SMALL=64 ICON_MEDIUM=96 ICON_BIG=128)
+	set(XSLT_HDPI_ARGS OSD_SIZE=2 ICON_SMALL=48 ICON_MEDIUM=64 ICON_BIG=96)
+	set(XSLT_MDPI_ARGS OSD_SIZE=1.33 ICON_SMALL=32 ICON_MEDIUM=48 ICON_BIG=64)
+	set(XSLT_LDPI_ARGS OSD_SIZE=1 ICON_SMALL=24 ICON_MEDIUM=32 ICON_BIG=48)
+
+	set(XMLCFG_OUTPUT_LIST "")	# Used to build the list of generated *xml filenames (only file basename, directory part excluded)
+	foreach(XMLCFG_FILE_PREFIX ${XMLCFG_ALL_FILE_PREFIXES})
+		set(XMLCFG_FILE_SHIPPED ${XMLCFG_FILE_PREFIX}_shipped.xml)
+		set(XMLCFG_DIR_OUTPUT_XXXHDPI ${CMAKE_CURRENT_BINARY_DIR}/config/xxxhdpi)
+		set(XMLCFG_DIR_OUTPUT_XXHDPI ${CMAKE_CURRENT_BINARY_DIR}/config/xxhdpi)
+		set(XMLCFG_DIR_OUTPUT_XHDPI ${CMAKE_CURRENT_BINARY_DIR}/config/xhdpi)
+		set(XMLCFG_DIR_OUTPUT_HDPI ${CMAKE_CURRENT_BINARY_DIR}/config/hdpi)
+		set(XMLCFG_DIR_OUTPUT_MDPI ${CMAKE_CURRENT_BINARY_DIR}/config/mdpi)
+		set(XMLCFG_DIR_OUTPUT_LDPI ${CMAKE_CURRENT_BINARY_DIR}/config/ldpi)
+		set(XMLCFG_FILE_OUTPUT ${XMLCFG_FILE_PREFIX}.xml)
+		process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/ ${XMLCFG_FILE_SHIPPED} ${XMLCFG_DIR_OUTPUT_XXXHDPI}/ ${XMLCFG_FILE_PREFIX}.xml ${XSLT_XXXHDPI_ARGS})
+		process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/ ${XMLCFG_FILE_SHIPPED} ${XMLCFG_DIR_OUTPUT_XXHDPI}/ ${XMLCFG_FILE_PREFIX}.xml ${XSLT_XXHDPI_ARGS})
+		process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/ ${XMLCFG_FILE_SHIPPED} ${XMLCFG_DIR_OUTPUT_XHDPI}/ ${XMLCFG_FILE_PREFIX}.xml ${XSLT_XHDPI_ARGS})
+		process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/ ${XMLCFG_FILE_SHIPPED} ${XMLCFG_DIR_OUTPUT_HDPI}/ ${XMLCFG_FILE_PREFIX}.xml ${XSLT_HDPI_ARGS})
+		process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/ ${XMLCFG_FILE_SHIPPED} ${XMLCFG_DIR_OUTPUT_MDPI}/ ${XMLCFG_FILE_PREFIX}.xml ${XSLT_MDPI_ARGS})
+		process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/ ${XMLCFG_FILE_SHIPPED} ${XMLCFG_DIR_OUTPUT_LDPI}/ ${XMLCFG_FILE_PREFIX}.xml ${XSLT_LDPI_ARGS})
+		set(XMLCFG_OUTPUT_LIST ${XMLCFG_OUTPUT_LIST} ${XMLCFG_DIR_OUTPUT_XXXHDPI}/${XMLCFG_FILE_PREFIX}.xml ${XMLCFG_DIR_OUTPUT_XXHDPI}/${XMLCFG_FILE_PREFIX}.xml ${XMLCFG_DIR_OUTPUT_XHDPI}/${XMLCFG_FILE_PREFIX}.xml ${XMLCFG_DIR_OUTPUT_HDPI}/${XMLCFG_FILE_PREFIX}.xml ${XMLCFG_DIR_OUTPUT_MDPI}/${XMLCFG_FILE_PREFIX}.xml ${XMLCFG_DIR_OUTPUT_LDPI}/${XMLCFG_FILE_PREFIX}.xml)
+	endforeach()
+	add_custom_target( navit_config_xml ALL DEPENDS ${XMLCFG_OUTPUT_LIST})
 else()
-	process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navit.xml "")
-	add_custom_target( navit_config_xml_resource DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/navit.xml COMMAND mkdir -p resources/share/navit COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/navit.xml resources/share/navit)
+	set(XMLCFG_OUTPUT_LIST "")	# Used to build the list of generated *xml filenames (only file basename, directory part excluded)
+	set(XMLCFG_INSTALLED_PATH_LIST "")	# A list of full path to installed xml files
+	foreach(XMLCFG_FILE_PREFIX ${XMLCFG_ALL_FILE_PREFIXES})
+		set(XMLCFG_FILE_SHIPPED ${XMLCFG_FILE_PREFIX}_shipped.xml)
+		process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/ ${XMLCFG_FILE_SHIPPED} ${CMAKE_CURRENT_BINARY_DIR}/ ${XMLCFG_FILE_PREFIX}.xml "")
+		set(XMLCFG_OUTPUT_LIST ${XMLCFG_OUTPUT_LIST} ${XMLCFG_FILE_PREFIX}.xml)
+		set(XMLCFG_INSTALLED_PATH_LIST ${XMLCFG_INSTALLED_PATH_LIST} ${CMAKE_CURRENT_BINARY_DIR}/${XMLCFG_FILE_PREFIX}.xml)
+	endforeach()
+	add_custom_target( navit_config_xml_resource DEPENDS ${XMLCFG_INSTALLED_PATH_LIST} COMMAND mkdir -p resources/share/navit COMMAND cp ${XMLCFG_INSTALLED_PATH_LIST} resources/share/navit)
 	add_custom_target( locale_resource DEPENDS locales COMMAND mkdir -p resources/share COMMAND cp -a ${CMAKE_CURRENT_BINARY_DIR}/../locale resources/share/locale)
-	add_custom_target( navit_config_xml ALL DEPENDS navit.xml)
+	add_custom_target( navit_config_xml ALL DEPENDS ${XMLCFG_OUTPUT_LIST})
 endif()
 
 ADD_DEPENDENCIES(${NAVIT_LIBNAME} git_version)
@@ -189,6 +237,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/navit.xml
 	DESTINATION ${SHARE_DIR}
 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 
+foreach(XMLCFG_INSTALLED_PATH ${XMLCFG_INSTALLED_PATH_LIST})
+	install(FILES ${XMLCFG_INSTALLED_PATH}
+		DESTINATION ${SHARE_DIR}
+		PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+endforeach()
+
 get_directory_property(INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES)
 WRITE_FILE("cmake_plugin_settings.txt"
 	"set(APPLE ${APPLE} CACHE BOOL init)\n"
diff --git a/navit/android/CMakeLists.txt b/navit/android/CMakeLists.txt
index f78532297..91a4b29e7 100644
--- a/navit/android/CMakeLists.txt
+++ b/navit/android/CMakeLists.txt
@@ -48,26 +48,53 @@ if (ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja)
 	add_custom_target( android_resources
 		DEPENDS build.xml ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} ${LANG_RESOURCES}
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res/raw/
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/assets/config/
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/assets/config/ldpi
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/assets/config/mdpi
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/assets/config/hdpi
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/assets/config/xhdpi
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/assets/config/xxhdpi
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/assets/config/xxxhdpi
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}
 		COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/navit/libnavit.so ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}/
 		COMMAND ${CMAKE_COMMAND}
-		-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/navit*.xml"
-		-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw
-		-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/config/ldpi/*.xml"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/assets/config/ldpi
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
 		COMMAND ${CMAKE_COMMAND}
-		-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/icons/*.png"
-		-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/drawable-nodpi
-		-D LOWER=1
-		-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/config/mdpi/*.xml"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/assets/config/mdpi
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
 		COMMAND ${CMAKE_COMMAND}
-		-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/lib[b-z]*.so"
-		-D DST=${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}
-		-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/config/hdpi/*.xml"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/assets/config/hdpi
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
 		COMMAND ${CMAKE_COMMAND}
-		-D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo"
-		-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw
-		-D LOWER=1
-		-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/config/xhdpi/*.xml"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/assets/config/xhdpi
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+		COMMAND ${CMAKE_COMMAND}
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/config/xxhdpi/*.xml"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/assets/config/xxhdpi
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+		COMMAND ${CMAKE_COMMAND}
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/config/xxxhdpi/*.xml"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/assets/config/xxxhdpi
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+		COMMAND ${CMAKE_COMMAND}
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/icons/*.png"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/drawable-nodpi
+			-D LOWER=1
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+		COMMAND ${CMAKE_COMMAND}
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/lib[b-z]*.so"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
+		COMMAND ${CMAKE_COMMAND}
+			-D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo"
+			-D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw
+			-D LOWER=1
+			-P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
 		)
 
 	add_dependencies (android_resources images locales ${NAVIT_LIBNAME})
diff --git a/navit/android/build.gradle b/navit/android/build.gradle
index e2e42bc80..1385336bf 100644
--- a/navit/android/build.gradle
+++ b/navit/android/build.gradle
@@ -17,7 +17,7 @@ android {
         }
         externalNativeBuild {
             cmake {
-                arguments '-DUSE_PLUGINS=n', '-DBUILD_MAPTOOL=n', '-DXSL_PROCESSING=n', '-DSAMPLE_MAP=n'
+                arguments '-DUSE_PLUGINS=n', '-DBUILD_MAPTOOL=n', '-DXSL_PROCESSING=y', '-DXSLTS=android', '-DANDROID=y', '-DSAMPLE_MAP=n'
             }
         }
     }
@@ -38,6 +38,7 @@ android {
             resources.srcDirs = ["src"]
             renderscript.srcDirs = ["src"]
             res.srcDirs = ["res"]
+            assets.srcDirs = ["assets"]
             }
     }
     externalNativeBuild {
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index feb472764..e6a477a37 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -33,6 +33,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Point;
@@ -162,32 +163,35 @@ public class Navit extends Activity {
         }
     }
 
-    /* Translates a string from its id
+    /**
+     * Translates a string from its id
      * in R.strings
      *
      * @param Rid resource identifier
-     * @retrun translated string
+     * @return translated string
      */
     String getTstring(int Rid) {
         return getLocalizedString(getString(Rid));
     }
 
-    private boolean extractRes(String resname, String result) {
-        boolean needs_update = false;
-        Log.e(TAG, "Res Name " + resname + ", result " + result);
-        int id = NavitResources.getIdentifier(resname, "raw", NAVIT_PACKAGE_NAME);
-        Log.e(TAG, "Res ID " + id);
-        if (id == 0) {
-            return false;
-        }
+    /**
+     * Check if a specific file needs to be extracted from the apk archive
+     * This is based on whether the file already exist, and if so, whether it is older than the archive or not
+     *
+     * @param filename The full path to the file
+     * @return true if file does not exist, but it can be created at the specified location, we will also return
+     *         true if the file exist but the apk archive is more recent (probably package was upgraded)
+     */
+    private boolean resourceFileNeedsUpdate(String filename) {
+        File resultfile = new File(filename);
 
-        File resultfile = new File(result);
         if (!resultfile.exists()) {
-            needs_update = true;
             File path = resultfile.getParentFile();
             if (!path.exists() && !resultfile.getParentFile().mkdirs()) {
+                Log.e(TAG, "Could not create directory path for " + filename);
                 return false;
             }
+            return true;
         } else {
             PackageManager pm = getPackageManager();
             ApplicationInfo appInfo;
@@ -200,16 +204,33 @@ public class Navit extends Activity {
                 e.printStackTrace();
             }
             if (apkUpdateTime > resultfile.lastModified()) {
-                needs_update = true;
+                return true;
             }
         }
+        return false;
+    }
 
-        if (needs_update) {
-            Log.e(TAG, "Extracting resource");
+    /**
+     * Extract a ressource from the apk archive (res/raw) and save it to a local file
+     *
+     * @param result The full path to the local file
+     * @param resname The name of the ressource file in the archive
+     * @return true if the local file is extracted in @p result
+     */
+    private boolean extractRes(String resname, String result) {
+        Log.d(TAG, "Res Name " + resname + ", result " + result);
+        int id = NavitResources.getIdentifier(resname, "raw", NAVIT_PACKAGE_NAME);
+        Log.d(TAG, "Res ID " + id);
+        if (id == 0) {
+            return false;
+        }
+
+        if (resourceFileNeedsUpdate(result)) {
+            Log.d(TAG, "Extracting resource");
 
             try {
                 InputStream resourcestream = NavitResources.openRawResource(id);
-                FileOutputStream resultfilestream = new FileOutputStream(resultfile);
+                FileOutputStream resultfilestream = new FileOutputStream(new File(result));
                 byte[] buf = new byte[1024];
                 int i;
                 while ((i = resourcestream.read(buf)) != -1) {
@@ -224,6 +245,44 @@ public class Navit extends Activity {
         return true;
     }
 
+    /**
+     * Extract an asset from the apk archive (assets) and save it to a local file
+     *
+     * @param output The full path to the output local file
+     * @param assetFileName The full path of the asset file within the archive
+     * @return true if the local file is extracted in @p output
+     */
+    private boolean extractAsset(String assetFileName, String output) {
+        AssetManager assetMgr = NavitResources.getAssets();
+        InputStream assetstream;
+        Log.d(TAG, "Asset Name " + assetFileName + ", output " + output);
+        try {
+            assetstream = assetMgr.open(assetFileName);
+        } catch (IOException e) {
+            Log.e(TAG, "Failed opening asset '" + assetFileName + "'");
+            return false;
+        }
+
+        if (resourceFileNeedsUpdate(output)) {
+            Log.d(TAG, "Extracting asset '" + assetFileName + "'");
+
+            try {
+                FileOutputStream outputFilestream = new FileOutputStream(new File(output));
+                byte[] buf = new byte[1024];
+                int i = 0;
+                while ((i = assetstream.read(buf)) != -1) {
+                    outputFilestream.write(buf, 0, i);
+                }
+                outputFilestream.close();
+            } catch (Exception e) {
+                Log.e(TAG, "Exception " + e.getMessage());
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     private void showInfos() {
         SharedPreferences settings = getSharedPreferences(NAVIT_PREFS, MODE_PRIVATE);
         boolean firstStart = settings.getBoolean("firstStart", true);
@@ -386,13 +445,23 @@ public class Navit extends Activity {
         } else if (densityDpi < 640) {
             my_display_density = "xxxhdpi";
         } else {
-            Log.e(TAG, "found device of very high density (" + densityDpi + ")");
-            Log.e(TAG, "using xxxhdpi values");
+            Log.w(TAG, "found device of very high density (" + densityDpi + ")");
+            Log.w(TAG, "using xxxhdpi values");
             my_display_density = "xxxhdpi";
         }
+        Log.i(TAG, "Device density detected: " + my_display_density);
 
-        if (!extractRes("navit" + my_display_density, NAVIT_DATA_DIR + "/share/navit.xml")) {
-            Log.e(TAG, "Failed to extract navit.xml for " + my_display_density);
+        try {
+            AssetManager assetMgr = NavitResources.getAssets();
+            String[] children = assetMgr.list("config/" + my_display_density);
+            for (String child : children) {
+                Log.d(TAG, "Processing config file '" + child + "' from assets");
+                if (!extractAsset("config/" + my_display_density + "/" + child, NAVIT_DATA_DIR + "/share/" + child)) {
+                    Log.e(TAG, "Failed to extract asset config/" + my_display_density + "/" + child);
+                }
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to access assets using AssetManager");
         }
 
         Log.d(TAG, "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK));
@@ -669,7 +738,7 @@ public class Navit extends Activity {
 
 
     /**
-     * @brief Shows the Options menu.
+     * Shows the Options menu.
      *
      * Calling this method has the same effect as pressing the hardware Menu button, where present, or touching
      * the overflow button in the Action bar.
@@ -680,7 +749,7 @@ public class Navit extends Activity {
 
 
     /**
-     * @brief Shows the native keyboard or other input method.
+     * Shows the native keyboard or other input method.
      */
     public int showNativeKeyboard() {
         /*
@@ -721,7 +790,7 @@ public class Navit extends Activity {
 
 
     /**
-     * @brief Hides the native keyboard or other input method.
+     * Hides the native keyboard or other input method.
      */
     public void hideNativeKeyboard() {
         mgr.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
diff --git a/navit/attr_def.h b/navit/attr_def.h
index 0dffc93e5..2b51f11eb 100644
--- a/navit/attr_def.h
+++ b/navit/attr_def.h
@@ -344,7 +344,7 @@ ATTR(daylayout)
 ATTR(nightlayout)
 ATTR(xml_text)
 ATTR(layout_name)
-ATTR_UNUSED
+ATTR(default_layout)
 ATTR_UNUSED
 ATTR(status_text)
 ATTR(log_gpx_desc)
diff --git a/navit/file.c b/navit/file.c
index 0ef39bddd..4d7f226f8 100644
--- a/navit/file.c
+++ b/navit/file.c
@@ -231,7 +231,13 @@ file_create_url(char *url) {
 #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
 
-int file_is_dir(char *name) {
+/**
+ * @brief Check if a given path corresponds to a directory
+ *
+ * @param name The path to the filesystem element
+ * @return !=0 (true) if @p name is a directory
+ */
+int file_is_dir(const char *name) {
     struct stat buf;
     if (! stat(name, &buf)) {
         return S_ISDIR(buf.st_mode);
@@ -240,7 +246,13 @@ int file_is_dir(char *name) {
 
 }
 
-int file_is_reg(char *name) {
+/**
+ * @brief Check if a given path corresponds to a regular file
+ *
+ * @param name The path to the filesystem element
+ * @return !=0 (true) if @p name is a regular file
+ */
+int file_is_reg(const char *name) {
     struct stat buf;
     if (! stat(name, &buf)) {
         return S_ISREG(buf.st_mode);
diff --git a/navit/file.h b/navit/file.h
index e44ca96ad..8105302ba 100644
--- a/navit/file.h
+++ b/navit/file.h
@@ -65,7 +65,8 @@ struct attr;
 int file_request(struct file *f, struct attr **options);
 char *file_http_header(struct file *f, char *header);
 struct file *file_create(char *name, struct attr **options);
-int file_is_dir(char *name);
+int file_is_dir(const char *name);
+int file_is_reg(const char *name);
 long long file_size(struct file *file);
 int file_mkdir(char *name, int pflag);
 int file_mmap(struct file *file);
@@ -95,7 +96,6 @@ int file_version(struct file *file, int byname);
 void *file_get_os_handle(struct file *file);
 int file_set_cache_size(int cache_size);
 void file_init(void);
-int file_is_reg(char *name);
 void file_data_remove(struct file *file, unsigned char *data);
 /* end of prototypes */
 
diff --git a/navit/graphics/egl/graphics_egl.c b/navit/graphics/egl/graphics_egl.c
index f9c33c775..2da56047c 100644
--- a/navit/graphics/egl/graphics_egl.c
+++ b/navit/graphics/egl/graphics_egl.c
@@ -38,7 +38,7 @@
 #include "window.h"
 #include "navit/font/freetype/font_freetype.h"
 
-#include <SDL2/SDL_image.h>
+#include "SDL_image.h"
 #include <GLES2/gl2.h>
 #include <EGL/egl.h>
 
@@ -88,7 +88,8 @@ struct graphics_priv {
     struct graphics_gc_priv *background_gc;
     enum draw_mode_num mode;
     GLuint program;
-    GLint mvp_location, position_location, color_location, texture_position_location, use_texture_location, texture_location;
+    GLint mvp_location, position_location, color_location, texture_position_location, use_texture_location,
+          texture_location;
     struct callback_list *cbl;
     struct font_freetype_methods freetype_methods;
     struct navit *nav;
@@ -430,7 +431,8 @@ static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics
 
 static struct graphics_image_priv image_error;
 
-static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name, int *w, int *h, struct point *hot, int rotation) {
+static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name,
+        int *w, int *h, struct point *hot, int rotation) {
     struct graphics_image_priv *gi;
 
     /* FIXME: meth is not used yet.. so gi leaks. at least xpm is small */
@@ -640,7 +642,8 @@ static void draw_rectangle(struct graphics_priv *gr, struct graphics_gc_priv *gc
     graphics_priv_root->dirty = 1;
 }
 
-static void display_text_draw(struct font_freetype_text *text, struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, int color, struct point *p) {
+static void display_text_draw(struct font_freetype_text *text, struct graphics_priv *gr, struct graphics_gc_priv *fg,
+                              struct graphics_gc_priv *bg, int color, struct point *p) {
     int i, x, y, stride;
     struct font_freetype_glyph *g, **gp;
     unsigned char *shadow, *glyph;
@@ -745,7 +748,8 @@ static void display_text_draw(struct font_freetype_text *text, struct graphics_p
     }
 }
 
-static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
+static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg,
+                      struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
     if ((gr->parent && !gr->parent->overlay_enabled)
             || (gr->parent && gr->parent->overlay_enabled
                 && !gr->overlay_enabled)) {
@@ -772,7 +776,8 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str
 }
 
 
-static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img) {
+static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p,
+                       struct graphics_image_priv *img) {
     draw_image_es(gr, p, img->img->w, img->img->h, img->img->pixels);
 }
 
@@ -908,7 +913,8 @@ static void *get_data(struct graphics_priv *this, const char *type) {
         glClearColor ( 0, 0, 0, 1);
         glClear ( GL_COLOR_BUFFER_BIT );
 
-        callback_list_call_attr_2(graphics_priv_root->cbl, attr_resize, GINT_TO_POINTER(this->width), GINT_TO_POINTER(this->height));
+        callback_list_call_attr_2(graphics_priv_root->cbl, attr_resize, GINT_TO_POINTER(this->width),
+                                  GINT_TO_POINTER(this->height));
 
         this->program  = glCreateProgram();
         vertexShader   = load_shader(vertex_src, GL_VERTEX_SHADER);
@@ -1073,7 +1079,8 @@ static void create_framebuffer_texture(struct graphics_priv *gr) {
     }
 }
 
-static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int wraparound) {
+static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p,
+        int w, int h, int wraparound) {
     struct graphics_priv *this = graphics_opengl_new_helper(meth);
 
     this->p.x = p->x;
@@ -1228,7 +1235,8 @@ static gboolean graphics_sdl_idle(void *data) {
 }
 
 
-static struct graphics_priv *graphics_opengl_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl) {
+static struct graphics_priv *graphics_opengl_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs,
+        struct callback_list *cbl) {
     struct attr *attr;
     if (!event_request_system("glib", "graphics_opengl_new"))
         return NULL;
@@ -1319,4 +1327,3 @@ error:
 void plugin_init(void) {
     plugin_register_category_graphics("egl", graphics_opengl_new);
 }
-
diff --git a/navit/graphics/sdl/event_sdl.c b/navit/graphics/sdl/event_sdl.c
index 5e258c643..454e9eb06 100644
--- a/navit/graphics/sdl/event_sdl.c
+++ b/navit/graphics/sdl/event_sdl.c
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include <poll.h>
-#include <SDL/SDL.h>
+#include "SDL.h"
 #include <pthread.h>
 #include <signal.h>
 #include "config.h"
diff --git a/navit/graphics/sdl/event_sdl.h b/navit/graphics/sdl/event_sdl.h
index 7dceedec5..ee47f60d9 100644
--- a/navit/graphics/sdl/event_sdl.h
+++ b/navit/graphics/sdl/event_sdl.h
@@ -2,7 +2,7 @@
 #ifndef __EVENT_SDL_H
 #define __EVENT_SDL_H
 
-#include <SDL/SDL.h>
+#include "SDL.h"
 #include "config.h"
 #include "callback.h"
 #include "event.h"
diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c
index d9d31df8e..efd0faad5 100644
--- a/navit/graphics/sdl/graphics_sdl.c
+++ b/navit/graphics/sdl/graphics_sdl.c
@@ -34,7 +34,7 @@
 #include "callback.h"
 #include "font/freetype/font_freetype.h"
 
-#include <SDL/SDL.h>
+#include "SDL.h"
 #include <math.h>
 
 #ifdef USE_WEBOS
@@ -56,7 +56,7 @@
 #include "raster.h"
 
 #include <event.h>
-#include <SDL/SDL_image.h>
+#include "SDL_image.h"
 #include <alloca.h>
 
 /* TODO: union overlay + non-overlay to reduce size */
@@ -252,7 +252,8 @@ static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics
 }
 
 
-static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name, int *w, int *h, struct point *hot, int rotation) {
+static struct graphics_image_priv *image_new(struct graphics_priv *gr, struct graphics_image_methods *meth, char *name,
+        int *w, int *h, struct point *hot, int rotation) {
     struct graphics_image_priv *gi;
 
     /* FIXME: meth is not used yet.. so gi leaks. at least xpm is small */
@@ -526,7 +527,8 @@ static void resize_ft_buffer (unsigned int new_size) {
     }
 }
 
-static void display_text_draw(struct font_freetype_text *text, struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, int color, struct point *p) {
+static void display_text_draw(struct font_freetype_text *text, struct graphics_priv *gr, struct graphics_gc_priv *fg,
+                              struct graphics_gc_priv *bg, int color, struct point *p) {
     int i, x, y, stride;
     struct font_freetype_glyph *g, **gp;
     struct color transparent = { 0x0000, 0x0000, 0x0000, 0x0000 };
@@ -661,7 +663,8 @@ static void display_text_draw(struct font_freetype_text *text, struct graphics_p
     }
 }
 
-static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
+static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg,
+                      struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy) {
     if ((gr->overlay_parent && !gr->overlay_parent->overlay_enable)
             || (gr->overlay_parent && gr->overlay_parent->overlay_enable
                 && !gr->overlay_enable)) {
@@ -685,7 +688,8 @@ static void draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg, str
     gr->freetype_methods.text_destroy(t);
 }
 
-static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img) {
+static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p,
+                       struct graphics_image_priv *img) {
     if ((gr->overlay_parent && !gr->overlay_parent->overlay_enable) || (gr->overlay_parent
             && gr->overlay_parent->overlay_enable && !gr->overlay_enable) ) {
         return;
@@ -817,7 +821,8 @@ static struct graphics_methods graphics_methods = {
     NULL, /* hide_native_keyboard */
 };
 
-static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h,int wraparound) {
+static struct graphics_priv *overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p,
+        int w, int h,int wraparound) {
     struct graphics_priv *ov;
     Uint32 rmask, gmask, bmask, amask;
     int i;
@@ -1275,7 +1280,8 @@ static gboolean graphics_sdl_idle(void *data) {
 }
 
 
-static struct graphics_priv *graphics_sdl_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl) {
+static struct graphics_priv *graphics_sdl_new(struct navit *nav, struct graphics_methods *meth, struct attr **attrs,
+        struct callback_list *cbl) {
     struct graphics_priv *this=g_new0(struct graphics_priv, 1);
     struct font_priv *(*font_freetype_new) (void *meth);
     struct attr *attr;
diff --git a/navit/graphics/sdl/raster.h b/navit/graphics/sdl/raster.h
index 8f50b2715..2e68ea05f 100644
--- a/navit/graphics/sdl/raster.h
+++ b/navit/graphics/sdl/raster.h
@@ -9,7 +9,7 @@
 #define __RASTER_H
 
 #include <stdint.h>
-#include <SDL/SDL.h>
+#include "SDL.h"
 
 void raster_rect(SDL_Surface *s, int16_t x, int16_t y, int16_t w, int16_t h, uint32_t col);
 
@@ -22,4 +22,3 @@ void raster_aacircle(SDL_Surface *s, int16_t x, int16_t y, int16_t r, uint32_t c
 void raster_aapolygon(SDL_Surface *s, int16_t n, int16_t *vx, int16_t *vy, uint32_t col);
 
 #endif /* __RASTER_H */
-
diff --git a/navit/layout.c b/navit/layout.c
index 25f60bc4b..f2f3d1a75 100644
--- a/navit/layout.c
+++ b/navit/layout.c
@@ -25,15 +25,31 @@
 #include "layout.h"
 #include "coord.h"
 #include "debug.h"
+#include "navit.h"
 
-
-struct layout * layout_new(struct attr *parent, struct attr **attrs) {
+/**
+ * @brief Create a new layout object and attach it to a navit parent
+ *
+ * @param parent The parent for this layout (a navit attr)
+ * @param attrs An array of attributes that for this layout
+ * @return The newly created layout object
+ */
+struct layout *
+layout_new(struct attr *parent, struct attr **attrs) {
     struct layout *l;
+    struct navit *navit;
     struct color def_color = {COLOR_BACKGROUND_};
     struct attr *name_attr,*color_attr,*order_delta_attr,*font_attr,*day_attr,*night_attr,*active_attr;
 
     if (! (name_attr=attr_search(attrs, NULL, attr_name)))
         return NULL;
+    navit = parent->u.navit;
+    if (navit_get_layout_by_name(navit, name_attr->u.str)) {
+        dbg(lvl_warning, "Another layout with name '%s' has already been parsed. Discarding subsequent duplicate.",
+            name_attr->u.str);
+        return NULL;
+    }
+
     l = g_new0(struct layout, 1);
     l->func=&layout_func;
     navit_object_ref((struct navit_object *)l);
@@ -55,7 +71,7 @@ struct layout * layout_new(struct attr *parent, struct attr **attrs) {
         l->order_delta=order_delta_attr->u.num;
     if ((active_attr=attr_search(attrs, NULL, attr_active)))
         l->active = active_attr->u.num;
-    l->navit=parent->u.navit;
+    l->navit=navit;
     return l;
 }
 
diff --git a/navit/main.c b/navit/main.c
index 75a3a5f93..986947f0d 100644
--- a/navit/main.c
+++ b/navit/main.c
@@ -73,10 +73,19 @@ void setenv(char *var, char *val, int overwrite) {
 #endif
 
 /*
- * environment_vars[][0:name,1-3:mode]
- * ':'  replaced with NAVIT_PREFIX
- * '::' replaced with NAVIT_PREFIX and LIBDIR
- * '~'  replaced with HOME
+ * @def environment_vars
+ *
+ * @brief Environment variables automatically added (and expanded) by navit at startup
+ *
+ * A NUL-terminated string array
+ * environment_vars[0] is the name of the variable
+ * environment_vars[1] is the value used when running from source dir
+ * environment_vars[2] is the value used on Linux
+ * environment_vars[3] is the value used on Windows (see main_init())
+ * environment_vars[4] is the value used on Android
+ * ':'  is replaced with NAVIT_PREFIX
+ * '::' is replaced with NAVIT_PREFIX and LIBDIR
+ * '~'  is replaced with HOME
 */
 static char *environment_vars[][5]= {
     {"NAVIT_LIBDIR",      ":",          ":/"LIB_DIR,     ":\\lib",      ":/lib"},
@@ -319,6 +328,10 @@ static void win_set_nls(void) {
 }
 #endif
 
+void main_update_default_layout(struct navit *navit) {
+    navit_update_current_layout(navit, NULL);
+}
+
 void main_init(const char *program) {
     char *s;
 #ifdef _UNICODE		/* currently for wince */
diff --git a/navit/main.h b/navit/main.h
index 47f275c09..910d56200 100644
--- a/navit/main.h
+++ b/navit/main.h
@@ -35,6 +35,7 @@ void main_add_navit(struct navit *nav);
 void main_remove_navit(struct navit *nav);
 int main_add_attr(struct attr *attr);
 int main_remove_attr(struct attr *attr);
+void main_update_default_layout(struct navit *navit);
 void main_init(const char *program);
 void main_init_nls(void);
 int main(int argc, char **argv);
diff --git a/navit/maps/CMakeLists.txt b/navit/maps/CMakeLists.txt
index dbda66e2e..ee9babdf9 100644
--- a/navit/maps/CMakeLists.txt
+++ b/navit/maps/CMakeLists.txt
@@ -15,7 +15,7 @@ if(SAMPLE_MAP)
 		add_custom_command (
 			OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
 			COMMAND ${CMAKE_COMMAND}
-			-D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.bin
+			-D URL=http://www1.navit-project.org/maps/${SAMPLE_MAP_NAME}.bin
 			-D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin
 			-P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake
 			VERBATIM
@@ -31,7 +31,7 @@ if(SAMPLE_MAP)
 		add_custom_command (
 			OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
 			COMMAND ${CMAKE_COMMAND}
-			-D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.osm.bz2
+			-D URL=http://www1.navit-project.org/maps/${SAMPLE_MAP_NAME}.osm.bz2
 			-D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2
 			-P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake
 			VERBATIM
diff --git a/navit/maptool/CMakeLists.txt b/navit/maptool/CMakeLists.txt
index b9df91dd4..624ea907b 100644
--- a/navit/maptool/CMakeLists.txt
+++ b/navit/maptool/CMakeLists.txt
@@ -1,16 +1,29 @@
-
 if(BUILD_MAPTOOL)
+
+	find_package(Protobuf-c REQUIRED)
+	include_directories(${PROTOBUF-C_INCLUDE_DIR})
+	include_directories(${CMAKE_CURRENT_BINARY_DIR})
+	#PROTOBUF_C_GENERATE_C(PROTO_SRCS PROTO_HDRS zfs.proto)
+
 	add_definitions( -DMODULE=maptool ${NAVIT_COMPILE_FLAGS})
-	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-	SET(MAPTOOL_SOURCE boundaries.c buffer.c ch.c coastline.c itembin.c itembin_buffer.c misc.c osm.c osm_o5m.c osm_psql.c osm_relations.c sourcesink.c tempfile.c tile.c zip.c osm_xml.c)
+
+	add_executable (maptool maptool.c)
+	add_library (maptool_core boundaries.c buffer.c ch.c coastline.c itembin.c
+		itembin_buffer.c misc.c osm.c osm_o5m.c osm_psql.c osm_relations.c
+	 	sourcesink.c tempfile.c tile.c zip.c osm_xml.c)
+
 	if(NOT MSVC)
-		SET(MAPTOOL_SOURCE ${MAPTOOL_SOURCE} osm_protobuf.c osm_protobufdb.c generated-code/fileformat.pb-c.c generated-code/osmformat.pb-c.c google/protobuf-c/protobuf-c.c)
+		PROTOBUF_C_GENERATE_C (PROTO_SRCS PROTO_HDRS osmformat.proto)
+		PROTOBUF_C_GENERATE_C (PROTO_SRCS PROTO_HDRS fileformat.proto)
+		target_sources(maptool_core PRIVATE osm_protobuf.c osm_protobufdb.c
+			fileformat.pb-c.c osmformat.pb-c.c)
+		target_link_libraries(maptool_core ${PROTOBUF_C_LIBRARY})
 	endif(NOT MSVC)
-	add_library (maptool_core ${MAPTOOL_SOURCE})
-	add_executable (maptool maptool.c)
+
 	if(NOT MSVC)
 		SET(NAVIT_LIBS ${NAVIT_LIBS} m)
 	endif(NOT MSVC)
+
 	target_link_libraries(maptool maptool_core ${NAVIT_LIBNAME} ${NAVIT_LIBS})
 
 	install(TARGETS maptool
diff --git a/navit/maptool/fileformat.proto b/navit/maptool/fileformat.proto
index 006cba767..2f1765935 100644
--- a/navit/maptool/fileformat.proto
+++ b/navit/maptool/fileformat.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 option java_package = "crosby.binary";
 package OSMPBF;
 
@@ -32,5 +33,3 @@ message BlobHeader {
   optional bytes indexdata = 2;
   required int32 datasize = 3;
 }
-
-
diff --git a/navit/maptool/generated-code/fileformat.pb-c.c b/navit/maptool/generated-code/fileformat.pb-c.c
deleted file mode 100644
index 7189091ad..000000000
--- a/navit/maptool/generated-code/fileformat.pb-c.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C_NO_DEPRECATED
-#define PROTOBUF_C_NO_DEPRECATED
-#endif
-
-#include "fileformat.pb-c.h"
-void   osmpbf__blob__init
-(OSMPBF__Blob         *message) {
-    static OSMPBF__Blob init_value = OSMPBF__BLOB__INIT;
-    *message = init_value;
-}
-size_t osmpbf__blob__get_packed_size
-(const OSMPBF__Blob *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__blob__pack
-(const OSMPBF__Blob *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__blob__pack_to_buffer
-(const OSMPBF__Blob *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__Blob *
-osmpbf__blob__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__Blob *)
-           protobuf_c_message_unpack (&osmpbf__blob__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__blob__free_unpacked
-(OSMPBF__Blob *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__blob_header__init
-(OSMPBF__BlobHeader         *message) {
-    static OSMPBF__BlobHeader init_value = OSMPBF__BLOB_HEADER__INIT;
-    *message = init_value;
-}
-size_t osmpbf__blob_header__get_packed_size
-(const OSMPBF__BlobHeader *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob_header__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__blob_header__pack
-(const OSMPBF__BlobHeader *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob_header__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__blob_header__pack_to_buffer
-(const OSMPBF__BlobHeader *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob_header__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__BlobHeader *
-osmpbf__blob_header__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__BlobHeader *)
-           protobuf_c_message_unpack (&osmpbf__blob_header__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__blob_header__free_unpacked
-(OSMPBF__BlobHeader *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__blob_header__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor osmpbf__blob__field_descriptors[5] = {
-    {
-        "raw",
-        1,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_BYTES,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, has_raw),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, raw),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "raw_size",
-        2,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, has_raw_size),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, raw_size),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "zlib_data",
-        3,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_BYTES,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, has_zlib_data),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, zlib_data),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "lzma_data",
-        4,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_BYTES,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, has_lzma_data),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, lzma_data),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "OBSOLETE_bzip2_data",
-        5,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_BYTES,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, has_obsolete_bzip2_data),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Blob, obsolete_bzip2_data),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__blob__field_indices_by_name[] = {
-    4,   /* field[4] = OBSOLETE_bzip2_data */
-    3,   /* field[3] = lzma_data */
-    0,   /* field[0] = raw */
-    1,   /* field[1] = raw_size */
-    2,   /* field[2] = zlib_data */
-};
-static const ProtobufCIntRange osmpbf__blob__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 5 }
-};
-const ProtobufCMessageDescriptor osmpbf__blob__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.Blob",
-    "Blob",
-    "OSMPBF__Blob",
-    "OSMPBF",
-    sizeof(OSMPBF__Blob),
-    5,
-    osmpbf__blob__field_descriptors,
-    osmpbf__blob__field_indices_by_name,
-    1,  osmpbf__blob__number_ranges,
-    (ProtobufCMessageInit) osmpbf__blob__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__blob_header__field_descriptors[3] = {
-    {
-        "type",
-        1,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_STRING,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__BlobHeader, type),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "indexdata",
-        2,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_BYTES,
-        PROTOBUF_C_OFFSETOF(OSMPBF__BlobHeader, has_indexdata),
-        PROTOBUF_C_OFFSETOF(OSMPBF__BlobHeader, indexdata),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "datasize",
-        3,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_INT32,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__BlobHeader, datasize),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__blob_header__field_indices_by_name[] = {
-    2,   /* field[2] = datasize */
-    1,   /* field[1] = indexdata */
-    0,   /* field[0] = type */
-};
-static const ProtobufCIntRange osmpbf__blob_header__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 3 }
-};
-const ProtobufCMessageDescriptor osmpbf__blob_header__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.BlobHeader",
-    "BlobHeader",
-    "OSMPBF__BlobHeader",
-    "OSMPBF",
-    sizeof(OSMPBF__BlobHeader),
-    3,
-    osmpbf__blob_header__field_descriptors,
-    osmpbf__blob_header__field_indices_by_name,
-    1,  osmpbf__blob_header__number_ranges,
-    (ProtobufCMessageInit) osmpbf__blob_header__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/navit/maptool/generated-code/fileformat.pb-c.h b/navit/maptool/generated-code/fileformat.pb-c.h
deleted file mode 100644
index 9996bfbea..000000000
--- a/navit/maptool/generated-code/fileformat.pb-c.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-
-#ifndef PROTOBUF_C_fileformat_2eproto__INCLUDED
-#define PROTOBUF_C_fileformat_2eproto__INCLUDED
-
-#include <google/protobuf-c/protobuf-c.h>
-
-PROTOBUF_C_BEGIN_DECLS
-
-
-typedef struct _OSMPBF__Blob OSMPBF__Blob;
-typedef struct _OSMPBF__BlobHeader OSMPBF__BlobHeader;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _OSMPBF__Blob
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_raw;
-  ProtobufCBinaryData raw;
-  protobuf_c_boolean has_raw_size;
-  int32_t raw_size;
-  protobuf_c_boolean has_zlib_data;
-  ProtobufCBinaryData zlib_data;
-  protobuf_c_boolean has_lzma_data;
-  ProtobufCBinaryData lzma_data;
-  protobuf_c_boolean has_obsolete_bzip2_data PROTOBUF_C_DEPRECATED;
-  ProtobufCBinaryData obsolete_bzip2_data PROTOBUF_C_DEPRECATED;
-};
-#define OSMPBF__BLOB__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__blob__descriptor) \
-    , 0,{0,NULL}, 0,0, 0,{0,NULL}, 0,{0,NULL}, 0,{0,NULL} }
-
-
-struct  _OSMPBF__BlobHeader
-{
-  ProtobufCMessage base;
-  char *type;
-  protobuf_c_boolean has_indexdata;
-  ProtobufCBinaryData indexdata;
-  int32_t datasize;
-};
-#define OSMPBF__BLOB_HEADER__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__blob_header__descriptor) \
-    , NULL, 0,{0,NULL}, 0 }
-
-
-/* OSMPBF__Blob methods */
-void   osmpbf__blob__init
-                     (OSMPBF__Blob         *message);
-size_t osmpbf__blob__get_packed_size
-                     (const OSMPBF__Blob   *message);
-size_t osmpbf__blob__pack
-                     (const OSMPBF__Blob   *message,
-                      uint8_t             *out);
-size_t osmpbf__blob__pack_to_buffer
-                     (const OSMPBF__Blob   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__Blob *
-       osmpbf__blob__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__blob__free_unpacked
-                     (OSMPBF__Blob *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__BlobHeader methods */
-void   osmpbf__blob_header__init
-                     (OSMPBF__BlobHeader         *message);
-size_t osmpbf__blob_header__get_packed_size
-                     (const OSMPBF__BlobHeader   *message);
-size_t osmpbf__blob_header__pack
-                     (const OSMPBF__BlobHeader   *message,
-                      uint8_t             *out);
-size_t osmpbf__blob_header__pack_to_buffer
-                     (const OSMPBF__BlobHeader   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__BlobHeader *
-       osmpbf__blob_header__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__blob_header__free_unpacked
-                     (OSMPBF__BlobHeader *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*OSMPBF__Blob_Closure)
-                 (const OSMPBF__Blob *message,
-                  void *closure_data);
-typedef void (*OSMPBF__BlobHeader_Closure)
-                 (const OSMPBF__BlobHeader *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor osmpbf__blob__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__blob_header__descriptor;
-
-PROTOBUF_C_END_DECLS
-
-
-#endif  /* PROTOBUF_fileformat_2eproto__INCLUDED */
diff --git a/navit/maptool/generated-code/osmformat.pb-c.c b/navit/maptool/generated-code/osmformat.pb-c.c
deleted file mode 100644
index 118b2ee5d..000000000
--- a/navit/maptool/generated-code/osmformat.pb-c.c
+++ /dev/null
@@ -1,1471 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C_NO_DEPRECATED
-#define PROTOBUF_C_NO_DEPRECATED
-#endif
-
-#include "osmformat.pb-c.h"
-void   osmpbf__header_block__init
-(OSMPBF__HeaderBlock         *message) {
-    static OSMPBF__HeaderBlock init_value = OSMPBF__HEADER_BLOCK__INIT;
-    *message = init_value;
-}
-size_t osmpbf__header_block__get_packed_size
-(const OSMPBF__HeaderBlock *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_block__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__header_block__pack
-(const OSMPBF__HeaderBlock *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_block__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__header_block__pack_to_buffer
-(const OSMPBF__HeaderBlock *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_block__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__HeaderBlock *
-osmpbf__header_block__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__HeaderBlock *)
-           protobuf_c_message_unpack (&osmpbf__header_block__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__header_block__free_unpacked
-(OSMPBF__HeaderBlock *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_block__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__header_bbox__init
-(OSMPBF__HeaderBBox         *message) {
-    static OSMPBF__HeaderBBox init_value = OSMPBF__HEADER_BBOX__INIT;
-    *message = init_value;
-}
-size_t osmpbf__header_bbox__get_packed_size
-(const OSMPBF__HeaderBBox *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_bbox__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__header_bbox__pack
-(const OSMPBF__HeaderBBox *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_bbox__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__header_bbox__pack_to_buffer
-(const OSMPBF__HeaderBBox *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_bbox__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__HeaderBBox *
-osmpbf__header_bbox__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__HeaderBBox *)
-           protobuf_c_message_unpack (&osmpbf__header_bbox__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__header_bbox__free_unpacked
-(OSMPBF__HeaderBBox *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__header_bbox__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__primitive_block__init
-(OSMPBF__PrimitiveBlock         *message) {
-    static OSMPBF__PrimitiveBlock init_value = OSMPBF__PRIMITIVE_BLOCK__INIT;
-    *message = init_value;
-}
-size_t osmpbf__primitive_block__get_packed_size
-(const OSMPBF__PrimitiveBlock *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_block__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__primitive_block__pack
-(const OSMPBF__PrimitiveBlock *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_block__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__primitive_block__pack_to_buffer
-(const OSMPBF__PrimitiveBlock *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_block__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__PrimitiveBlock *
-osmpbf__primitive_block__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__PrimitiveBlock *)
-           protobuf_c_message_unpack (&osmpbf__primitive_block__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__primitive_block__free_unpacked
-(OSMPBF__PrimitiveBlock *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_block__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__primitive_group__init
-(OSMPBF__PrimitiveGroup         *message) {
-    static OSMPBF__PrimitiveGroup init_value = OSMPBF__PRIMITIVE_GROUP__INIT;
-    *message = init_value;
-}
-size_t osmpbf__primitive_group__get_packed_size
-(const OSMPBF__PrimitiveGroup *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_group__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__primitive_group__pack
-(const OSMPBF__PrimitiveGroup *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_group__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__primitive_group__pack_to_buffer
-(const OSMPBF__PrimitiveGroup *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_group__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__PrimitiveGroup *
-osmpbf__primitive_group__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__PrimitiveGroup *)
-           protobuf_c_message_unpack (&osmpbf__primitive_group__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__primitive_group__free_unpacked
-(OSMPBF__PrimitiveGroup *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__primitive_group__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__string_table__init
-(OSMPBF__StringTable         *message) {
-    static OSMPBF__StringTable init_value = OSMPBF__STRING_TABLE__INIT;
-    *message = init_value;
-}
-size_t osmpbf__string_table__get_packed_size
-(const OSMPBF__StringTable *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__string_table__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__string_table__pack
-(const OSMPBF__StringTable *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__string_table__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__string_table__pack_to_buffer
-(const OSMPBF__StringTable *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__string_table__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__StringTable *
-osmpbf__string_table__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__StringTable *)
-           protobuf_c_message_unpack (&osmpbf__string_table__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__string_table__free_unpacked
-(OSMPBF__StringTable *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__string_table__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__info__init
-(OSMPBF__Info         *message) {
-    static OSMPBF__Info init_value = OSMPBF__INFO__INIT;
-    *message = init_value;
-}
-size_t osmpbf__info__get_packed_size
-(const OSMPBF__Info *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__info__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__info__pack
-(const OSMPBF__Info *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__info__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__info__pack_to_buffer
-(const OSMPBF__Info *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__info__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__Info *
-osmpbf__info__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__Info *)
-           protobuf_c_message_unpack (&osmpbf__info__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__info__free_unpacked
-(OSMPBF__Info *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__info__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__dense_info__init
-(OSMPBF__DenseInfo         *message) {
-    static OSMPBF__DenseInfo init_value = OSMPBF__DENSE_INFO__INIT;
-    *message = init_value;
-}
-size_t osmpbf__dense_info__get_packed_size
-(const OSMPBF__DenseInfo *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_info__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__dense_info__pack
-(const OSMPBF__DenseInfo *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_info__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__dense_info__pack_to_buffer
-(const OSMPBF__DenseInfo *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_info__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__DenseInfo *
-osmpbf__dense_info__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__DenseInfo *)
-           protobuf_c_message_unpack (&osmpbf__dense_info__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__dense_info__free_unpacked
-(OSMPBF__DenseInfo *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_info__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__change_set__init
-(OSMPBF__ChangeSet         *message) {
-    static OSMPBF__ChangeSet init_value = OSMPBF__CHANGE_SET__INIT;
-    *message = init_value;
-}
-size_t osmpbf__change_set__get_packed_size
-(const OSMPBF__ChangeSet *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__change_set__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__change_set__pack
-(const OSMPBF__ChangeSet *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__change_set__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__change_set__pack_to_buffer
-(const OSMPBF__ChangeSet *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__change_set__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__ChangeSet *
-osmpbf__change_set__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__ChangeSet *)
-           protobuf_c_message_unpack (&osmpbf__change_set__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__change_set__free_unpacked
-(OSMPBF__ChangeSet *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__change_set__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__node__init
-(OSMPBF__Node         *message) {
-    static OSMPBF__Node init_value = OSMPBF__NODE__INIT;
-    *message = init_value;
-}
-size_t osmpbf__node__get_packed_size
-(const OSMPBF__Node *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__node__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__node__pack
-(const OSMPBF__Node *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__node__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__node__pack_to_buffer
-(const OSMPBF__Node *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__node__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__Node *
-osmpbf__node__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__Node *)
-           protobuf_c_message_unpack (&osmpbf__node__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__node__free_unpacked
-(OSMPBF__Node *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__node__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__dense_nodes__init
-(OSMPBF__DenseNodes         *message) {
-    static OSMPBF__DenseNodes init_value = OSMPBF__DENSE_NODES__INIT;
-    *message = init_value;
-}
-size_t osmpbf__dense_nodes__get_packed_size
-(const OSMPBF__DenseNodes *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_nodes__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__dense_nodes__pack
-(const OSMPBF__DenseNodes *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_nodes__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__dense_nodes__pack_to_buffer
-(const OSMPBF__DenseNodes *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_nodes__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__DenseNodes *
-osmpbf__dense_nodes__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__DenseNodes *)
-           protobuf_c_message_unpack (&osmpbf__dense_nodes__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__dense_nodes__free_unpacked
-(OSMPBF__DenseNodes *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__dense_nodes__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__way__init
-(OSMPBF__Way         *message) {
-    static OSMPBF__Way init_value = OSMPBF__WAY__INIT;
-    *message = init_value;
-}
-size_t osmpbf__way__get_packed_size
-(const OSMPBF__Way *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__way__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__way__pack
-(const OSMPBF__Way *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__way__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__way__pack_to_buffer
-(const OSMPBF__Way *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__way__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__Way *
-osmpbf__way__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__Way *)
-           protobuf_c_message_unpack (&osmpbf__way__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__way__free_unpacked
-(OSMPBF__Way *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__way__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   osmpbf__relation__init
-(OSMPBF__Relation         *message) {
-    static OSMPBF__Relation init_value = OSMPBF__RELATION__INIT;
-    *message = init_value;
-}
-size_t osmpbf__relation__get_packed_size
-(const OSMPBF__Relation *message) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__relation__descriptor);
-    return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t osmpbf__relation__pack
-(const OSMPBF__Relation *message,
- uint8_t       *out) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__relation__descriptor);
-    return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t osmpbf__relation__pack_to_buffer
-(const OSMPBF__Relation *message,
- ProtobufCBuffer *buffer) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__relation__descriptor);
-    return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-OSMPBF__Relation *
-osmpbf__relation__unpack
-(ProtobufCAllocator  *allocator,
- size_t               len,
- const uint8_t       *data) {
-    return (OSMPBF__Relation *)
-           protobuf_c_message_unpack (&osmpbf__relation__descriptor,
-                                      allocator, len, data);
-}
-void   osmpbf__relation__free_unpacked
-(OSMPBF__Relation *message,
- ProtobufCAllocator *allocator) {
-    PROTOBUF_C_ASSERT (message->base.descriptor == &osmpbf__relation__descriptor);
-    protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor osmpbf__header_block__field_descriptors[5] = {
-    {
-        "bbox",
-        1,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_MESSAGE,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBlock, bbox),
-        &osmpbf__header_bbox__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "required_features",
-        4,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_STRING,
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBlock, n_required_features),
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBlock, required_features),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "optional_features",
-        5,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_STRING,
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBlock, n_optional_features),
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBlock, optional_features),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "writingprogram",
-        16,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_STRING,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBlock, writingprogram),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "source",
-        17,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_STRING,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBlock, source),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__header_block__field_indices_by_name[] = {
-    0,   /* field[0] = bbox */
-    2,   /* field[2] = optional_features */
-    1,   /* field[1] = required_features */
-    4,   /* field[4] = source */
-    3,   /* field[3] = writingprogram */
-};
-static const ProtobufCIntRange osmpbf__header_block__number_ranges[3 + 1] = {
-    { 1, 0 },
-    { 4, 1 },
-    { 16, 3 },
-    { 0, 5 }
-};
-const ProtobufCMessageDescriptor osmpbf__header_block__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.HeaderBlock",
-    "HeaderBlock",
-    "OSMPBF__HeaderBlock",
-    "OSMPBF",
-    sizeof(OSMPBF__HeaderBlock),
-    5,
-    osmpbf__header_block__field_descriptors,
-    osmpbf__header_block__field_indices_by_name,
-    3,  osmpbf__header_block__number_ranges,
-    (ProtobufCMessageInit) osmpbf__header_block__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__header_bbox__field_descriptors[4] = {
-    {
-        "left",
-        1,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_SINT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBBox, left),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "right",
-        2,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_SINT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBBox, right),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "top",
-        3,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_SINT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBBox, top),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "bottom",
-        4,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_SINT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__HeaderBBox, bottom),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__header_bbox__field_indices_by_name[] = {
-    3,   /* field[3] = bottom */
-    0,   /* field[0] = left */
-    1,   /* field[1] = right */
-    2,   /* field[2] = top */
-};
-static const ProtobufCIntRange osmpbf__header_bbox__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 4 }
-};
-const ProtobufCMessageDescriptor osmpbf__header_bbox__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.HeaderBBox",
-    "HeaderBBox",
-    "OSMPBF__HeaderBBox",
-    "OSMPBF",
-    sizeof(OSMPBF__HeaderBBox),
-    4,
-    osmpbf__header_bbox__field_descriptors,
-    osmpbf__header_bbox__field_indices_by_name,
-    1,  osmpbf__header_bbox__number_ranges,
-    (ProtobufCMessageInit) osmpbf__header_bbox__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const int32_t osmpbf__primitive_block__granularity__default_value = 100;
-static const int64_t osmpbf__primitive_block__lat_offset__default_value = 0;
-static const int64_t osmpbf__primitive_block__lon_offset__default_value = 0;
-static const int32_t osmpbf__primitive_block__date_granularity__default_value = 1000;
-static const ProtobufCFieldDescriptor osmpbf__primitive_block__field_descriptors[6] = {
-    {
-        "stringtable",
-        1,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_MESSAGE,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, stringtable),
-        &osmpbf__string_table__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "primitivegroup",
-        2,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_MESSAGE,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, n_primitivegroup),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, primitivegroup),
-        &osmpbf__primitive_group__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "granularity",
-        17,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, has_granularity),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, granularity),
-        NULL,
-        &osmpbf__primitive_block__granularity__default_value,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "date_granularity",
-        18,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, has_date_granularity),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, date_granularity),
-        NULL,
-        &osmpbf__primitive_block__date_granularity__default_value,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "lat_offset",
-        19,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, has_lat_offset),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, lat_offset),
-        NULL,
-        &osmpbf__primitive_block__lat_offset__default_value,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "lon_offset",
-        20,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, has_lon_offset),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveBlock, lon_offset),
-        NULL,
-        &osmpbf__primitive_block__lon_offset__default_value,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__primitive_block__field_indices_by_name[] = {
-    3,   /* field[3] = date_granularity */
-    2,   /* field[2] = granularity */
-    4,   /* field[4] = lat_offset */
-    5,   /* field[5] = lon_offset */
-    1,   /* field[1] = primitivegroup */
-    0,   /* field[0] = stringtable */
-};
-static const ProtobufCIntRange osmpbf__primitive_block__number_ranges[2 + 1] = {
-    { 1, 0 },
-    { 17, 2 },
-    { 0, 6 }
-};
-const ProtobufCMessageDescriptor osmpbf__primitive_block__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.PrimitiveBlock",
-    "PrimitiveBlock",
-    "OSMPBF__PrimitiveBlock",
-    "OSMPBF",
-    sizeof(OSMPBF__PrimitiveBlock),
-    6,
-    osmpbf__primitive_block__field_descriptors,
-    osmpbf__primitive_block__field_indices_by_name,
-    2,  osmpbf__primitive_block__number_ranges,
-    (ProtobufCMessageInit) osmpbf__primitive_block__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__primitive_group__field_descriptors[5] = {
-    {
-        "nodes",
-        1,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_MESSAGE,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, n_nodes),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, nodes),
-        &osmpbf__node__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "dense",
-        2,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_MESSAGE,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, dense),
-        &osmpbf__dense_nodes__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "ways",
-        3,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_MESSAGE,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, n_ways),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, ways),
-        &osmpbf__way__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "relations",
-        4,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_MESSAGE,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, n_relations),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, relations),
-        &osmpbf__relation__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "changesets",
-        5,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_MESSAGE,
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, n_changesets),
-        PROTOBUF_C_OFFSETOF(OSMPBF__PrimitiveGroup, changesets),
-        &osmpbf__change_set__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__primitive_group__field_indices_by_name[] = {
-    4,   /* field[4] = changesets */
-    1,   /* field[1] = dense */
-    0,   /* field[0] = nodes */
-    3,   /* field[3] = relations */
-    2,   /* field[2] = ways */
-};
-static const ProtobufCIntRange osmpbf__primitive_group__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 5 }
-};
-const ProtobufCMessageDescriptor osmpbf__primitive_group__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.PrimitiveGroup",
-    "PrimitiveGroup",
-    "OSMPBF__PrimitiveGroup",
-    "OSMPBF",
-    sizeof(OSMPBF__PrimitiveGroup),
-    5,
-    osmpbf__primitive_group__field_descriptors,
-    osmpbf__primitive_group__field_indices_by_name,
-    1,  osmpbf__primitive_group__number_ranges,
-    (ProtobufCMessageInit) osmpbf__primitive_group__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__string_table__field_descriptors[1] = {
-    {
-        "s",
-        1,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_BYTES,
-        PROTOBUF_C_OFFSETOF(OSMPBF__StringTable, n_s),
-        PROTOBUF_C_OFFSETOF(OSMPBF__StringTable, s),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__string_table__field_indices_by_name[] = {
-    0,   /* field[0] = s */
-};
-static const ProtobufCIntRange osmpbf__string_table__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 1 }
-};
-const ProtobufCMessageDescriptor osmpbf__string_table__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.StringTable",
-    "StringTable",
-    "OSMPBF__StringTable",
-    "OSMPBF",
-    sizeof(OSMPBF__StringTable),
-    1,
-    osmpbf__string_table__field_descriptors,
-    osmpbf__string_table__field_indices_by_name,
-    1,  osmpbf__string_table__number_ranges,
-    (ProtobufCMessageInit) osmpbf__string_table__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const int32_t osmpbf__info__version__default_value = -1;
-static const ProtobufCFieldDescriptor osmpbf__info__field_descriptors[5] = {
-    {
-        "version",
-        1,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, has_version),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, version),
-        NULL,
-        &osmpbf__info__version__default_value,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "timestamp",
-        2,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, has_timestamp),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, timestamp),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "changeset",
-        3,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, has_changeset),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, changeset),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "uid",
-        4,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, has_uid),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, uid),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "user_sid",
-        5,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_UINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, has_user_sid),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Info, user_sid),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__info__field_indices_by_name[] = {
-    2,   /* field[2] = changeset */
-    1,   /* field[1] = timestamp */
-    3,   /* field[3] = uid */
-    4,   /* field[4] = user_sid */
-    0,   /* field[0] = version */
-};
-static const ProtobufCIntRange osmpbf__info__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 5 }
-};
-const ProtobufCMessageDescriptor osmpbf__info__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.Info",
-    "Info",
-    "OSMPBF__Info",
-    "OSMPBF",
-    sizeof(OSMPBF__Info),
-    5,
-    osmpbf__info__field_descriptors,
-    osmpbf__info__field_indices_by_name,
-    1,  osmpbf__info__number_ranges,
-    (ProtobufCMessageInit) osmpbf__info__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__dense_info__field_descriptors[5] = {
-    {
-        "version",
-        1,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, n_version),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, version),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "timestamp",
-        2,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, n_timestamp),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, timestamp),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "changeset",
-        3,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, n_changeset),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, changeset),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "uid",
-        4,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, n_uid),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, uid),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "user_sid",
-        5,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, n_user_sid),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseInfo, user_sid),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__dense_info__field_indices_by_name[] = {
-    2,   /* field[2] = changeset */
-    1,   /* field[1] = timestamp */
-    3,   /* field[3] = uid */
-    4,   /* field[4] = user_sid */
-    0,   /* field[0] = version */
-};
-static const ProtobufCIntRange osmpbf__dense_info__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 5 }
-};
-const ProtobufCMessageDescriptor osmpbf__dense_info__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.DenseInfo",
-    "DenseInfo",
-    "OSMPBF__DenseInfo",
-    "OSMPBF",
-    sizeof(OSMPBF__DenseInfo),
-    5,
-    osmpbf__dense_info__field_descriptors,
-    osmpbf__dense_info__field_indices_by_name,
-    1,  osmpbf__dense_info__number_ranges,
-    (ProtobufCMessageInit) osmpbf__dense_info__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__change_set__field_descriptors[1] = {
-    {
-        "id",
-        1,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_INT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__ChangeSet, id),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__change_set__field_indices_by_name[] = {
-    0,   /* field[0] = id */
-};
-static const ProtobufCIntRange osmpbf__change_set__number_ranges[1 + 1] = {
-    { 1, 0 },
-    { 0, 1 }
-};
-const ProtobufCMessageDescriptor osmpbf__change_set__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.ChangeSet",
-    "ChangeSet",
-    "OSMPBF__ChangeSet",
-    "OSMPBF",
-    sizeof(OSMPBF__ChangeSet),
-    1,
-    osmpbf__change_set__field_descriptors,
-    osmpbf__change_set__field_indices_by_name,
-    1,  osmpbf__change_set__number_ranges,
-    (ProtobufCMessageInit) osmpbf__change_set__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__node__field_descriptors[6] = {
-    {
-        "id",
-        1,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_SINT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, id),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "keys",
-        2,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_UINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, n_keys),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, keys),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "vals",
-        3,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_UINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, n_vals),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, vals),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "info",
-        4,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_MESSAGE,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, info),
-        &osmpbf__info__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "lat",
-        8,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_SINT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, lat),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "lon",
-        9,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_SINT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Node, lon),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__node__field_indices_by_name[] = {
-    0,   /* field[0] = id */
-    3,   /* field[3] = info */
-    1,   /* field[1] = keys */
-    4,   /* field[4] = lat */
-    5,   /* field[5] = lon */
-    2,   /* field[2] = vals */
-};
-static const ProtobufCIntRange osmpbf__node__number_ranges[2 + 1] = {
-    { 1, 0 },
-    { 8, 4 },
-    { 0, 6 }
-};
-const ProtobufCMessageDescriptor osmpbf__node__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.Node",
-    "Node",
-    "OSMPBF__Node",
-    "OSMPBF",
-    sizeof(OSMPBF__Node),
-    6,
-    osmpbf__node__field_descriptors,
-    osmpbf__node__field_indices_by_name,
-    2,  osmpbf__node__number_ranges,
-    (ProtobufCMessageInit) osmpbf__node__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__dense_nodes__field_descriptors[5] = {
-    {
-        "id",
-        1,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, n_id),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, id),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "denseinfo",
-        5,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_MESSAGE,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, denseinfo),
-        &osmpbf__dense_info__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "lat",
-        8,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, n_lat),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, lat),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "lon",
-        9,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, n_lon),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, lon),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "keys_vals",
-        10,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, n_keys_vals),
-        PROTOBUF_C_OFFSETOF(OSMPBF__DenseNodes, keys_vals),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__dense_nodes__field_indices_by_name[] = {
-    1,   /* field[1] = denseinfo */
-    0,   /* field[0] = id */
-    4,   /* field[4] = keys_vals */
-    2,   /* field[2] = lat */
-    3,   /* field[3] = lon */
-};
-static const ProtobufCIntRange osmpbf__dense_nodes__number_ranges[3 + 1] = {
-    { 1, 0 },
-    { 5, 1 },
-    { 8, 2 },
-    { 0, 5 }
-};
-const ProtobufCMessageDescriptor osmpbf__dense_nodes__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.DenseNodes",
-    "DenseNodes",
-    "OSMPBF__DenseNodes",
-    "OSMPBF",
-    sizeof(OSMPBF__DenseNodes),
-    5,
-    osmpbf__dense_nodes__field_descriptors,
-    osmpbf__dense_nodes__field_indices_by_name,
-    3,  osmpbf__dense_nodes__number_ranges,
-    (ProtobufCMessageInit) osmpbf__dense_nodes__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor osmpbf__way__field_descriptors[5] = {
-    {
-        "id",
-        1,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_INT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, id),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "keys",
-        2,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_UINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, n_keys),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, keys),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "vals",
-        3,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_UINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, n_vals),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, vals),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "info",
-        4,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_MESSAGE,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, info),
-        &osmpbf__info__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "refs",
-        8,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, n_refs),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Way, refs),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__way__field_indices_by_name[] = {
-    0,   /* field[0] = id */
-    3,   /* field[3] = info */
-    1,   /* field[1] = keys */
-    4,   /* field[4] = refs */
-    2,   /* field[2] = vals */
-};
-static const ProtobufCIntRange osmpbf__way__number_ranges[2 + 1] = {
-    { 1, 0 },
-    { 8, 4 },
-    { 0, 5 }
-};
-const ProtobufCMessageDescriptor osmpbf__way__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.Way",
-    "Way",
-    "OSMPBF__Way",
-    "OSMPBF",
-    sizeof(OSMPBF__Way),
-    5,
-    osmpbf__way__field_descriptors,
-    osmpbf__way__field_indices_by_name,
-    2,  osmpbf__way__number_ranges,
-    (ProtobufCMessageInit) osmpbf__way__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
-const ProtobufCEnumValue osmpbf__relation__member_type__enum_values_by_number[3] = {
-    { "NODE", "OSMPBF__RELATION__MEMBER_TYPE__NODE", 0 },
-    { "WAY", "OSMPBF__RELATION__MEMBER_TYPE__WAY", 1 },
-    { "RELATION", "OSMPBF__RELATION__MEMBER_TYPE__RELATION", 2 },
-};
-static const ProtobufCIntRange osmpbf__relation__member_type__value_ranges[] = {
-    {0, 0},{0, 3}
-};
-const ProtobufCEnumValueIndex osmpbf__relation__member_type__enum_values_by_name[3] = {
-    { "NODE", 0 },
-    { "RELATION", 2 },
-    { "WAY", 1 },
-};
-const ProtobufCEnumDescriptor osmpbf__relation__member_type__descriptor = {
-    PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
-    "OSMPBF.Relation.MemberType",
-    "MemberType",
-    "OSMPBF__Relation__MemberType",
-    "OSMPBF",
-    3,
-    osmpbf__relation__member_type__enum_values_by_number,
-    3,
-    osmpbf__relation__member_type__enum_values_by_name,
-    1,
-    osmpbf__relation__member_type__value_ranges,
-    NULL,NULL,NULL,NULL   /* reserved[1234] */
-};
-static const ProtobufCFieldDescriptor osmpbf__relation__field_descriptors[7] = {
-    {
-        "id",
-        1,
-        PROTOBUF_C_LABEL_REQUIRED,
-        PROTOBUF_C_TYPE_INT64,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, id),
-        NULL,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "keys",
-        2,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_UINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, n_keys),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, keys),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "vals",
-        3,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_UINT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, n_vals),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, vals),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "info",
-        4,
-        PROTOBUF_C_LABEL_OPTIONAL,
-        PROTOBUF_C_TYPE_MESSAGE,
-        0,   /* quantifier_offset */
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, info),
-        &osmpbf__info__descriptor,
-        NULL,
-        0,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "roles_sid",
-        8,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_INT32,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, n_roles_sid),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, roles_sid),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "memids",
-        9,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_SINT64,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, n_memids),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, memids),
-        NULL,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-    {
-        "types",
-        10,
-        PROTOBUF_C_LABEL_REPEATED,
-        PROTOBUF_C_TYPE_ENUM,
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, n_types),
-        PROTOBUF_C_OFFSETOF(OSMPBF__Relation, types),
-        &osmpbf__relation__member_type__descriptor,
-        NULL,
-        1,            /* packed */
-        0,NULL,NULL    /* reserved1,reserved2, etc */
-    },
-};
-static const unsigned osmpbf__relation__field_indices_by_name[] = {
-    0,   /* field[0] = id */
-    3,   /* field[3] = info */
-    1,   /* field[1] = keys */
-    5,   /* field[5] = memids */
-    4,   /* field[4] = roles_sid */
-    6,   /* field[6] = types */
-    2,   /* field[2] = vals */
-};
-static const ProtobufCIntRange osmpbf__relation__number_ranges[2 + 1] = {
-    { 1, 0 },
-    { 8, 4 },
-    { 0, 7 }
-};
-const ProtobufCMessageDescriptor osmpbf__relation__descriptor = {
-    PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-    "OSMPBF.Relation",
-    "Relation",
-    "OSMPBF__Relation",
-    "OSMPBF",
-    sizeof(OSMPBF__Relation),
-    7,
-    osmpbf__relation__field_descriptors,
-    osmpbf__relation__field_indices_by_name,
-    2,  osmpbf__relation__number_ranges,
-    (ProtobufCMessageInit) osmpbf__relation__init,
-    NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/navit/maptool/generated-code/osmformat.pb-c.h b/navit/maptool/generated-code/osmformat.pb-c.h
deleted file mode 100644
index 32ac75767..000000000
--- a/navit/maptool/generated-code/osmformat.pb-c.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-
-#ifndef PROTOBUF_C_osmformat_2eproto__INCLUDED
-#define PROTOBUF_C_osmformat_2eproto__INCLUDED
-
-#include <google/protobuf-c/protobuf-c.h>
-
-PROTOBUF_C_BEGIN_DECLS
-
-
-typedef struct _OSMPBF__HeaderBlock OSMPBF__HeaderBlock;
-typedef struct _OSMPBF__HeaderBBox OSMPBF__HeaderBBox;
-typedef struct _OSMPBF__PrimitiveBlock OSMPBF__PrimitiveBlock;
-typedef struct _OSMPBF__PrimitiveGroup OSMPBF__PrimitiveGroup;
-typedef struct _OSMPBF__StringTable OSMPBF__StringTable;
-typedef struct _OSMPBF__Info OSMPBF__Info;
-typedef struct _OSMPBF__DenseInfo OSMPBF__DenseInfo;
-typedef struct _OSMPBF__ChangeSet OSMPBF__ChangeSet;
-typedef struct _OSMPBF__Node OSMPBF__Node;
-typedef struct _OSMPBF__DenseNodes OSMPBF__DenseNodes;
-typedef struct _OSMPBF__Way OSMPBF__Way;
-typedef struct _OSMPBF__Relation OSMPBF__Relation;
-
-
-/* --- enums --- */
-
-typedef enum _OSMPBF__Relation__MemberType {
-  OSMPBF__RELATION__MEMBER_TYPE__NODE = 0,
-  OSMPBF__RELATION__MEMBER_TYPE__WAY = 1,
-  OSMPBF__RELATION__MEMBER_TYPE__RELATION = 2
-} OSMPBF__Relation__MemberType;
-
-/* --- messages --- */
-
-struct  _OSMPBF__HeaderBlock
-{
-  ProtobufCMessage base;
-  OSMPBF__HeaderBBox *bbox;
-  size_t n_required_features;
-  char **required_features;
-  size_t n_optional_features;
-  char **optional_features;
-  char *writingprogram;
-  char *source;
-};
-#define OSMPBF__HEADER_BLOCK__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__header_block__descriptor) \
-    , NULL, 0,NULL, 0,NULL, NULL, NULL }
-
-
-struct  _OSMPBF__HeaderBBox
-{
-  ProtobufCMessage base;
-  int64_t left;
-  int64_t right;
-  int64_t top;
-  int64_t bottom;
-};
-#define OSMPBF__HEADER_BBOX__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__header_bbox__descriptor) \
-    , 0, 0, 0, 0 }
-
-
-struct  _OSMPBF__PrimitiveBlock
-{
-  ProtobufCMessage base;
-  OSMPBF__StringTable *stringtable;
-  size_t n_primitivegroup;
-  OSMPBF__PrimitiveGroup **primitivegroup;
-  protobuf_c_boolean has_granularity;
-  int32_t granularity;
-  protobuf_c_boolean has_lat_offset;
-  int64_t lat_offset;
-  protobuf_c_boolean has_lon_offset;
-  int64_t lon_offset;
-  protobuf_c_boolean has_date_granularity;
-  int32_t date_granularity;
-};
-#define OSMPBF__PRIMITIVE_BLOCK__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__primitive_block__descriptor) \
-    , NULL, 0,NULL, 0,100, 0,0, 0,0, 0,1000 }
-
-
-struct  _OSMPBF__PrimitiveGroup
-{
-  ProtobufCMessage base;
-  size_t n_nodes;
-  OSMPBF__Node **nodes;
-  OSMPBF__DenseNodes *dense;
-  size_t n_ways;
-  OSMPBF__Way **ways;
-  size_t n_relations;
-  OSMPBF__Relation **relations;
-  size_t n_changesets;
-  OSMPBF__ChangeSet **changesets;
-};
-#define OSMPBF__PRIMITIVE_GROUP__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__primitive_group__descriptor) \
-    , 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL }
-
-
-struct  _OSMPBF__StringTable
-{
-  ProtobufCMessage base;
-  size_t n_s;
-  ProtobufCBinaryData *s;
-};
-#define OSMPBF__STRING_TABLE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__string_table__descriptor) \
-    , 0,NULL }
-
-
-struct  _OSMPBF__Info
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_version;
-  int32_t version;
-  protobuf_c_boolean has_timestamp;
-  int64_t timestamp;
-  protobuf_c_boolean has_changeset;
-  int64_t changeset;
-  protobuf_c_boolean has_uid;
-  int32_t uid;
-  protobuf_c_boolean has_user_sid;
-  uint32_t user_sid;
-};
-#define OSMPBF__INFO__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__info__descriptor) \
-    , 0,-1, 0,0, 0,0, 0,0, 0,0 }
-
-
-struct  _OSMPBF__DenseInfo
-{
-  ProtobufCMessage base;
-  size_t n_version;
-  int32_t *version;
-  size_t n_timestamp;
-  int64_t *timestamp;
-  size_t n_changeset;
-  int64_t *changeset;
-  size_t n_uid;
-  int32_t *uid;
-  size_t n_user_sid;
-  int32_t *user_sid;
-};
-#define OSMPBF__DENSE_INFO__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__dense_info__descriptor) \
-    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
-
-
-struct  _OSMPBF__ChangeSet
-{
-  ProtobufCMessage base;
-  int64_t id;
-};
-#define OSMPBF__CHANGE_SET__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__change_set__descriptor) \
-    , 0 }
-
-
-struct  _OSMPBF__Node
-{
-  ProtobufCMessage base;
-  int64_t id;
-  size_t n_keys;
-  uint32_t *keys;
-  size_t n_vals;
-  uint32_t *vals;
-  OSMPBF__Info *info;
-  int64_t lat;
-  int64_t lon;
-};
-#define OSMPBF__NODE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__node__descriptor) \
-    , 0, 0,NULL, 0,NULL, NULL, 0, 0 }
-
-
-struct  _OSMPBF__DenseNodes
-{
-  ProtobufCMessage base;
-  size_t n_id;
-  int64_t *id;
-  OSMPBF__DenseInfo *denseinfo;
-  size_t n_lat;
-  int64_t *lat;
-  size_t n_lon;
-  int64_t *lon;
-  size_t n_keys_vals;
-  int32_t *keys_vals;
-};
-#define OSMPBF__DENSE_NODES__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__dense_nodes__descriptor) \
-    , 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL }
-
-
-struct  _OSMPBF__Way
-{
-  ProtobufCMessage base;
-  int64_t id;
-  size_t n_keys;
-  uint32_t *keys;
-  size_t n_vals;
-  uint32_t *vals;
-  OSMPBF__Info *info;
-  size_t n_refs;
-  int64_t *refs;
-};
-#define OSMPBF__WAY__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__way__descriptor) \
-    , 0, 0,NULL, 0,NULL, NULL, 0,NULL }
-
-
-struct  _OSMPBF__Relation
-{
-  ProtobufCMessage base;
-  int64_t id;
-  size_t n_keys;
-  uint32_t *keys;
-  size_t n_vals;
-  uint32_t *vals;
-  OSMPBF__Info *info;
-  size_t n_roles_sid;
-  int32_t *roles_sid;
-  size_t n_memids;
-  int64_t *memids;
-  size_t n_types;
-  OSMPBF__Relation__MemberType *types;
-};
-#define OSMPBF__RELATION__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&osmpbf__relation__descriptor) \
-    , 0, 0,NULL, 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL }
-
-
-/* OSMPBF__HeaderBlock methods */
-void   osmpbf__header_block__init
-                     (OSMPBF__HeaderBlock         *message);
-size_t osmpbf__header_block__get_packed_size
-                     (const OSMPBF__HeaderBlock   *message);
-size_t osmpbf__header_block__pack
-                     (const OSMPBF__HeaderBlock   *message,
-                      uint8_t             *out);
-size_t osmpbf__header_block__pack_to_buffer
-                     (const OSMPBF__HeaderBlock   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__HeaderBlock *
-       osmpbf__header_block__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__header_block__free_unpacked
-                     (OSMPBF__HeaderBlock *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__HeaderBBox methods */
-void   osmpbf__header_bbox__init
-                     (OSMPBF__HeaderBBox         *message);
-size_t osmpbf__header_bbox__get_packed_size
-                     (const OSMPBF__HeaderBBox   *message);
-size_t osmpbf__header_bbox__pack
-                     (const OSMPBF__HeaderBBox   *message,
-                      uint8_t             *out);
-size_t osmpbf__header_bbox__pack_to_buffer
-                     (const OSMPBF__HeaderBBox   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__HeaderBBox *
-       osmpbf__header_bbox__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__header_bbox__free_unpacked
-                     (OSMPBF__HeaderBBox *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__PrimitiveBlock methods */
-void   osmpbf__primitive_block__init
-                     (OSMPBF__PrimitiveBlock         *message);
-size_t osmpbf__primitive_block__get_packed_size
-                     (const OSMPBF__PrimitiveBlock   *message);
-size_t osmpbf__primitive_block__pack
-                     (const OSMPBF__PrimitiveBlock   *message,
-                      uint8_t             *out);
-size_t osmpbf__primitive_block__pack_to_buffer
-                     (const OSMPBF__PrimitiveBlock   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__PrimitiveBlock *
-       osmpbf__primitive_block__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__primitive_block__free_unpacked
-                     (OSMPBF__PrimitiveBlock *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__PrimitiveGroup methods */
-void   osmpbf__primitive_group__init
-                     (OSMPBF__PrimitiveGroup         *message);
-size_t osmpbf__primitive_group__get_packed_size
-                     (const OSMPBF__PrimitiveGroup   *message);
-size_t osmpbf__primitive_group__pack
-                     (const OSMPBF__PrimitiveGroup   *message,
-                      uint8_t             *out);
-size_t osmpbf__primitive_group__pack_to_buffer
-                     (const OSMPBF__PrimitiveGroup   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__PrimitiveGroup *
-       osmpbf__primitive_group__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__primitive_group__free_unpacked
-                     (OSMPBF__PrimitiveGroup *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__StringTable methods */
-void   osmpbf__string_table__init
-                     (OSMPBF__StringTable         *message);
-size_t osmpbf__string_table__get_packed_size
-                     (const OSMPBF__StringTable   *message);
-size_t osmpbf__string_table__pack
-                     (const OSMPBF__StringTable   *message,
-                      uint8_t             *out);
-size_t osmpbf__string_table__pack_to_buffer
-                     (const OSMPBF__StringTable   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__StringTable *
-       osmpbf__string_table__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__string_table__free_unpacked
-                     (OSMPBF__StringTable *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__Info methods */
-void   osmpbf__info__init
-                     (OSMPBF__Info         *message);
-size_t osmpbf__info__get_packed_size
-                     (const OSMPBF__Info   *message);
-size_t osmpbf__info__pack
-                     (const OSMPBF__Info   *message,
-                      uint8_t             *out);
-size_t osmpbf__info__pack_to_buffer
-                     (const OSMPBF__Info   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__Info *
-       osmpbf__info__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__info__free_unpacked
-                     (OSMPBF__Info *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__DenseInfo methods */
-void   osmpbf__dense_info__init
-                     (OSMPBF__DenseInfo         *message);
-size_t osmpbf__dense_info__get_packed_size
-                     (const OSMPBF__DenseInfo   *message);
-size_t osmpbf__dense_info__pack
-                     (const OSMPBF__DenseInfo   *message,
-                      uint8_t             *out);
-size_t osmpbf__dense_info__pack_to_buffer
-                     (const OSMPBF__DenseInfo   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__DenseInfo *
-       osmpbf__dense_info__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__dense_info__free_unpacked
-                     (OSMPBF__DenseInfo *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__ChangeSet methods */
-void   osmpbf__change_set__init
-                     (OSMPBF__ChangeSet         *message);
-size_t osmpbf__change_set__get_packed_size
-                     (const OSMPBF__ChangeSet   *message);
-size_t osmpbf__change_set__pack
-                     (const OSMPBF__ChangeSet   *message,
-                      uint8_t             *out);
-size_t osmpbf__change_set__pack_to_buffer
-                     (const OSMPBF__ChangeSet   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__ChangeSet *
-       osmpbf__change_set__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__change_set__free_unpacked
-                     (OSMPBF__ChangeSet *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__Node methods */
-void   osmpbf__node__init
-                     (OSMPBF__Node         *message);
-size_t osmpbf__node__get_packed_size
-                     (const OSMPBF__Node   *message);
-size_t osmpbf__node__pack
-                     (const OSMPBF__Node   *message,
-                      uint8_t             *out);
-size_t osmpbf__node__pack_to_buffer
-                     (const OSMPBF__Node   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__Node *
-       osmpbf__node__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__node__free_unpacked
-                     (OSMPBF__Node *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__DenseNodes methods */
-void   osmpbf__dense_nodes__init
-                     (OSMPBF__DenseNodes         *message);
-size_t osmpbf__dense_nodes__get_packed_size
-                     (const OSMPBF__DenseNodes   *message);
-size_t osmpbf__dense_nodes__pack
-                     (const OSMPBF__DenseNodes   *message,
-                      uint8_t             *out);
-size_t osmpbf__dense_nodes__pack_to_buffer
-                     (const OSMPBF__DenseNodes   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__DenseNodes *
-       osmpbf__dense_nodes__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__dense_nodes__free_unpacked
-                     (OSMPBF__DenseNodes *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__Way methods */
-void   osmpbf__way__init
-                     (OSMPBF__Way         *message);
-size_t osmpbf__way__get_packed_size
-                     (const OSMPBF__Way   *message);
-size_t osmpbf__way__pack
-                     (const OSMPBF__Way   *message,
-                      uint8_t             *out);
-size_t osmpbf__way__pack_to_buffer
-                     (const OSMPBF__Way   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__Way *
-       osmpbf__way__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__way__free_unpacked
-                     (OSMPBF__Way *message,
-                      ProtobufCAllocator *allocator);
-/* OSMPBF__Relation methods */
-void   osmpbf__relation__init
-                     (OSMPBF__Relation         *message);
-size_t osmpbf__relation__get_packed_size
-                     (const OSMPBF__Relation   *message);
-size_t osmpbf__relation__pack
-                     (const OSMPBF__Relation   *message,
-                      uint8_t             *out);
-size_t osmpbf__relation__pack_to_buffer
-                     (const OSMPBF__Relation   *message,
-                      ProtobufCBuffer     *buffer);
-OSMPBF__Relation *
-       osmpbf__relation__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   osmpbf__relation__free_unpacked
-                     (OSMPBF__Relation *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*OSMPBF__HeaderBlock_Closure)
-                 (const OSMPBF__HeaderBlock *message,
-                  void *closure_data);
-typedef void (*OSMPBF__HeaderBBox_Closure)
-                 (const OSMPBF__HeaderBBox *message,
-                  void *closure_data);
-typedef void (*OSMPBF__PrimitiveBlock_Closure)
-                 (const OSMPBF__PrimitiveBlock *message,
-                  void *closure_data);
-typedef void (*OSMPBF__PrimitiveGroup_Closure)
-                 (const OSMPBF__PrimitiveGroup *message,
-                  void *closure_data);
-typedef void (*OSMPBF__StringTable_Closure)
-                 (const OSMPBF__StringTable *message,
-                  void *closure_data);
-typedef void (*OSMPBF__Info_Closure)
-                 (const OSMPBF__Info *message,
-                  void *closure_data);
-typedef void (*OSMPBF__DenseInfo_Closure)
-                 (const OSMPBF__DenseInfo *message,
-                  void *closure_data);
-typedef void (*OSMPBF__ChangeSet_Closure)
-                 (const OSMPBF__ChangeSet *message,
-                  void *closure_data);
-typedef void (*OSMPBF__Node_Closure)
-                 (const OSMPBF__Node *message,
-                  void *closure_data);
-typedef void (*OSMPBF__DenseNodes_Closure)
-                 (const OSMPBF__DenseNodes *message,
-                  void *closure_data);
-typedef void (*OSMPBF__Way_Closure)
-                 (const OSMPBF__Way *message,
-                  void *closure_data);
-typedef void (*OSMPBF__Relation_Closure)
-                 (const OSMPBF__Relation *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor osmpbf__header_block__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__header_bbox__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__primitive_block__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__primitive_group__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__string_table__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__info__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__dense_info__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__change_set__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__node__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__dense_nodes__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__way__descriptor;
-extern const ProtobufCMessageDescriptor osmpbf__relation__descriptor;
-extern const ProtobufCEnumDescriptor    osmpbf__relation__member_type__descriptor;
-
-PROTOBUF_C_END_DECLS
-
-
-#endif  /* PROTOBUF_osmformat_2eproto__INCLUDED */
diff --git a/navit/maptool/google/protobuf-c/protobuf-c-private.h b/navit/maptool/google/protobuf-c/protobuf-c-private.h
deleted file mode 100644
index 53a33b51b..000000000
--- a/navit/maptool/google/protobuf-c/protobuf-c-private.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* --- protobuf-c-private.h: private structures and functions --- */
-/*
- * Copyright 2008, Dave Benson.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with
- * the License. You may obtain a copy of the License
- * at http://www.apache.org/licenses/LICENSE-2.0 Unless
- * required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-/* === needs to be declared for the PROTOBUF_C_BUFFER_SIMPLE_INIT macro === */
-
-void protobuf_c_buffer_simple_append (ProtobufCBuffer *buffer,
-                                      size_t           len,
-                                      const unsigned char *data);
-
-/* === stuff which needs to be declared for use in the generated code === */
-
-struct _ProtobufCEnumValueIndex
-{
-  const char *name;
-  unsigned index;               /* into values[] array */
-};
-
-/* IntRange: helper structure for optimizing
-     int => index lookups
-   in the case where the keys are mostly consecutive values,
-   as they presumably are for enums and fields.
-
-   The data structures assumes that the values in the original
-   array are sorted */
-struct _ProtobufCIntRange
-{
-  int start_value;
-  unsigned orig_index;
-  /* NOTE: the number of values in the range can
-     be inferred by looking at the next element's orig_index.
-     a dummy element is added to make this simple */
-};
-
-
-/* === declared for exposition on ProtobufCIntRange === */
-/* note: ranges must have an extra sentinel IntRange at the end whose
-   orig_index is set to the number of actual values in the original array */
-/* returns -1 if no orig_index found */
-int protobuf_c_int_ranges_lookup (unsigned n_ranges,
-                                  ProtobufCIntRange *ranges);
-
-#define PROTOBUF_C_SERVICE_DESCRIPTOR_MAGIC  0x14159bc3
-#define PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC  0x28aaeef9
-#define PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC     0x114315af
-
-/* === behind the scenes on the generated service's __init functions */
-typedef void (*ProtobufCServiceDestroy) (ProtobufCService *service);
-void
-protobuf_c_service_generated_init (ProtobufCService *service,
-                                   const ProtobufCServiceDescriptor *descriptor,
-                                   ProtobufCServiceDestroy destroy);
-
-void
-protobuf_c_service_invoke_internal(ProtobufCService *service,
-                                  unsigned          method_index,
-                                  const ProtobufCMessage *input,
-                                  ProtobufCClosure  closure,
-                                  void             *closure_data);
diff --git a/navit/maptool/google/protobuf-c/protobuf-c.c b/navit/maptool/google/protobuf-c/protobuf-c.c
deleted file mode 100644
index a7a8516f2..000000000
--- a/navit/maptool/google/protobuf-c/protobuf-c.c
+++ /dev/null
@@ -1,2283 +0,0 @@
-/* --- protobuf-c.c: public protobuf c runtime implementation --- */
-
-/*
- * Copyright 2008, Dave Benson.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with
- * the License. You may obtain a copy of the License
- * at http://www.apache.org/licenses/LICENSE-2.0 Unless
- * required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* TODO items:
-
-     * 64-BIT OPTIMIZATION: certain implementations use 32-bit math even on 64-bit platforms
-        (uint64_size, uint64_pack, parse_uint64)
-
-     * get_packed_size and pack seem to use type-prefixed names,
-       whereas parse uses type-suffixed names.  pick one and stick with it.
-       Decision:  go with type-suffixed, since the type (or its instance)
-       is typically the object of the verb.
-       NOTE: perhaps the "parse" methods should be reanemd to "unpack"
-       at the same time. (this only affects internal (static) functions)
-
-     * use TRUE and FALSE instead of 1 and 0 as appropriate
-
-     * use size_t consistently
- */
-
-#include <stdio.h>                      /* for occasional printf()s */
-#include <stdlib.h>                     /* for abort(), malloc() etc */
-#include <string.h>                     /* for strlen(), memcpy(), memmove() */
-
-#ifndef PRINT_UNPACK_ERRORS
-#define PRINT_UNPACK_ERRORS              1
-#endif
-
-#include "protobuf-c.h"
-
-#define MAX_UINT64_ENCODED_SIZE 10
-
-/* convenience macros */
-#define TMPALLOC(allocator, size) ((allocator)->tmp_alloc ((allocator)->allocator_data, (size)))
-#define FREE(allocator, ptr)   \
-   do { if ((ptr) != NULL) ((allocator)->free ((allocator)->allocator_data, (ptr))); } while(0)
-#define UNALIGNED_ALLOC(allocator, size) ALLOC (allocator, size) /* placeholder */
-#define STRUCT_MEMBER_P(struct_p, struct_offset)   \
-    ((void *) ((uint8_t*) (struct_p) + (struct_offset)))
-#define STRUCT_MEMBER(member_type, struct_p, struct_offset)   \
-    (*(member_type*) STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-#define STRUCT_MEMBER_PTR(member_type, struct_p, struct_offset)   \
-    ((member_type*) STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-#define TRUE 1
-#define FALSE 0
-
-static void alloc_failed_warning (unsigned size, const char *filename, unsigned line) {
-    fprintf (stderr,
-             "WARNING: out-of-memory allocating a block of size %u (%s:%u)\n",
-             size, filename, line);
-}
-
-/* Try to allocate memory, running some special code if it fails. */
-#define DO_ALLOC(dst, allocator, size, fail_code)                           \
-{ size_t da__allocation_size = (size);                                      \
-  if (da__allocation_size == 0)                                             \
-    dst = NULL;                                                             \
-  else if ((dst=((allocator)->alloc ((allocator)->allocator_data,           \
-                                     da__allocation_size))) == NULL)        \
-    {                                                                       \
-      alloc_failed_warning (da__allocation_size, __FILE__, __LINE__);       \
-      fail_code;                                                            \
-    }                                                                       \
-}
-#define DO_UNALIGNED_ALLOC  DO_ALLOC            /* placeholder */
-
-
-
-#define ASSERT_IS_ENUM_DESCRIPTOR(desc) \
-  assert((desc)->magic == PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC)
-#define ASSERT_IS_MESSAGE_DESCRIPTOR(desc) \
-  assert((desc)->magic == PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC)
-#define ASSERT_IS_MESSAGE(message) \
-  ASSERT_IS_MESSAGE_DESCRIPTOR((message)->descriptor)
-#define ASSERT_IS_SERVICE_DESCRIPTOR(desc) \
-  assert((desc)->magic == PROTOBUF_C_SERVICE_DESCRIPTOR_MAGIC)
-
-/* --- allocator --- */
-
-static void protobuf_c_out_of_memory_default (void) {
-    fprintf (stderr, "Out Of Memory!!!\n");
-    abort ();
-}
-void (*protobuf_c_out_of_memory) (void) = protobuf_c_out_of_memory_default;
-
-static void *system_alloc(void *allocator_data, size_t size) {
-    void *rv;
-    (void) allocator_data;
-    if (size == 0)
-        return NULL;
-    rv = g_malloc (size);
-    if (rv == NULL)
-        protobuf_c_out_of_memory ();
-    return rv;
-}
-
-static void system_free (void *allocator_data, void *data) {
-    (void) allocator_data;
-    g_free (data);
-}
-
-/* Some users may configure the default allocator;
-   providing your own allocator to unpack() is prefered.
-   this allocator is still used for packing nested messages. */
-ProtobufCAllocator protobuf_c_default_allocator = {
-    system_alloc,
-    system_free,
-    NULL,
-    8192,
-    NULL
-};
-
-/* Users should NOT modify this structure,
-   but it's difficult to prevent.
-
-   please modify protobuf_c_default_allocator instead. */
-ProtobufCAllocator protobuf_c_system_allocator = {
-    system_alloc,
-    system_free,
-    NULL,
-    8192,
-    NULL
-};
-
-/* === buffer-simple === */
-void protobuf_c_buffer_simple_append (ProtobufCBuffer *buffer,
-                                      size_t           len,
-                                      const uint8_t   *data) {
-    ProtobufCBufferSimple *simp = (ProtobufCBufferSimple *) buffer;
-    size_t new_len = simp->len + len;
-    if (new_len > simp->alloced) {
-        size_t new_alloced = simp->alloced * 2;
-        uint8_t *new_data;
-        while (new_alloced < new_len)
-            new_alloced += new_alloced;
-        DO_ALLOC (new_data, &protobuf_c_default_allocator, new_alloced, return);
-        memcpy (new_data, simp->data, simp->len);
-        if (simp->must_free_data)
-            FREE (&protobuf_c_default_allocator, simp->data);
-        else
-            simp->must_free_data = 1;
-        simp->data = new_data;
-        simp->alloced = new_alloced;
-    }
-    memcpy (simp->data + simp->len, data, len);
-    simp->len = new_len;
-}
-
-/* === get_packed_size() === */
-
-/* Return the number of bytes required to store the
-   tag for the field (which includes 3 bits for
-   the wire-type, and a single bit that denotes the end-of-tag. */
-static inline size_t get_tag_size (unsigned number) {
-    if (number < (1<<4))
-        return 1;
-    else if (number < (1<<11))
-        return 2;
-    else if (number < (1<<18))
-        return 3;
-    else if (number < (1<<25))
-        return 4;
-    else
-        return 5;
-}
-
-/* Return the number of bytes required to store
-   a variable-length unsigned integer that fits in 32-bit uint
-   in base-128 encoding. */
-static inline size_t uint32_size (uint32_t v) {
-    if (v < (1<<7))
-        return 1;
-    else if (v < (1<<14))
-        return 2;
-    else if (v < (1<<21))
-        return 3;
-    else if (v < (1<<28))
-        return 4;
-    else
-        return 5;
-}
-/* Return the number of bytes required to store
-   a variable-length signed integer that fits in 32-bit int
-   in base-128 encoding. */
-static inline size_t int32_size (int32_t v) {
-    if (v < 0)
-        return 10;
-    else if (v < (1<<7))
-        return 1;
-    else if (v < (1<<14))
-        return 2;
-    else if (v < (1<<21))
-        return 3;
-    else if (v < (1<<28))
-        return 4;
-    else
-        return 5;
-}
-/* return the zigzag-encoded 32-bit unsigned int from a 32-bit signed int */
-static inline uint32_t zigzag32 (int32_t v) {
-    if (v < 0)
-        return ((uint32_t)(-v)) * 2 - 1;
-    else
-        return v * 2;
-}
-/* Return the number of bytes required to store
-   a variable-length signed integer that fits in 32-bit int,
-   converted to unsigned via the zig-zag algorithm,
-   then packed using base-128 encoding. */
-static inline size_t sint32_size (int32_t v) {
-    return uint32_size(zigzag32(v));
-}
-
-/* Return the number of bytes required to store
-   a variable-length unsigned integer that fits in 64-bit uint
-   in base-128 encoding. */
-static inline size_t uint64_size (uint64_t v) {
-    uint32_t upper_v = (v>>32);
-    if (upper_v == 0)
-        return uint32_size ((uint32_t)v);
-    else if (upper_v < (1<<3))
-        return 5;
-    else if (upper_v < (1<<10))
-        return 6;
-    else if (upper_v < (1<<17))
-        return 7;
-    else if (upper_v < (1<<24))
-        return 8;
-    else if (upper_v < (1U<<31))
-        return 9;
-    else
-        return 10;
-}
-
-/* return the zigzag-encoded 64-bit unsigned int from a 64-bit signed int */
-static inline uint64_t zigzag64 (int64_t v) {
-    if (v < 0)
-        return ((uint64_t)(-v)) * 2 - 1;
-    else
-        return v * 2;
-}
-
-/* Return the number of bytes required to store
-   a variable-length signed integer that fits in 64-bit int,
-   converted to unsigned via the zig-zag algorithm,
-   then packed using base-128 encoding. */
-static inline size_t sint64_size (int64_t v) {
-    return uint64_size(zigzag64(v));
-}
-
-/* Get serialized size of a single field in the message,
-   including the space needed by the identifying tag. */
-static size_t required_field_get_packed_size (const ProtobufCFieldDescriptor *field,
-        const void *member) {
-    size_t rv = get_tag_size (field->id);
-    switch (field->type) {
-    case PROTOBUF_C_TYPE_SINT32:
-        return rv + sint32_size (*(const int32_t *) member);
-    case PROTOBUF_C_TYPE_INT32:
-        return rv + int32_size (*(const uint32_t *) member);
-    case PROTOBUF_C_TYPE_UINT32:
-        return rv + uint32_size (*(const uint32_t *) member);
-    case PROTOBUF_C_TYPE_SINT64:
-        return rv + sint64_size (*(const int64_t *) member);
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        return rv + uint64_size (*(const uint64_t *) member);
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-        return rv + 4;
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-        return rv + 8;
-    case PROTOBUF_C_TYPE_BOOL:
-        return rv + 1;
-    case PROTOBUF_C_TYPE_FLOAT:
-        return rv + 4;
-    case PROTOBUF_C_TYPE_DOUBLE:
-        return rv + 8;
-    case PROTOBUF_C_TYPE_ENUM:
-        // TODO: is this correct for negative-valued enums?
-        return rv + uint32_size (*(const uint32_t *) member);
-    case PROTOBUF_C_TYPE_STRING: {
-        const char *str = *(char * const *) member;
-        size_t len = str ? strlen (str) : 0;
-        return rv + uint32_size (len) + len;
-    }
-    case PROTOBUF_C_TYPE_BYTES: {
-        size_t len = ((const ProtobufCBinaryData*) member)->len;
-        return rv + uint32_size (len) + len;
-    }
-    //case PROTOBUF_C_TYPE_GROUP:
-    case PROTOBUF_C_TYPE_MESSAGE: {
-        const ProtobufCMessage *msg = * (ProtobufCMessage * const *) member;
-        size_t subrv = msg ? protobuf_c_message_get_packed_size (msg) : 0;
-        return rv + uint32_size (subrv) + subrv;
-    }
-    }
-    PROTOBUF_C_ASSERT_NOT_REACHED ();
-    return 0;
-}
-
-/* Get serialized size of a single optional field in the message,
-   including the space needed by the identifying tag.
-   Returns 0 if the optional field isn't set. */
-static size_t optional_field_get_packed_size (const ProtobufCFieldDescriptor *field,
-        const protobuf_c_boolean *has,
-        const void *member) {
-    if (field->type == PROTOBUF_C_TYPE_MESSAGE
-            || field->type == PROTOBUF_C_TYPE_STRING) {
-        const void *ptr = * (const void * const *) member;
-        if (ptr == NULL
-                || ptr == field->default_value)
-            return 0;
-    } else {
-        if (!*has)
-            return 0;
-    }
-    return required_field_get_packed_size (field, member);
-}
-
-/* Get serialized size of a repeated field in the message,
-   which may consist of any number of values (including 0).
-   Includes the space needed by the identifying tags (as needed). */
-static size_t repeated_field_get_packed_size (const ProtobufCFieldDescriptor *field,
-        size_t count,
-        const void *member) {
-    size_t header_size;
-    size_t rv = 0;
-    unsigned i;
-    void *array = * (void * const *) member;
-    if (count == 0)
-        return 0;
-    header_size = get_tag_size (field->id);
-    if (!field->packed)
-        header_size *= count;
-    switch (field->type) {
-    case PROTOBUF_C_TYPE_SINT32:
-        for (i = 0; i < count; i++)
-            rv += sint32_size (((int32_t*)array)[i]);
-        break;
-    case PROTOBUF_C_TYPE_INT32:
-        for (i = 0; i < count; i++)
-            rv += int32_size (((uint32_t*)array)[i]);
-        break;
-    case PROTOBUF_C_TYPE_UINT32:
-    case PROTOBUF_C_TYPE_ENUM:
-        for (i = 0; i < count; i++)
-            rv += uint32_size (((uint32_t*)array)[i]);
-        break;
-    case PROTOBUF_C_TYPE_SINT64:
-        for (i = 0; i < count; i++)
-            rv += sint64_size (((int64_t*)array)[i]);
-        break;
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        for (i = 0; i < count; i++)
-            rv += uint64_size (((uint64_t*)array)[i]);
-        break;
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-        rv += 4 * count;
-        break;
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        rv += 8 * count;
-        break;
-    case PROTOBUF_C_TYPE_BOOL:
-        rv += count;
-        break;
-    case PROTOBUF_C_TYPE_STRING:
-        for (i = 0; i < count; i++) {
-            size_t len = strlen (((char**) array)[i]);
-            rv += uint32_size (len) + len;
-        }
-        break;
-
-    case PROTOBUF_C_TYPE_BYTES:
-        for (i = 0; i < count; i++) {
-            size_t len = ((ProtobufCBinaryData*) array)[i].len;
-            rv += uint32_size (len) + len;
-        }
-        break;
-    case PROTOBUF_C_TYPE_MESSAGE:
-        for (i = 0; i < count; i++) {
-            size_t len = protobuf_c_message_get_packed_size (((ProtobufCMessage **) array)[i]);
-            rv += uint32_size (len) + len;
-        }
-        break;
-        //case PROTOBUF_C_TYPE_GROUP:          // NOT SUPPORTED
-    }
-    if (field->packed)
-        header_size += uint32_size (rv);
-    return header_size + rv;
-}
-
-/* Get the packed size of a unknown field (meaning one that
-   is passed through mostly uninterpreted... this is done
-   for forward compatibilty with the addition of new fields). */
-static inline size_t unknown_field_get_packed_size (const ProtobufCMessageUnknownField *field) {
-    return get_tag_size (field->tag) + field->len;
-}
-
-/* Get the number of bytes that the message will occupy once serialized. */
-size_t protobuf_c_message_get_packed_size(const ProtobufCMessage *message) {
-    unsigned i;
-    size_t rv = 0;
-    ASSERT_IS_MESSAGE (message);
-    for (i = 0; i < message->descriptor->n_fields; i++) {
-        const ProtobufCFieldDescriptor *field = message->descriptor->fields + i;
-        const void *member = ((const char *) message) + field->offset;
-        const void *qmember = ((const char *) message) + field->quantifier_offset;
-
-        if (field->label == PROTOBUF_C_LABEL_REQUIRED)
-            rv += required_field_get_packed_size (field, member);
-        else if (field->label == PROTOBUF_C_LABEL_OPTIONAL)
-            rv += optional_field_get_packed_size (field, qmember, member);
-        else
-            rv += repeated_field_get_packed_size (field, * (const size_t *) qmember, member);
-    }
-    for (i = 0; i < message->n_unknown_fields; i++)
-        rv += unknown_field_get_packed_size (&message->unknown_fields[i]);
-    return rv;
-}
-/* === pack() === */
-/* Pack an unsigned 32-bit integer in base-128 encoding, and return the number of bytes needed:
-   this will be 5 or less. */
-static inline size_t uint32_pack (uint32_t value, uint8_t *out) {
-    unsigned rv = 0;
-    if (value >= 0x80) {
-        out[rv++] = value | 0x80;
-        value >>= 7;
-        if (value >= 0x80) {
-            out[rv++] = value | 0x80;
-            value >>= 7;
-            if (value >= 0x80) {
-                out[rv++] = value | 0x80;
-                value >>= 7;
-                if (value >= 0x80) {
-                    out[rv++] = value | 0x80;
-                    value >>= 7;
-                }
-            }
-        }
-    }
-    /* assert: value<128 */
-    out[rv++] = value;
-    return rv;
-}
-
-/* Pack a 32-bit signed integer, returning the number of bytes needed.
-   Negative numbers are packed as twos-complement 64-bit integers. */
-static inline size_t int32_pack (int32_t value, uint8_t *out) {
-    if (value < 0) {
-        out[0] = value | 0x80;
-        out[1] = (value>>7) | 0x80;
-        out[2] = (value>>14) | 0x80;
-        out[3] = (value>>21) | 0x80;
-        out[4] = (value>>28) | 0x80;
-        out[5] = out[6] = out[7] = out[8] = 0xff;
-        out[9] = 0x01;
-        return 10;
-    } else
-        return uint32_pack (value, out);
-}
-
-/* Pack a 32-bit integer in zigwag encoding. */
-static inline size_t sint32_pack (int32_t value, uint8_t *out) {
-    return uint32_pack (zigzag32 (value), out);
-}
-
-/* Pack a 64-bit unsigned integer that fits in a 64-bit uint,
-   using base-128 encoding. */
-static size_t uint64_pack (uint64_t value, uint8_t *out) {
-    uint32_t hi = value>>32;
-    uint32_t lo = value;
-    unsigned rv;
-    if (hi == 0)
-        return uint32_pack ((uint32_t)lo, out);
-    out[0] = (lo) | 0x80;
-    out[1] = (lo>>7) | 0x80;
-    out[2] = (lo>>14) | 0x80;
-    out[3] = (lo>>21) | 0x80;
-    if (hi < 8) {
-        out[4] = (hi<<4) | (lo>>28);
-        return 5;
-    } else {
-        out[4] = ((hi&7)<<4) | (lo>>28) | 0x80;
-        hi >>= 3;
-    }
-    rv = 5;
-    while (hi >= 128) {
-        out[rv++] = hi | 0x80;
-        hi >>= 7;
-    }
-    out[rv++] = hi;
-    return rv;
-}
-
-/* Pack a 64-bit signed integer in zigzan encoding,
-   return the size of the packed output.
-   (Max returned value is 10) */
-static inline size_t sint64_pack (int64_t value, uint8_t *out) {
-    return uint64_pack (zigzag64 (value), out);
-}
-
-/* Pack a 32-bit value, little-endian.
-   Used for fixed32, sfixed32, float) */
-static inline size_t fixed32_pack (uint32_t value, uint8_t *out) {
-#ifdef IS_LITTLE_ENDIAN
-    memcpy (out, &value, 4);
-#else
-    out[0] = value;
-    out[1] = value>>8;
-    out[2] = value>>16;
-    out[3] = value>>24;
-#endif
-    return 4;
-}
-
-/* Pack a 64-bit fixed-length value.
-   (Used for fixed64, sfixed64, double) */
-/* XXX: the big-endian impl is really only good for 32-bit machines,
-   a 64-bit version would be appreciated, plus a way
-   to decide to use 64-bit math where convenient. */
-static inline size_t fixed64_pack (uint64_t value, uint8_t *out) {
-#ifdef IS_LITTLE_ENDIAN
-    memcpy (out, &value, 8);
-#else
-    fixed32_pack (value, out);
-    fixed32_pack (value>>32, out+4);
-#endif
-    return 8;
-}
-
-
-/* Pack a boolean as 0 or 1, even though the protobuf_c_boolean
-   can really assume any integer value. */
-/* XXX: perhaps on some platforms "*out = !!value" would be
-   a better impl, b/c that is idiotmatic c++ in some stl impls. */
-static inline size_t boolean_pack (protobuf_c_boolean value, uint8_t *out) {
-    *out = value ? 1 : 0;
-    return 1;
-}
-
-/* Pack a length-prefixed string.
-   The input string is NUL-terminated.
-
-   The NULL pointer is treated as an empty string.
-   This isn't really necessary, but it allows people
-   to leave required strings blank.
-   (See Issue 13 in the bug tracker for a
-   little more explanation).
- */
-static inline size_t string_pack (const char * str, uint8_t *out) {
-    if (str == NULL) {
-        out[0] = 0;
-        return 1;
-    } else {
-        size_t len = strlen (str);
-        size_t rv = uint32_pack (len, out);
-        memcpy (out + rv, str, len);
-        return rv + len;
-    }
-}
-
-static inline size_t binary_data_pack (const ProtobufCBinaryData *bd, uint8_t *out) {
-    size_t len = bd->len;
-    size_t rv = uint32_pack (len, out);
-    memcpy (out + rv, bd->data, len);
-    return rv + len;
-}
-
-static inline size_t prefixed_message_pack (const ProtobufCMessage *message, uint8_t *out) {
-    if (message == NULL) {
-        out[0] = 0;
-        return 1;
-    } else {
-        size_t rv = protobuf_c_message_pack (message, out + 1);
-        uint32_t rv_packed_size = uint32_size (rv);
-        if (rv_packed_size != 1)
-            memmove (out + rv_packed_size, out + 1, rv);
-        return uint32_pack (rv, out) + rv;
-    }
-}
-
-/* wire-type will be added in required_field_pack() */
-/* XXX: just call uint64_pack on 64-bit platforms. */
-static size_t tag_pack (uint32_t id, uint8_t *out) {
-    if (id < (1<<(32-3)))
-        return uint32_pack (id<<3, out);
-    else
-        return uint64_pack (((uint64_t)id) << 3, out);
-}
-
-static size_t required_field_pack (const ProtobufCFieldDescriptor *field,
-                                   const void *member,
-                                   uint8_t *out) {
-    size_t rv = tag_pack (field->id, out);
-    switch (field->type) {
-    case PROTOBUF_C_TYPE_SINT32:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        return rv + sint32_pack (*(const int32_t *) member, out + rv);
-    case PROTOBUF_C_TYPE_INT32:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        return rv + int32_pack (*(const uint32_t *) member, out + rv);
-    case PROTOBUF_C_TYPE_UINT32:
-    case PROTOBUF_C_TYPE_ENUM:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        return rv + uint32_pack (*(const uint32_t *) member, out + rv);
-    case PROTOBUF_C_TYPE_SINT64:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        return rv + sint64_pack (*(const int64_t *) member, out + rv);
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        return rv + uint64_pack (*(const uint64_t *) member, out + rv);
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_32BIT;
-        return rv + fixed32_pack (*(const uint32_t *) member, out + rv);
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_64BIT;
-        return rv + fixed64_pack (*(const uint64_t *) member, out + rv);
-    case PROTOBUF_C_TYPE_BOOL:
-        out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        return rv + boolean_pack (*(const protobuf_c_boolean *) member, out + rv);
-    case PROTOBUF_C_TYPE_STRING: {
-        out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        return rv + string_pack (*(char * const *) member, out + rv);
-    }
-
-    case PROTOBUF_C_TYPE_BYTES: {
-        const ProtobufCBinaryData * bd = ((const ProtobufCBinaryData*) member);
-        out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        return rv + binary_data_pack (bd, out + rv);
-    }
-    //case PROTOBUF_C_TYPE_GROUP:          // NOT SUPPORTED
-    case PROTOBUF_C_TYPE_MESSAGE: {
-        out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        return rv + prefixed_message_pack (*(ProtobufCMessage * const *) member,
-                                           out + rv);
-    }
-    }
-    PROTOBUF_C_ASSERT_NOT_REACHED ();
-    return 0;
-}
-static size_t optional_field_pack (const ProtobufCFieldDescriptor *field,
-                                   const protobuf_c_boolean *has,
-                                   const void *member,
-                                   uint8_t *out) {
-    if (field->type == PROTOBUF_C_TYPE_MESSAGE
-            || field->type == PROTOBUF_C_TYPE_STRING) {
-        const void *ptr = * (const void * const *) member;
-        if (ptr == NULL
-                || ptr == field->default_value)
-            return 0;
-    } else {
-        if (!*has)
-            return 0;
-    }
-    return required_field_pack (field, member, out);
-}
-
-/* TODO: implement as a table lookup */
-static inline size_t sizeof_elt_in_repeated_array (ProtobufCType type) {
-    switch (type) {
-    case PROTOBUF_C_TYPE_SINT32:
-    case PROTOBUF_C_TYPE_INT32:
-    case PROTOBUF_C_TYPE_UINT32:
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-    case PROTOBUF_C_TYPE_ENUM:
-        return 4;
-    case PROTOBUF_C_TYPE_SINT64:
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        return 8;
-    case PROTOBUF_C_TYPE_BOOL:
-        return sizeof (protobuf_c_boolean);
-    case PROTOBUF_C_TYPE_STRING:
-    case PROTOBUF_C_TYPE_MESSAGE:
-        return sizeof (void *);
-    case PROTOBUF_C_TYPE_BYTES:
-        return sizeof (ProtobufCBinaryData);
-    }
-    PROTOBUF_C_ASSERT_NOT_REACHED ();
-    return 0;
-}
-
-static void copy_to_little_endian_32 (void *out, const void *in, unsigned N) {
-#ifdef IS_LITTLE_ENDIAN
-    memcpy (out, in, N * 4);
-#else
-    unsigned i;
-    const uint32_t *ini = in;
-    for (i = 0; i < N; i++)
-        fixed32_pack (ini[i], (uint8_t*)out + 4*i);
-#endif
-}
-static void copy_to_little_endian_64 (void *out, const void *in, unsigned N) {
-#ifdef IS_LITTLE_ENDIAN
-    memcpy (out, in, N * 8);
-#else
-    unsigned i;
-    const uint64_t *ini = in;
-    for (i = 0; i < N; i++)
-        fixed64_pack (ini[i], (uint8_t*)out + 8*i);
-#endif
-}
-
-static unsigned get_type_min_size (ProtobufCType type) {
-    if (type == PROTOBUF_C_TYPE_SFIXED32
-            || type == PROTOBUF_C_TYPE_FIXED32
-            || type == PROTOBUF_C_TYPE_FLOAT)
-        return 4;
-    if (type == PROTOBUF_C_TYPE_SFIXED64
-            || type == PROTOBUF_C_TYPE_FIXED64
-            || type == PROTOBUF_C_TYPE_DOUBLE)
-        return 8;
-    return 1;
-}
-
-static size_t repeated_field_pack (const ProtobufCFieldDescriptor *field,
-                                   size_t count,
-                                   const void *member,
-                                   uint8_t *out) {
-    char *array = * (char * const *) member;
-    unsigned i;
-    if (field->packed) {
-        unsigned header_len;
-        unsigned len_start;
-        unsigned min_length;
-        unsigned payload_len;
-        unsigned length_size_min;
-        unsigned actual_length_size;
-        uint8_t *payload_at;
-        if (count == 0)
-            return 0;
-        header_len = tag_pack (field->id, out);
-        out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        len_start = header_len;
-        min_length = get_type_min_size (field->type) * count;
-        length_size_min = uint32_size (min_length);
-        header_len += length_size_min;
-        payload_at = out + header_len;
-        switch (field->type) {
-        case PROTOBUF_C_TYPE_SFIXED32:
-        case PROTOBUF_C_TYPE_FIXED32:
-        case PROTOBUF_C_TYPE_FLOAT:
-            copy_to_little_endian_32 (payload_at, array, count);
-            payload_at += count * 4;
-            break;
-
-        case PROTOBUF_C_TYPE_SFIXED64:
-        case PROTOBUF_C_TYPE_FIXED64:
-        case PROTOBUF_C_TYPE_DOUBLE:
-            copy_to_little_endian_64 (payload_at, array, count);
-            payload_at += count * 8;
-            break;
-
-        case PROTOBUF_C_TYPE_INT32: {
-            const int32_t *arr = (const int32_t *) array;
-            for (i = 0; i < count; i++)
-                payload_at += int32_pack (arr[i], payload_at);
-        }
-        break;
-
-        case PROTOBUF_C_TYPE_SINT32: {
-            const int32_t *arr = (const int32_t *) array;
-            for (i = 0; i < count; i++)
-                payload_at += sint32_pack (arr[i], payload_at);
-        }
-        break;
-
-        case PROTOBUF_C_TYPE_SINT64: {
-            const int64_t *arr = (const int64_t *) array;
-            for (i = 0; i < count; i++)
-                payload_at += sint64_pack (arr[i], payload_at);
-        }
-        break;
-        case PROTOBUF_C_TYPE_ENUM:
-        case PROTOBUF_C_TYPE_UINT32: {
-            const uint32_t *arr = (const uint32_t *) array;
-            for (i = 0; i < count; i++)
-                payload_at += uint32_pack (arr[i], payload_at);
-        }
-        break;
-        case PROTOBUF_C_TYPE_INT64:
-        case PROTOBUF_C_TYPE_UINT64: {
-            const uint64_t *arr = (const uint64_t *) array;
-            for (i = 0; i < count; i++)
-                payload_at += uint64_pack (arr[i], payload_at);
-        }
-        break;
-        case PROTOBUF_C_TYPE_BOOL: {
-            const protobuf_c_boolean *arr = (const protobuf_c_boolean *) array;
-            for (i = 0; i < count; i++)
-                payload_at += boolean_pack (arr[i], payload_at);
-        }
-        break;
-
-        default:
-            assert (0);
-        }
-        payload_len = payload_at - (out + header_len);
-        actual_length_size = uint32_size (payload_len);
-        if (length_size_min != actual_length_size) {
-            assert (actual_length_size == length_size_min + 1);
-            memmove (out + header_len + 1, out + header_len, payload_len);
-            header_len++;
-        }
-        uint32_pack (payload_len, out + len_start);
-        return header_len + payload_len;
-    } else {
-        /* CONSIDER: optimize this case a bit (by putting the loop inside the switch) */
-        size_t rv = 0;
-        unsigned siz = sizeof_elt_in_repeated_array (field->type);
-        for (i = 0; i < count; i++) {
-            rv += required_field_pack (field, array, out + rv);
-            array += siz;
-        }
-        return rv;
-    }
-}
-static size_t unknown_field_pack (const ProtobufCMessageUnknownField *field,
-                                  uint8_t *out) {
-    size_t rv = tag_pack (field->tag, out);
-    out[0] |= field->wire_type;
-    memcpy (out + rv, field->data, field->len);
-    return rv + field->len;
-}
-
-size_t protobuf_c_message_pack           (const ProtobufCMessage *message,
-        uint8_t                *out) {
-    unsigned i;
-    size_t rv = 0;
-    ASSERT_IS_MESSAGE (message);
-    for (i = 0; i < message->descriptor->n_fields; i++) {
-        const ProtobufCFieldDescriptor *field = message->descriptor->fields + i;
-        const void *member = ((const char *) message) + field->offset;
-
-        /* it doesn't hurt to compute qmember (a pointer to the quantifier
-           field of the structure), but the pointer is only valid if
-           the field is one of:
-             - a repeated field
-             - an optional field that isn't a pointer type
-               (meaning: not a message or a string) */
-        const void *qmember = ((const char *) message) + field->quantifier_offset;
-
-        if (field->label == PROTOBUF_C_LABEL_REQUIRED)
-            rv += required_field_pack (field, member, out + rv);
-        else if (field->label == PROTOBUF_C_LABEL_OPTIONAL)
-            /* note that qmember is bogus for strings and messages,
-               but it isn't used */
-            rv += optional_field_pack (field, qmember, member, out + rv);
-        else
-            rv += repeated_field_pack (field, * (const size_t *) qmember, member, out + rv);
-    }
-    for (i = 0; i < message->n_unknown_fields; i++)
-        rv += unknown_field_pack (&message->unknown_fields[i], out + rv);
-    return rv;
-}
-
-/* === pack_to_buffer() === */
-static size_t required_field_pack_to_buffer (const ProtobufCFieldDescriptor *field,
-        const void *member,
-        ProtobufCBuffer *buffer) {
-    size_t rv;
-    uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2];
-    rv = tag_pack (field->id, scratch);
-    switch (field->type) {
-    case PROTOBUF_C_TYPE_SINT32:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        rv += sint32_pack (*(const int32_t *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_INT32:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        rv += int32_pack (*(const uint32_t *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_UINT32:
-    case PROTOBUF_C_TYPE_ENUM:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        rv += uint32_pack (*(const uint32_t *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_SINT64:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        rv += sint64_pack (*(const int64_t *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        rv += uint64_pack (*(const uint64_t *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_32BIT;
-        rv += fixed32_pack (*(const uint32_t *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_64BIT;
-        rv += fixed64_pack (*(const uint64_t *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_BOOL:
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
-        rv += boolean_pack (*(const protobuf_c_boolean *) member, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        break;
-    case PROTOBUF_C_TYPE_STRING: {
-        const char *str = *(char * const *) member;
-        size_t sublen = str ? strlen (str) : 0;
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        rv += uint32_pack (sublen, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        buffer->append (buffer, sublen, (const uint8_t *) str);
-        rv += sublen;
-        break;
-    }
-
-    case PROTOBUF_C_TYPE_BYTES: {
-        const ProtobufCBinaryData * bd = ((const ProtobufCBinaryData*) member);
-        size_t sublen = bd->len;
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        rv += uint32_pack (sublen, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        buffer->append (buffer, sublen, bd->data);
-        rv += sublen;
-        break;
-    }
-    //PROTOBUF_C_TYPE_GROUP,          // NOT SUPPORTED
-    case PROTOBUF_C_TYPE_MESSAGE: {
-        uint8_t simple_buffer_scratch[256];
-        size_t sublen;
-        ProtobufCBufferSimple simple_buffer
-            = PROTOBUF_C_BUFFER_SIMPLE_INIT (simple_buffer_scratch);
-        const ProtobufCMessage *msg = *(ProtobufCMessage * const *) member;
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        if (msg == NULL)
-            sublen = 0;
-        else
-            sublen = protobuf_c_message_pack_to_buffer (msg, &simple_buffer.base);
-        rv += uint32_pack (sublen, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        buffer->append (buffer, sublen, simple_buffer.data);
-        rv += sublen;
-        PROTOBUF_C_BUFFER_SIMPLE_CLEAR (&simple_buffer);
-        break;
-    }
-    default:
-        PROTOBUF_C_ASSERT_NOT_REACHED ();
-    }
-    return rv;
-}
-static size_t optional_field_pack_to_buffer (const ProtobufCFieldDescriptor *field,
-        const protobuf_c_boolean *has,
-        const void *member,
-        ProtobufCBuffer *buffer) {
-    if (field->type == PROTOBUF_C_TYPE_MESSAGE
-            || field->type == PROTOBUF_C_TYPE_STRING) {
-        const void *ptr = * (const void * const *) member;
-        if (ptr == NULL
-                || ptr == field->default_value)
-            return 0;
-    } else {
-        if (!*has)
-            return 0;
-    }
-    return required_field_pack_to_buffer (field, member, buffer);
-}
-
-static size_t get_packed_payload_length (const ProtobufCFieldDescriptor *field,
-        unsigned count,
-        const void *array) {
-    unsigned rv = 0;
-    unsigned i;
-    switch (field->type) {
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-        return count * 4;
-
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        return count * 8;
-
-    case PROTOBUF_C_TYPE_INT32: {
-        const int32_t *arr = (const int32_t *) array;
-        for (i = 0; i < count; i++)
-            rv += int32_size (arr[i]);
-    }
-    break;
-
-    case PROTOBUF_C_TYPE_SINT32: {
-        const int32_t *arr = (const int32_t *) array;
-        for (i = 0; i < count; i++)
-            rv += sint32_size (arr[i]);
-    }
-    break;
-    case PROTOBUF_C_TYPE_ENUM:
-    case PROTOBUF_C_TYPE_UINT32: {
-        const uint32_t *arr = (const uint32_t *) array;
-        for (i = 0; i < count; i++)
-            rv += uint32_size (arr[i]);
-    }
-    break;
-
-    case PROTOBUF_C_TYPE_SINT64: {
-        const int64_t *arr = (const int64_t *) array;
-        for (i = 0; i < count; i++)
-            rv += sint64_size (arr[i]);
-    }
-    break;
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64: {
-        const uint64_t *arr = (const uint64_t *) array;
-        for (i = 0; i < count; i++)
-            rv += uint64_size (arr[i]);
-    }
-    break;
-    case PROTOBUF_C_TYPE_BOOL:
-        return count;
-    default:
-        assert (0);
-    }
-    return rv;
-}
-static size_t pack_buffer_packed_payload (const ProtobufCFieldDescriptor *field,
-        unsigned count,
-        const void *array,
-        ProtobufCBuffer *buffer) {
-    uint8_t scratch[16];
-    size_t rv = 0;
-    unsigned i;
-    switch (field->type) {
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-#ifdef IS_LITTLE_ENDIAN
-        rv = count * 4;
-        goto no_packing_needed;
-#else
-        for (i = 0; i < count; i++) {
-            unsigned len = fixed32_pack (((uint32_t*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-#endif
-        break;
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-#ifdef IS_LITTLE_ENDIAN
-        rv = count * 8;
-        goto no_packing_needed;
-#else
-        for (i = 0; i < count; i++) {
-            unsigned len = fixed64_pack (((uint64_t*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-        break;
-#endif
-    case PROTOBUF_C_TYPE_INT32:
-        for (i = 0; i < count; i++) {
-            unsigned len = int32_pack (((int32_t*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-        break;
-
-    case PROTOBUF_C_TYPE_SINT32:
-        for (i = 0; i < count; i++) {
-            unsigned len = sint32_pack (((int32_t*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-        break;
-    case PROTOBUF_C_TYPE_ENUM:
-    case PROTOBUF_C_TYPE_UINT32:
-        for (i = 0; i < count; i++) {
-            unsigned len = uint32_pack (((uint32_t*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-        break;
-
-    case PROTOBUF_C_TYPE_SINT64:
-        for (i = 0; i < count; i++) {
-            unsigned len = sint64_pack (((int64_t*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-        break;
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        for (i = 0; i < count; i++) {
-            unsigned len = uint64_pack (((uint64_t*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-        break;
-    case PROTOBUF_C_TYPE_BOOL:
-        for (i = 0; i < count; i++) {
-            unsigned len = boolean_pack (((protobuf_c_boolean*)array)[i], scratch);
-            buffer->append (buffer, len, scratch);
-            rv += len;
-        }
-        return count;
-    default:
-        assert(0);
-    }
-    return rv;
-
-#ifdef IS_LITTLE_ENDIAN
-no_packing_needed:
-    buffer->append (buffer, rv, array);
-    return rv;
-#endif
-}
-
-static size_t repeated_field_pack_to_buffer (const ProtobufCFieldDescriptor *field,
-        unsigned count,
-        const void *member,
-        ProtobufCBuffer *buffer) {
-    char *array = * (char * const *) member;
-    if (count == 0)
-        return 0;
-    if (field->packed) {
-        uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2];
-        size_t rv = tag_pack (field->id, scratch);
-        size_t payload_len = get_packed_payload_length (field, count, array);
-        size_t tmp;
-        scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
-        rv += uint32_pack (payload_len, scratch + rv);
-        buffer->append (buffer, rv, scratch);
-        tmp = pack_buffer_packed_payload (field, count, array, buffer);
-        if (tmp != payload_len) {
-            fprintf (stderr, "Unexpected payload length: %zu (expected: %zu). Aborting.\n", tmp, payload_len);
-            abort ();
-        }
-        return rv + payload_len;
-    } else {
-        size_t siz;
-        unsigned i;
-        /* CONSIDER: optimize this case a bit (by putting the loop inside the switch) */
-        unsigned rv = 0;
-        siz = sizeof_elt_in_repeated_array (field->type);
-        for (i = 0; i < count; i++) {
-            rv += required_field_pack_to_buffer (field, array, buffer);
-            array += siz;
-        }
-        return rv;
-    }
-}
-
-static size_t unknown_field_pack_to_buffer (const ProtobufCMessageUnknownField *field,
-        ProtobufCBuffer *buffer) {
-    uint8_t header[MAX_UINT64_ENCODED_SIZE];
-    size_t rv = tag_pack (field->tag, header);
-    header[0] |= field->wire_type;
-    buffer->append (buffer, rv, header);
-    buffer->append (buffer, field->len, field->data);
-    return rv + field->len;
-}
-
-size_t protobuf_c_message_pack_to_buffer (const ProtobufCMessage *message,
-        ProtobufCBuffer  *buffer) {
-    unsigned i;
-    size_t rv = 0;
-    ASSERT_IS_MESSAGE (message);
-    for (i = 0; i < message->descriptor->n_fields; i++) {
-        const ProtobufCFieldDescriptor *field = message->descriptor->fields + i;
-        const void *member = ((const char *) message) + field->offset;
-        const void *qmember = ((const char *) message) + field->quantifier_offset;
-
-        if (field->label == PROTOBUF_C_LABEL_REQUIRED)
-            rv += required_field_pack_to_buffer (field, member, buffer);
-        else if (field->label == PROTOBUF_C_LABEL_OPTIONAL)
-            rv += optional_field_pack_to_buffer (field, qmember, member, buffer);
-        else
-            rv += repeated_field_pack_to_buffer (field, * (const size_t *) qmember, member, buffer);
-    }
-    for (i = 0; i < message->n_unknown_fields; i++)
-        rv += unknown_field_pack_to_buffer (&message->unknown_fields[i], buffer);
-
-    return rv;
-}
-
-/* === unpacking === */
-#if PRINT_UNPACK_ERRORS
-# define UNPACK_ERROR(args)  do { printf args;printf("\n"); }while(0)
-#else
-# define UNPACK_ERROR(args)  do { } while (0)
-#endif
-
-static inline int int_range_lookup (unsigned n_ranges,
-                                    const ProtobufCIntRange *ranges,
-                                    int value) {
-    unsigned start, n;
-    if (n_ranges == 0)
-        return -1;
-    start = 0;
-    n = n_ranges;
-    while (n > 1) {
-        unsigned mid = start + n / 2;
-        if (value < ranges[mid].start_value) {
-            n = mid - start;
-        } else if (value >= ranges[mid].start_value + (int)(ranges[mid+1].orig_index-ranges[mid].orig_index)) {
-            unsigned new_start = mid + 1;
-            n = start + n - new_start;
-            start = new_start;
-        } else
-            return (value - ranges[mid].start_value) + ranges[mid].orig_index;
-    }
-    if (n > 0) {
-        unsigned start_orig_index = ranges[start].orig_index;
-        unsigned range_size = ranges[start+1].orig_index - start_orig_index;
-
-        if (ranges[start].start_value <= value
-                && value < (int)(ranges[start].start_value + range_size))
-            return (value - ranges[start].start_value) + start_orig_index;
-    }
-    return -1;
-}
-
-static size_t parse_tag_and_wiretype (size_t len,
-                                      const uint8_t *data,
-                                      uint32_t *tag_out,
-                                      ProtobufCWireType *wiretype_out) {
-    unsigned max_rv = len > 5 ? 5 : len;
-    uint32_t tag = (data[0]&0x7f) >> 3;
-    unsigned shift = 4;
-    unsigned rv;
-    *wiretype_out = data[0] & 7;
-    if ((data[0] & 0x80) == 0) {
-        *tag_out = tag;
-        return 1;
-    }
-    for (rv = 1; rv < max_rv; rv++)
-        if (data[rv] & 0x80) {
-            tag |= (data[rv] & 0x7f) << shift;
-            shift += 7;
-        } else {
-            tag |= data[rv] << shift;
-            *tag_out = tag;
-            return rv + 1;
-        }
-    return 0;                   /* error: bad header */
-}
-
-/* sizeof(ScannedMember) must be <= (1<<BOUND_SIZEOF_SCANNED_MEMBER_LOG2) */
-#define BOUND_SIZEOF_SCANNED_MEMBER_LOG2  5
-typedef struct _ScannedMember ScannedMember;
-struct _ScannedMember {
-    uint32_t tag;
-    uint8_t wire_type;
-    uint8_t length_prefix_len;
-    const ProtobufCFieldDescriptor *field;
-    size_t len;
-    const uint8_t *data;
-};
-
-static inline uint32_t scan_length_prefixed_data (size_t len, const uint8_t *data, size_t *prefix_len_out) {
-    unsigned hdr_max = len < 5 ? len : 5;
-    unsigned hdr_len;
-    uint32_t val = 0;
-    unsigned i;
-    unsigned shift = 0;
-    for (i = 0; i < hdr_max; i++) {
-        val |= (data[i] & 0x7f) << shift;
-        shift += 7;
-        if ((data[i] & 0x80) == 0)
-            break;
-    }
-    if (i == hdr_max) {
-        UNPACK_ERROR (("error parsing length for length-prefixed data"));
-        return 0;
-    }
-    hdr_len = i + 1;
-    *prefix_len_out = hdr_len;
-    if (hdr_len + val > len) {
-        UNPACK_ERROR (("data too short after length-prefix of %u",
-                       val));
-        return 0;
-    }
-    return hdr_len + val;
-}
-
-static size_t max_b128_numbers (size_t len, const uint8_t *data) {
-    size_t rv = 0;
-    while (len--)
-        if ((*data++ & 0x80) == 0)
-            ++rv;
-    return rv;
-}
-
-
-/* Given a raw slab of packed-repeated values,
-   determine the number of elements.
-   This function detects certain kinds of errors
-   but not others; the remaining error checking is done by
-   parse_packed_repeated_member() */
-static protobuf_c_boolean count_packed_elements (ProtobufCType type,
-        size_t len,
-        const uint8_t *data,
-        size_t *count_out) {
-    switch (type) {
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-        if (len % 4 != 0) {
-            UNPACK_ERROR (("length must be a multiple of 4 for fixed-length 32-bit types"));
-            return FALSE;
-        }
-        *count_out = len / 4;
-        return TRUE;
-
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        if (len % 8 != 0) {
-            UNPACK_ERROR (("length must be a multiple of 8 for fixed-length 64-bit types"));
-            return FALSE;
-        }
-        *count_out = len / 8;
-        return TRUE;
-
-    case PROTOBUF_C_TYPE_INT32:
-    case PROTOBUF_C_TYPE_SINT32:
-    case PROTOBUF_C_TYPE_ENUM:
-    case PROTOBUF_C_TYPE_UINT32:
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_SINT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        *count_out = max_b128_numbers (len, data);
-        return TRUE;
-    case PROTOBUF_C_TYPE_BOOL:
-        *count_out = len;
-        return TRUE;
-
-    case PROTOBUF_C_TYPE_STRING:
-    case PROTOBUF_C_TYPE_BYTES:
-    case PROTOBUF_C_TYPE_MESSAGE:
-    default:
-        UNPACK_ERROR (("bad protobuf-c type %u for packed-repeated", type));
-        return FALSE;
-    }
-}
-
-static inline uint32_t parse_uint32 (unsigned len, const uint8_t *data) {
-    unsigned rv = data[0] & 0x7f;
-    if (len > 1) {
-        rv |= ((data[1] & 0x7f) << 7);
-        if (len > 2) {
-            rv |= ((data[2] & 0x7f) << 14);
-            if (len > 3) {
-                rv |= ((data[3] & 0x7f) << 21);
-                if (len > 4)
-                    rv |= (data[4] << 28);
-            }
-        }
-    }
-    return rv;
-}
-static inline uint32_t parse_int32 (unsigned len, const uint8_t *data) {
-    return parse_uint32 (len, data);
-}
-static inline int32_t unzigzag32 (uint32_t v) {
-    if (v&1)
-        return -(v>>1) - 1;
-    else
-        return v>>1;
-}
-static inline uint32_t parse_fixed_uint32 (const uint8_t *data) {
-#ifdef IS_LITTLE_ENDIAN
-    uint32_t t;
-    memcpy (&t, data, 4);
-    return t;
-#else
-    return data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
-#endif
-}
-static uint64_t parse_uint64 (unsigned len, const uint8_t *data) {
-    unsigned shift, i;
-    if (len < 5)
-        return parse_uint32 (len, data);
-    uint64_t rv = ((data[0] & 0x7f))
-                  | ((data[1] & 0x7f)<<7)
-                  | ((data[2] & 0x7f)<<14)
-                  | ((data[3] & 0x7f)<<21);
-    shift = 28;
-    for (i = 4; i < len; i++) {
-        rv |= (((uint64_t)(data[i]&0x7f)) << shift);
-        shift += 7;
-    }
-    return rv;
-}
-static inline int64_t unzigzag64 (uint64_t v) {
-    if (v&1)
-        return -(v>>1) - 1;
-    else
-        return v>>1;
-}
-static inline uint64_t parse_fixed_uint64 (const uint8_t *data) {
-#ifdef IS_LITTLE_ENDIAN
-    uint64_t t;
-    memcpy (&t, data, 8);
-    return t;
-#else
-    return (uint64_t)parse_fixed_uint32 (data)
-           | (((uint64_t)parse_fixed_uint32(data+4)) << 32);
-#endif
-}
-static protobuf_c_boolean parse_boolean (unsigned len, const uint8_t *data) {
-    unsigned i;
-    for (i = 0; i < len; i++)
-        if (data[i] & 0x7f)
-            return 1;
-    return 0;
-}
-static protobuf_c_boolean parse_required_member (ScannedMember *scanned_member,
-        void *member,
-        ProtobufCAllocator *allocator,
-        protobuf_c_boolean maybe_clear) {
-    unsigned len = scanned_member->len;
-    const uint8_t *data = scanned_member->data;
-    ProtobufCWireType wire_type = scanned_member->wire_type;
-    switch (scanned_member->field->type) {
-    case PROTOBUF_C_TYPE_INT32:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
-            return 0;
-        *(uint32_t*)member = parse_int32 (len, data);
-        return 1;
-    case PROTOBUF_C_TYPE_UINT32:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
-            return 0;
-        *(uint32_t*)member = parse_uint32 (len, data);
-        return 1;
-    case PROTOBUF_C_TYPE_SINT32:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
-            return 0;
-        *(int32_t*)member = unzigzag32 (parse_uint32 (len, data));
-        return 1;
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_32BIT)
-            return 0;
-        *(uint32_t*)member = parse_fixed_uint32 (data);
-        return 1;
-
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
-            return 0;
-        *(uint64_t*)member = parse_uint64 (len, data);
-        return 1;
-    case PROTOBUF_C_TYPE_SINT64:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
-            return 0;
-        *(int64_t*)member = unzigzag64 (parse_uint64 (len, data));
-        return 1;
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_64BIT)
-            return 0;
-        *(uint64_t*)member = parse_fixed_uint64 (data);
-        return 1;
-
-    case PROTOBUF_C_TYPE_BOOL:
-        *(protobuf_c_boolean*)member = parse_boolean (len, data);
-        return 1;
-
-    case PROTOBUF_C_TYPE_ENUM:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
-            return 0;
-        *(uint32_t*)member = parse_uint32 (len, data);
-        return 1;
-
-    case PROTOBUF_C_TYPE_STRING:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
-            return 0;
-        {
-            char **pstr = member;
-            unsigned pref_len = scanned_member->length_prefix_len;
-            if (maybe_clear && *pstr != NULL) {
-                const char *def = scanned_member->field->default_value;
-                if (*pstr != NULL && *pstr != def)
-                    FREE (allocator, *pstr);
-            }
-            DO_ALLOC (*pstr, allocator, len - pref_len + 1, return 0);
-            memcpy (*pstr, data + pref_len, len - pref_len);
-            (*pstr)[len-pref_len] = 0;
-            return 1;
-        }
-    case PROTOBUF_C_TYPE_BYTES:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
-            return 0;
-        {
-            ProtobufCBinaryData *bd = member;
-            const ProtobufCBinaryData *def_bd;
-            unsigned pref_len = scanned_member->length_prefix_len;
-            def_bd = scanned_member->field->default_value;
-            if (maybe_clear && bd->data != NULL && bd->data != def_bd->data)
-                FREE (allocator, bd->data);
-            DO_ALLOC (bd->data, allocator, len - pref_len, return 0);
-            memcpy (bd->data, data + pref_len, len - pref_len);
-            bd->len = len - pref_len;
-            return 1;
-        }
-    //case PROTOBUF_C_TYPE_GROUP,          // NOT SUPPORTED
-    case PROTOBUF_C_TYPE_MESSAGE:
-        if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
-            return 0;
-        {
-            ProtobufCMessage **pmessage = member;
-            ProtobufCMessage *subm;
-            const ProtobufCMessage *def_mess;
-            unsigned pref_len = scanned_member->length_prefix_len;
-            def_mess = scanned_member->field->default_value;
-            if (maybe_clear && *pmessage != NULL && *pmessage != def_mess)
-                protobuf_c_message_free_unpacked (*pmessage, allocator);
-            subm = protobuf_c_message_unpack (scanned_member->field->descriptor,
-                                              allocator,
-                                              len - pref_len, data + pref_len);
-            *pmessage = subm;       /* since we freed the message we must clear the field, even if NULL */
-            if (subm == NULL)
-                return 0;
-            return 1;
-        }
-    }
-    return 0;
-}
-
-static protobuf_c_boolean parse_optional_member (ScannedMember *scanned_member,
-        void *member,
-        ProtobufCMessage *message,
-        ProtobufCAllocator *allocator) {
-    if (!parse_required_member (scanned_member, member, allocator, TRUE))
-        return 0;
-    if (scanned_member->field->quantifier_offset != 0)
-        STRUCT_MEMBER (protobuf_c_boolean,
-                       message,
-                       scanned_member->field->quantifier_offset) = 1;
-    return 1;
-}
-
-static protobuf_c_boolean parse_repeated_member (ScannedMember *scanned_member,
-        void *member,
-        ProtobufCMessage *message,
-        ProtobufCAllocator *allocator) {
-    const ProtobufCFieldDescriptor *field = scanned_member->field;
-    size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
-    size_t siz = sizeof_elt_in_repeated_array (field->type);
-    char *array = *(char**)member;
-    if (!parse_required_member (scanned_member,
-                                array + siz * (*p_n),
-                                allocator,
-                                FALSE))
-        return 0;
-    *p_n += 1;
-    return 1;
-}
-
-static unsigned scan_varint (unsigned len, const uint8_t *data) {
-    unsigned i;
-    if (len > 10)
-        len = 10;
-    for (i = 0; i < len; i++)
-        if ((data[i] & 0x80) == 0)
-            break;
-    if (i == len)
-        return 0;
-    return i + 1;
-}
-
-static protobuf_c_boolean parse_packed_repeated_member (ScannedMember *scanned_member,
-        void *member,
-        ProtobufCMessage *message) {
-    const ProtobufCFieldDescriptor *field = scanned_member->field;
-    size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
-    size_t siz = sizeof_elt_in_repeated_array (field->type);
-    char *array = *(char**)member + siz * (*p_n);
-    const uint8_t *at = scanned_member->data + scanned_member->length_prefix_len;
-    size_t rem = scanned_member->len - scanned_member->length_prefix_len;
-    size_t count = 0;
-    unsigned i;
-    switch (field->type) {
-    case PROTOBUF_C_TYPE_SFIXED32:
-    case PROTOBUF_C_TYPE_FIXED32:
-    case PROTOBUF_C_TYPE_FLOAT:
-        count = (scanned_member->len - scanned_member->length_prefix_len) / 4;
-#ifdef IS_LITTLE_ENDIAN
-        goto no_unpacking_needed;
-#else
-        for (i = 0; i < count; i++) {
-            ((uint32_t*)array)[i] = parse_fixed_uint32 (at);
-            at += 4;
-        }
-#endif
-        break;
-    case PROTOBUF_C_TYPE_SFIXED64:
-    case PROTOBUF_C_TYPE_FIXED64:
-    case PROTOBUF_C_TYPE_DOUBLE:
-        count = (scanned_member->len - scanned_member->length_prefix_len) / 8;
-#ifdef IS_LITTLE_ENDIAN
-        goto no_unpacking_needed;
-#else
-        for (i = 0; i < count; i++) {
-            ((uint64_t*)array)[i] = parse_fixed_uint64 (at);
-            at += 8;
-        }
-        break;
-#endif
-    case PROTOBUF_C_TYPE_INT32:
-        while (rem > 0) {
-            unsigned s = scan_varint (rem, at);
-            if (s == 0) {
-                UNPACK_ERROR (("bad packed-repeated int32 value"));
-                return FALSE;
-            }
-            ((int32_t*)array)[count++] = parse_int32 (s, at);
-            at += s;
-            rem -= s;
-        }
-        break;
-
-    case PROTOBUF_C_TYPE_SINT32:
-        while (rem > 0) {
-            unsigned s = scan_varint (rem, at);
-            if (s == 0) {
-                UNPACK_ERROR (("bad packed-repeated sint32 value"));
-                return FALSE;
-            }
-            ((int32_t*)array)[count++] = unzigzag32 (parse_uint32 (s, at));
-            at += s;
-            rem -= s;
-        }
-        break;
-    case PROTOBUF_C_TYPE_ENUM:
-    case PROTOBUF_C_TYPE_UINT32:
-        while (rem > 0) {
-            unsigned s = scan_varint (rem, at);
-            if (s == 0) {
-                UNPACK_ERROR (("bad packed-repeated enum or uint32 value"));
-                return FALSE;
-            }
-            ((uint32_t*)array)[count++] = parse_uint32 (s, at);
-            at += s;
-            rem -= s;
-        }
-        break;
-
-    case PROTOBUF_C_TYPE_SINT64:
-        while (rem > 0) {
-            unsigned s = scan_varint (rem, at);
-            if (s == 0) {
-                UNPACK_ERROR (("bad packed-repeated sint64 value"));
-                return FALSE;
-            }
-            ((int64_t*)array)[count++] = unzigzag64 (parse_uint64 (s, at));
-            at += s;
-            rem -= s;
-        }
-        break;
-    case PROTOBUF_C_TYPE_INT64:
-    case PROTOBUF_C_TYPE_UINT64:
-        while (rem > 0) {
-            unsigned s = scan_varint (rem, at);
-            if (s == 0) {
-                UNPACK_ERROR (("bad packed-repeated int64/uint64 value"));
-                return FALSE;
-            }
-            ((int64_t*)array)[count++] = parse_uint64 (s, at);
-            at += s;
-            rem -= s;
-        }
-        break;
-    case PROTOBUF_C_TYPE_BOOL:
-        count = rem;
-        for (i = 0; i < count; i++) {
-            if (at[i] > 1) {
-                UNPACK_ERROR (("bad packed-repeated boolean value"));
-                return FALSE;
-            }
-            ((protobuf_c_boolean*)array)[i] = at[i];
-        }
-        break;
-    default:
-        assert(0);
-    }
-    *p_n += count;
-    return TRUE;
-
-#ifdef IS_LITTLE_ENDIAN
-no_unpacking_needed:
-    memcpy (array, at, count * siz);
-    *p_n += count;
-    return TRUE;
-#endif
-}
-
-static protobuf_c_boolean parse_member (ScannedMember *scanned_member,
-                                        ProtobufCMessage *message,
-                                        ProtobufCAllocator *allocator) {
-    const ProtobufCFieldDescriptor *field = scanned_member->field;
-    void *member;
-    if (field == NULL) {
-        ProtobufCMessageUnknownField *ufield = message->unknown_fields + (message->n_unknown_fields++);
-        ufield->tag = scanned_member->tag;
-        ufield->wire_type = scanned_member->wire_type;
-        ufield->len = scanned_member->len;
-        DO_UNALIGNED_ALLOC (ufield->data, allocator, scanned_member->len, return 0);
-        memcpy (ufield->data, scanned_member->data, ufield->len);
-        return 1;
-    }
-    member = (char*)message + field->offset;
-    switch (field->label) {
-    case PROTOBUF_C_LABEL_REQUIRED:
-        return parse_required_member (scanned_member, member, allocator, TRUE);
-    case PROTOBUF_C_LABEL_OPTIONAL:
-        return parse_optional_member (scanned_member, member, message, allocator);
-    case PROTOBUF_C_LABEL_REPEATED:
-        if (field->packed
-                && scanned_member->wire_type == PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
-            return parse_packed_repeated_member (scanned_member, member, message);
-        else
-            return parse_repeated_member (scanned_member, member, message, allocator);
-    }
-    PROTOBUF_C_ASSERT_NOT_REACHED ();
-    return 0;
-}
-
-
-/* TODO: expose/use this function if desc->message_init==NULL
-   (which occurs for old code, and may be useful for certain
-   programatic techniques for generating descriptors). */
-static void protobuf_c_message_init_generic (const ProtobufCMessageDescriptor *desc,
-        ProtobufCMessage *message) {
-    unsigned i;
-    memset (message, 0, desc->sizeof_message);
-    message->descriptor = desc;
-    for (i = 0; i < desc->n_fields; i++)
-        if (desc->fields[i].default_value != NULL
-                && desc->fields[i].label != PROTOBUF_C_LABEL_REPEATED) {
-            void *field = STRUCT_MEMBER_P (message, desc->fields[i].offset);
-            const void *dv = desc->fields[i].default_value;
-            switch (desc->fields[i].type) {
-            case PROTOBUF_C_TYPE_INT32:
-            case PROTOBUF_C_TYPE_SINT32:
-            case PROTOBUF_C_TYPE_SFIXED32:
-            case PROTOBUF_C_TYPE_UINT32:
-            case PROTOBUF_C_TYPE_FIXED32:
-            case PROTOBUF_C_TYPE_FLOAT:
-            case PROTOBUF_C_TYPE_ENUM:
-                memcpy (field, dv, 4);
-                break;
-
-            case PROTOBUF_C_TYPE_INT64:
-            case PROTOBUF_C_TYPE_SINT64:
-            case PROTOBUF_C_TYPE_SFIXED64:
-            case PROTOBUF_C_TYPE_UINT64:
-            case PROTOBUF_C_TYPE_FIXED64:
-            case PROTOBUF_C_TYPE_DOUBLE:
-                memcpy (field, dv, 8);
-                break;
-
-            case PROTOBUF_C_TYPE_BOOL:
-                memcpy (field, dv, sizeof (protobuf_c_boolean));
-                break;
-
-            case PROTOBUF_C_TYPE_BYTES:
-                memcpy (field, dv, sizeof (ProtobufCBinaryData));
-                break;
-
-            case PROTOBUF_C_TYPE_STRING:
-            case PROTOBUF_C_TYPE_MESSAGE:
-                /* the next line essentially implements a cast from const,
-                   which is totally unavoidable. */
-                *(const void**)field = dv;
-                break;
-            }
-        }
-}
-
-/* ScannedMember slabs (an unpacking implementation detail).
-   Before doing real unpacking, we first scan through the
-   elements to see how many there are (for repeated fields),
-   and which field to use (for non-repeated fields given twice).
-
- * In order to avoid allocations for small messages,
-   we keep a stack-allocated slab of ScannedMembers of
-   size FIRST_SCANNED_MEMBER_SLAB_SIZE (16).
-   After we fill that up, we allocate each slab twice
-   as large as the previous one. */
-#define FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2             4
-
-/* The number of slabs, including the stack-allocated ones;
-   choose the number so that we would overflow if we needed
-   a slab larger than provided. */
-#define MAX_SCANNED_MEMBER_SLAB                          \
-  (sizeof(void*)*8 - 1                                   \
-   - BOUND_SIZEOF_SCANNED_MEMBER_LOG2                    \
-   - FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2)
-
-ProtobufCMessage *protobuf_c_message_unpack         (const ProtobufCMessageDescriptor *desc,
-        ProtobufCAllocator  *allocator,
-        size_t               len,
-        const uint8_t       *data) {
-    ProtobufCMessage *rv;
-    size_t rem = len;
-    const uint8_t *at = data;
-    const ProtobufCFieldDescriptor *last_field = desc->fields + 0;
-    ScannedMember first_member_slab[1<<FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2];
-
-    /* scanned_member_slabs[i] is an array of arrays of ScannedMember.
-       The first slab (scanned_member_slabs[0] is just a pointer to
-       first_member_slab), above.  All subsequent slabs will be allocated
-       using the allocator. */
-    ScannedMember *scanned_member_slabs[MAX_SCANNED_MEMBER_SLAB+1];
-    unsigned which_slab = 0;       /* the slab we are currently populating */
-    unsigned in_slab_index = 0;    /* number of members in the slab */
-    size_t n_unknown = 0;
-    unsigned f;
-    unsigned i_slab;
-    unsigned last_field_index = 0;
-    unsigned long *required_fields_bitmap;
-    unsigned required_fields_bitmap_len;
-    static const unsigned word_bits = sizeof(long) * 8;
-
-    ASSERT_IS_MESSAGE_DESCRIPTOR (desc);
-
-    if (allocator == NULL)
-        allocator = &protobuf_c_default_allocator;
-
-    required_fields_bitmap_len = (desc->n_fields + word_bits - 1) / word_bits;
-    required_fields_bitmap = alloca(required_fields_bitmap_len * sizeof(long));
-    memset(required_fields_bitmap, 0, required_fields_bitmap_len * sizeof(long));
-
-    DO_ALLOC (rv, allocator, desc->sizeof_message, return NULL);
-    scanned_member_slabs[0] = first_member_slab;
-
-    /* Generated code always defines "message_init".
-       However, we provide a fallback for (1) users of old protobuf-c
-       generated-code that do not provide the function,
-       and (2) descriptors constructed from some other source
-       (most likely, direct construction from the .proto file) */
-    if (desc->message_init != NULL)
-        protobuf_c_message_init (desc, rv);
-    else
-        protobuf_c_message_init_generic (desc, rv);
-
-    while (rem > 0) {
-        uint32_t tag;
-        ProtobufCWireType wire_type;
-        size_t used = parse_tag_and_wiretype (rem, at, &tag, &wire_type);
-        const ProtobufCFieldDescriptor *field;
-        ScannedMember tmp;
-        if (used == 0) {
-            UNPACK_ERROR (("error parsing tag/wiretype at offset %u",
-                           (unsigned)(at-data)));
-            goto error_cleanup_during_scan;
-        }
-        /* XXX: consider optimizing for field[1].id == tag, if field[1] exists! */
-        if (last_field->id != tag) {
-            /* lookup field */
-            int field_index = int_range_lookup (desc->n_field_ranges,
-                                                desc->field_ranges,
-                                                tag);
-            if (field_index < 0) {
-                field = NULL;
-                n_unknown++;
-            } else {
-                field = desc->fields + field_index;
-                last_field = field;
-                last_field_index = field_index;
-            }
-        } else
-            field = last_field;
-
-        if (field != NULL && field->label == PROTOBUF_C_LABEL_REQUIRED)
-            required_fields_bitmap[last_field_index / word_bits] |= (1UL << (last_field_index % word_bits));
-
-        at += used;
-        rem -= used;
-        tmp.tag = tag;
-        tmp.wire_type = wire_type;
-        tmp.field = field;
-        tmp.data = at;
-        switch (wire_type) {
-        case PROTOBUF_C_WIRE_TYPE_VARINT: {
-            unsigned max_len = rem < 10 ? rem : 10;
-            unsigned i;
-            for (i = 0; i < max_len; i++)
-                if ((at[i] & 0x80) == 0)
-                    break;
-            if (i == max_len) {
-                UNPACK_ERROR (("unterminated varint at offset %u",
-                               (unsigned)(at-data)));
-                goto error_cleanup_during_scan;
-            }
-            tmp.len = i + 1;
-        }
-        break;
-        case PROTOBUF_C_WIRE_TYPE_64BIT:
-            if (rem < 8) {
-                UNPACK_ERROR (("too short after 64bit wiretype at offset %u",
-                               (unsigned)(at-data)));
-                goto error_cleanup_during_scan;
-            }
-            tmp.len = 8;
-            break;
-        case PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED: {
-            size_t pref_len;
-            tmp.len = scan_length_prefixed_data (rem, at, &pref_len);
-            if (tmp.len == 0) {
-                /* NOTE: scan_length_prefixed_data calls UNPACK_ERROR */
-                goto error_cleanup_during_scan;
-            }
-            tmp.length_prefix_len = pref_len;
-            break;
-        }
-        case PROTOBUF_C_WIRE_TYPE_32BIT:
-            if (rem < 4) {
-                UNPACK_ERROR (("too short after 32bit wiretype at offset %u",
-                               (unsigned)(at-data)));
-                goto error_cleanup_during_scan;
-            }
-            tmp.len = 4;
-            break;
-        default:
-            UNPACK_ERROR (("unsupported tag %u at offset %u",
-                           wire_type, (unsigned)(at-data)));
-            goto error_cleanup_during_scan;
-        }
-        if (in_slab_index == (1U<<(which_slab+FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2))) {
-            size_t size;
-            in_slab_index = 0;
-            if (which_slab == MAX_SCANNED_MEMBER_SLAB) {
-                UNPACK_ERROR (("too many fields"));
-                goto error_cleanup_during_scan;
-            }
-            which_slab++;
-            size = sizeof(ScannedMember) << (which_slab+FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2);
-            /* TODO: consider using alloca() ! */
-            if (allocator->tmp_alloc != NULL)
-                scanned_member_slabs[which_slab] = TMPALLOC(allocator, size);
-            else
-                DO_ALLOC (scanned_member_slabs[which_slab], allocator, size, goto error_cleanup_during_scan);
-        }
-        scanned_member_slabs[which_slab][in_slab_index++] = tmp;
-
-        if (field != NULL && field->label == PROTOBUF_C_LABEL_REPEATED) {
-            size_t *n = STRUCT_MEMBER_PTR (size_t, rv, field->quantifier_offset);
-            if (field->packed
-                    && wire_type == PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED) {
-                size_t count;
-                if (!count_packed_elements (field->type,
-                                            tmp.len - tmp.length_prefix_len,
-                                            tmp.data + tmp.length_prefix_len,
-                                            &count)) {
-                    UNPACK_ERROR (("counting packed elements"));
-                    goto error_cleanup_during_scan;
-                }
-                *n += count;
-            } else
-                *n += 1;
-        }
-
-        at += tmp.len;
-        rem -= tmp.len;
-    }
-
-    /* allocate space for repeated fields, also check that all required fields have been set */
-    for (f = 0; f < desc->n_fields; f++) {
-        const ProtobufCFieldDescriptor *field = desc->fields + f;
-        if (field->label == PROTOBUF_C_LABEL_REPEATED) {
-            size_t siz = sizeof_elt_in_repeated_array (field->type);
-            size_t *n_ptr = STRUCT_MEMBER_PTR (size_t, rv, field->quantifier_offset);
-            if (*n_ptr != 0) {
-                unsigned n = *n_ptr;
-                *n_ptr = 0;
-                assert(rv->descriptor != NULL);
-#define CLEAR_REMAINING_N_PTRS()                                            \
-            for(f++;f < desc->n_fields; f++)                                \
-              {                                                             \
-                field = desc->fields + f;                                   \
-                if (field->label == PROTOBUF_C_LABEL_REPEATED)              \
-                  STRUCT_MEMBER (size_t, rv, field->quantifier_offset) = 0; \
-              }
-                DO_ALLOC (STRUCT_MEMBER (void *, rv, field->offset),
-                          allocator, siz * n,
-                          CLEAR_REMAINING_N_PTRS (); goto error_cleanup);
-#undef CLEAR_REMAINING_N_PTRS
-            }
-        } else if (field->label == PROTOBUF_C_LABEL_REQUIRED) {
-            if (field->default_value == NULL && 0 == (required_fields_bitmap[f / word_bits] & (1UL << (f % word_bits)))) {
-                UNPACK_ERROR (("message '%s': missing required field '%s'", desc->name, field->name));
-                goto error_cleanup;
-            }
-        }
-    }
-
-    /* allocate space for unknown fields */
-    if (n_unknown) {
-        DO_ALLOC (rv->unknown_fields,
-                  allocator, n_unknown * sizeof (ProtobufCMessageUnknownField),
-                  goto error_cleanup);
-    }
-
-    /* do real parsing */
-    for (i_slab = 0; i_slab <= which_slab; i_slab++) {
-        unsigned max = (i_slab == which_slab) ? in_slab_index : (1U<<(i_slab+4));
-        ScannedMember *slab = scanned_member_slabs[i_slab];
-        unsigned j;
-        for (j = 0; j < max; j++) {
-            if (!parse_member (slab + j, rv, allocator)) {
-                UNPACK_ERROR (("error parsing member %s of %s",
-                               slab->field ? slab->field->name : "*unknown-field*", desc->name));
-                goto error_cleanup;
-            }
-        }
-    }
-
-    /* cleanup */
-    if (allocator->tmp_alloc == NULL) {
-        unsigned j;
-        for (j = 1; j <= which_slab; j++)
-            FREE (allocator, scanned_member_slabs[j]);
-    }
-
-    return rv;
-
-error_cleanup:
-    protobuf_c_message_free_unpacked (rv, allocator);
-    if (allocator->tmp_alloc == NULL) {
-        unsigned j;
-        for (j = 1; j <= which_slab; j++)
-            FREE (allocator, scanned_member_slabs[j]);
-    }
-    return NULL;
-
-error_cleanup_during_scan:
-    FREE (allocator, rv);
-    if (allocator->tmp_alloc == NULL) {
-        unsigned j;
-        for (j = 1; j <= which_slab; j++)
-            FREE (allocator, scanned_member_slabs[j]);
-    }
-    return NULL;
-}
-
-/* === free_unpacked === */
-void protobuf_c_message_free_unpacked  (ProtobufCMessage    *message,
-                                        ProtobufCAllocator  *allocator) {
-    const ProtobufCMessageDescriptor *desc = message->descriptor;
-    unsigned f;
-    ASSERT_IS_MESSAGE (message);
-    if (allocator == NULL)
-        allocator = &protobuf_c_default_allocator;
-    message->descriptor = NULL;
-    for (f = 0; f < desc->n_fields; f++) {
-        if (desc->fields[f].label == PROTOBUF_C_LABEL_REPEATED) {
-            size_t n = STRUCT_MEMBER (size_t, message, desc->fields[f].quantifier_offset);
-            void * arr = STRUCT_MEMBER (void *, message, desc->fields[f].offset);
-            if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING) {
-                unsigned i;
-                for (i = 0; i < n; i++)
-                    FREE (allocator, ((char**)arr)[i]);
-            } else if (desc->fields[f].type == PROTOBUF_C_TYPE_BYTES) {
-                unsigned i;
-                for (i = 0; i < n; i++)
-                    FREE (allocator, ((ProtobufCBinaryData*)arr)[i].data);
-            } else if (desc->fields[f].type == PROTOBUF_C_TYPE_MESSAGE) {
-                unsigned i;
-                for (i = 0; i < n; i++)
-                    protobuf_c_message_free_unpacked (((ProtobufCMessage**)arr)[i], allocator);
-            }
-            if (arr != NULL)
-                FREE (allocator, arr);
-        } else if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING) {
-            char *str = STRUCT_MEMBER (char *, message, desc->fields[f].offset);
-            if (str && str != desc->fields[f].default_value)
-                FREE (allocator, str);
-        } else if (desc->fields[f].type == PROTOBUF_C_TYPE_BYTES) {
-            void *data = STRUCT_MEMBER (ProtobufCBinaryData, message, desc->fields[f].offset).data;
-            const ProtobufCBinaryData *default_bd;
-            default_bd = desc->fields[f].default_value;
-            if (data != NULL
-                    && (default_bd == NULL || default_bd->data != data))
-                FREE (allocator, data);
-        } else if (desc->fields[f].type == PROTOBUF_C_TYPE_MESSAGE) {
-            ProtobufCMessage *sm;
-            sm = STRUCT_MEMBER (ProtobufCMessage *, message,desc->fields[f].offset);
-            if (sm && sm != desc->fields[f].default_value)
-                protobuf_c_message_free_unpacked (sm, allocator);
-        }
-    }
-
-    for (f = 0; f < message->n_unknown_fields; f++)
-        FREE (allocator, message->unknown_fields[f].data);
-    if (message->unknown_fields != NULL)
-        FREE (allocator, message->unknown_fields);
-
-    FREE (allocator, message);
-}
-
-/* === services === */
-typedef void (*GenericHandler)(void *service,
-                               const ProtobufCMessage *input,
-                               ProtobufCClosure  closure,
-                               void             *closure_data);
-void protobuf_c_service_invoke_internal(ProtobufCService *service,
-                                        unsigned          method_index,
-                                        const ProtobufCMessage *input,
-                                        ProtobufCClosure  closure,
-                                        void             *closure_data) {
-    GenericHandler *handlers;
-    GenericHandler handler;
-
-    /* Verify that method_index is within range.
-       If this fails, you are likely invoking a newly added
-       method on an old service.  (Although other memory corruption
-       bugs can cause this assertion too) */
-    PROTOBUF_C_ASSERT (method_index < service->descriptor->n_methods);
-
-    /* Get the array of virtual methods (which are enumerated by
-       the generated code) */
-    handlers = (GenericHandler *) (service + 1);
-
-    /* get our method and invoke it */
-    /* TODO: seems like handler==NULL is a situation that
-       needs handling */
-    handler = handlers[method_index];
-    (*handler) (service, input, closure, closure_data);
-}
-
-void protobuf_c_service_generated_init (ProtobufCService *service,
-                                        const ProtobufCServiceDescriptor *descriptor,
-                                        ProtobufCServiceDestroy destroy) {
-    ASSERT_IS_SERVICE_DESCRIPTOR(descriptor);
-    service->descriptor = descriptor;
-    service->destroy = destroy;
-    service->invoke = protobuf_c_service_invoke_internal;
-    memset (service + 1, 0, descriptor->n_methods * sizeof (GenericHandler));
-}
-
-void protobuf_c_service_destroy (ProtobufCService *service) {
-    service->destroy (service);
-}
-
-/* --- querying the descriptors --- */
-const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value_by_name
-(const ProtobufCEnumDescriptor    *desc,
- const char                       *name) {
-    unsigned start = 0, count = desc->n_value_names;
-    while (count > 1) {
-        unsigned mid = start + count / 2;
-        int rv = g_strcmp0(desc->values_by_name[mid].name, name);
-        if (rv == 0)
-            return desc->values + desc->values_by_name[mid].index;
-        else if (rv < 0) {
-            count = start + count - (mid + 1);
-            start = mid + 1;
-        } else
-            count = mid - start;
-    }
-    if (count == 0)
-        return NULL;
-    if (g_strcmp0(desc->values_by_name[start].name, name) == 0)
-        return desc->values + desc->values_by_name[start].index;
-    return NULL;
-}
-const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value
-(const ProtobufCEnumDescriptor    *desc,
- int                               value) {
-    int rv = int_range_lookup (desc->n_value_ranges, desc->value_ranges, value);
-    if (rv < 0)
-        return NULL;
-    return desc->values + rv;
-}
-
-const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field_by_name
-(const ProtobufCMessageDescriptor *desc,
- const char                       *name) {
-    unsigned start = 0, count = desc->n_fields;
-    const ProtobufCFieldDescriptor *field;
-    while (count > 1) {
-        unsigned mid = start + count / 2;
-        int rv;
-        field = desc->fields + desc->fields_sorted_by_name[mid];
-        rv = g_strcmp0(field->name, name);
-        if (rv == 0)
-            return field;
-        else if (rv < 0) {
-            count = start + count - (mid + 1);
-            start = mid + 1;
-        } else
-            count = mid - start;
-    }
-    if (count == 0)
-        return NULL;
-    field = desc->fields + desc->fields_sorted_by_name[start];
-    if (g_strcmp0(field->name, name) == 0)
-        return field;
-    return NULL;
-}
-
-const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field
-(const ProtobufCMessageDescriptor *desc,
- unsigned                          value) {
-    int rv = int_range_lookup (desc->n_field_ranges,
-                               desc->field_ranges,
-                               value);
-    if (rv < 0)
-        return NULL;
-    return desc->fields + rv;
-}
-
-const ProtobufCMethodDescriptor *
-protobuf_c_service_descriptor_get_method_by_name
-(const ProtobufCServiceDescriptor *desc,
- const char                       *name) {
-    unsigned start = 0, count = desc->n_methods;
-    while (count > 1) {
-        unsigned mid = start + count / 2;
-        unsigned mid_index = desc->method_indices_by_name[mid];
-        const char *mid_name = desc->methods[mid_index].name;
-        int rv = g_strcmp0(mid_name, name);
-        if (rv == 0)
-            return desc->methods + desc->method_indices_by_name[mid];
-        if (rv < 0) {
-            count = start + count - (mid + 1);
-            start = mid + 1;
-        } else {
-            count = mid - start;
-        }
-    }
-    if (count == 0)
-        return NULL;
-    if (g_strcmp0(desc->methods[desc->method_indices_by_name[start]].name, name) == 0)
-        return desc->methods + desc->method_indices_by_name[start];
-    return NULL;
-}
diff --git a/navit/maptool/google/protobuf-c/protobuf-c.h b/navit/maptool/google/protobuf-c/protobuf-c.h
deleted file mode 100644
index 50af74dac..000000000
--- a/navit/maptool/google/protobuf-c/protobuf-c.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/* --- protobuf-c.h: public protobuf c runtime api --- */
-
-/*
- * Copyright 2008, Dave Benson.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with
- * the License. You may obtain a copy of the License
- * at http://www.apache.org/licenses/LICENSE-2.0 Unless
- * required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef __PROTOBUF_C_RUNTIME_H_
-#define __PROTOBUF_C_RUNTIME_H_
-
-#include <stddef.h>
-#include <assert.h>
-
-#ifdef __cplusplus
-# define PROTOBUF_C_BEGIN_DECLS    extern "C" {
-# define PROTOBUF_C_END_DECLS      }
-#else
-# define PROTOBUF_C_BEGIN_DECLS
-# define PROTOBUF_C_END_DECLS
-#endif
-
-#if !defined(PROTOBUF_C_NO_DEPRECATED) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-#define PROTOBUF_C_DEPRECATED __attribute__((__deprecated__))
-#else
-#define PROTOBUF_C_DEPRECATED
-#endif
-
-/* Define int32_t, int64_t, uint32_t, uint64_t, uint8_t.
-
-   Usually, just include <inttypes.h> to do the work.
-   XXX: should we use stdint.h?
- */
-#ifndef PROTOBUF_C_SKIP_INTTYPES_H
-#  if defined(_MSC_VER)
-     /* On windows, in ms visual studio, define the types ourselves */
-#    define int32_t      signed __int32
-#    define uint32_t     unsigned __int32
-#    define int64_t      signed __int64
-#    define uint64_t     unsigned __int64
-#    define uint8_t      unsigned char
-#  else
-     /* Use the system inttypes.h */
-#    include <inttypes.h>
-#  endif
-#endif
-
-PROTOBUF_C_BEGIN_DECLS
-
-typedef enum
-{
-  PROTOBUF_C_LABEL_REQUIRED,
-  PROTOBUF_C_LABEL_OPTIONAL,
-  PROTOBUF_C_LABEL_REPEATED
-} ProtobufCLabel;
-
-typedef enum
-{
-  PROTOBUF_C_TYPE_INT32,
-  PROTOBUF_C_TYPE_SINT32,
-  PROTOBUF_C_TYPE_SFIXED32,
-  PROTOBUF_C_TYPE_INT64,
-  PROTOBUF_C_TYPE_SINT64,
-  PROTOBUF_C_TYPE_SFIXED64,
-  PROTOBUF_C_TYPE_UINT32,
-  PROTOBUF_C_TYPE_FIXED32,
-  PROTOBUF_C_TYPE_UINT64,
-  PROTOBUF_C_TYPE_FIXED64,
-  PROTOBUF_C_TYPE_FLOAT,
-  PROTOBUF_C_TYPE_DOUBLE,
-  PROTOBUF_C_TYPE_BOOL,
-  PROTOBUF_C_TYPE_ENUM,
-  PROTOBUF_C_TYPE_STRING,
-  PROTOBUF_C_TYPE_BYTES,
-  //PROTOBUF_C_TYPE_GROUP,          // NOT SUPPORTED
-  PROTOBUF_C_TYPE_MESSAGE,
-} ProtobufCType;
-
-typedef int protobuf_c_boolean;
-#define PROTOBUF_C_OFFSETOF(struct, member) offsetof(struct, member)
-
-#define PROTOBUF_C_ASSERT(condition) assert(condition)
-#define PROTOBUF_C_ASSERT_NOT_REACHED() assert(0)
-
-typedef struct _ProtobufCBinaryData ProtobufCBinaryData;
-struct _ProtobufCBinaryData
-{
-  size_t len;
-  uint8_t *data;
-};
-
-typedef struct _ProtobufCIntRange ProtobufCIntRange; /* private */
-
-/* --- memory management --- */
-typedef struct _ProtobufCAllocator ProtobufCAllocator;
-struct _ProtobufCAllocator
-{
-  void *(*alloc)(void *allocator_data, size_t size);
-  void (*free)(void *allocator_data, void *pointer);
-  void *(*tmp_alloc)(void *allocator_data, size_t size);
-  unsigned max_alloca;
-  void *allocator_data;
-};
-
-/* This is a configurable allocator.
- * By default, it uses the system allocator (meaning malloc() and free()).
- * This is typically changed to adapt to frameworks that provide
- * some nonstandard allocation functions.
- *
- * NOTE: you may modify this allocator.
- */
-extern ProtobufCAllocator protobuf_c_default_allocator; /* settable */
-
-/* This is the system allocator, meaning it uses malloc() and free().
- *
- * NOTE: please do NOT modify this allocator.
- */
-extern ProtobufCAllocator protobuf_c_system_allocator;  /* use malloc, free etc */
-
-/* This is the function that our default allocators call when they
-   run out-of-memory.  The default behavior of this function is to
-   terminate your program. */
-extern void (*protobuf_c_out_of_memory) (void);
-
-/* --- append-only data buffer --- */
-typedef struct _ProtobufCBuffer ProtobufCBuffer;
-struct _ProtobufCBuffer
-{
-  void (*append)(ProtobufCBuffer     *buffer,
-                 size_t               len,
-                 const uint8_t       *data);
-};
-/* --- enums --- */
-typedef struct _ProtobufCEnumValue ProtobufCEnumValue;
-typedef struct _ProtobufCEnumValueIndex ProtobufCEnumValueIndex;
-typedef struct _ProtobufCEnumDescriptor ProtobufCEnumDescriptor;
-
-/* ProtobufCEnumValue:  this represents a single value of
- * an enumeration.
- * 'name' is the string identifying this value, as given in the .proto file.
- * 'c_name' is the full name of the C enumeration value.
- * 'value' is the number assigned to this value, as given in the .proto file.
- */
-struct _ProtobufCEnumValue
-{
-  const char *name;
-  const char *c_name;
-  int value;
-};
-
-/* ProtobufCEnumDescriptor: the represents the enum as a whole,
- * with all its values.
- * 'magic' is a code we check to ensure that the api is used correctly.
- * 'name' is the qualified name (e.g. "namespace.Type").
- * 'short_name' is the unqualified name ("Type"), as given in the .proto file.
- * 'package_name' is the '.'-separated namespace
- * 'n_values' is the number of distinct values.
- * 'values' is the array of distinct values.
- * 'n_value_names' number of named values (including aliases).
- * 'value_names' are the named values (including aliases).
- *
- * The rest of the values are private essentially.
- *
- * see also: Use protobuf_c_enum_descriptor_get_value_by_name()
- * and protobuf_c_enum_descriptor_get_value() to efficiently
- * lookup values in the descriptor.
- */
-struct _ProtobufCEnumDescriptor
-{
-  uint32_t magic;
-
-  const char *name;
-  const char *short_name;
-  const char *c_name;
-  const char *package_name;
-
-  /* sorted by value */
-  unsigned n_values;
-  const ProtobufCEnumValue *values;
-
-  /* sorted by name */
-  unsigned n_value_names;
-  const ProtobufCEnumValueIndex *values_by_name;
-
-  /* value-ranges, for faster lookups by number */
-  unsigned n_value_ranges;
-  const ProtobufCIntRange *value_ranges;
-
-  void *reserved1;
-  void *reserved2;
-  void *reserved3;
-  void *reserved4;
-};
-
-/* --- messages --- */
-typedef struct _ProtobufCMessageDescriptor ProtobufCMessageDescriptor;
-typedef struct _ProtobufCFieldDescriptor ProtobufCFieldDescriptor;
-typedef struct _ProtobufCMessage ProtobufCMessage;
-typedef void (*ProtobufCMessageInit)(ProtobufCMessage *);
-/* ProtobufCFieldDescriptor: description of a single field
- * in a message.
- * 'name' is the name of the field, as given in the .proto file.
- * 'id' is the code representing the field, as given in the .proto file.
- * 'label' is one of PROTOBUF_C_LABEL_{REQUIRED,OPTIONAL,REPEATED}
- * 'type' is the type of field.
- * 'quantifier_offset' is the offset in bytes into the message's C structure
- *        for this member's "has_MEMBER" field (for optional members) or
- *        "n_MEMBER" field (for repeated members).
- * 'offset' is the offset in bytes into the message's C structure
- *        for the member itself.
- * 'descriptor' is a pointer to a ProtobufC{Enum,Message}Descriptor
- *        if type is PROTOBUF_C_TYPE_{ENUM,MESSAGE} respectively,
- *        otherwise NULL.
- * 'default_value' is a pointer to a default value for this field,
- *        where allowed.
- */
-struct _ProtobufCFieldDescriptor
-{
-  const char *name;
-  uint32_t id;
-  ProtobufCLabel label;
-  ProtobufCType type;
-  unsigned quantifier_offset;
-  unsigned offset;
-  const void *descriptor;   /* for MESSAGE and ENUM types */
-  const void *default_value;   /* or NULL if no default-value */
-  protobuf_c_boolean packed;
-
-  unsigned reserved_flags;
-  void *reserved2;
-  void *reserved3;
-};
-/* ProtobufCMessageDescriptor: description of a message.
- *
- * 'magic' is a code we check to ensure that the api is used correctly.
- * 'name' is the qualified name (e.g. "namespace.Type").
- * 'short_name' is the unqualified name ("Type"), as given in the .proto file.
- * 'c_name' is the c-formatted name of the structure
- * 'package_name' is the '.'-separated namespace
- * 'sizeof_message' is the size in bytes of the C structure
- *        representing an instance of this type of message.
- * 'n_fields' is the number of known fields in this message.
- * 'fields' is the fields sorted by id number.
- * 'fields_sorted_by_name', 'n_field_ranges' and 'field_ranges'
- *       are used for looking up fields by name and id. (private)
- */
-struct _ProtobufCMessageDescriptor
-{
-  uint32_t magic;
-
-  const char *name;
-  const char *short_name;
-  const char *c_name;
-  const char *package_name;
-
-  size_t sizeof_message;
-
-  /* sorted by field-id */
-  unsigned n_fields;
-  const ProtobufCFieldDescriptor *fields;
-  const unsigned *fields_sorted_by_name;
-
-  /* ranges, optimization for looking up fields */
-  unsigned n_field_ranges;
-  const ProtobufCIntRange *field_ranges;
-
-  ProtobufCMessageInit message_init;
-  void *reserved1;
-  void *reserved2;
-  void *reserved3;
-};
-
-
-/* ProtobufCMessage: an instance of a message.
- *
- * ProtobufCMessage is sort-of a lightweight
- * base-class for all messages.
- *
- * In particular, ProtobufCMessage doesn't have
- * any allocation policy associated with it.
- * That's because it is common to create ProtobufCMessage's
- * on the stack.  In fact, we that's what we recommend
- * for sending messages (because if you just allocate from the
- * stack, then you can't really have a memory leak).
- *
- * This means that functions like protobuf_c_message_unpack()
- * which return a ProtobufCMessage must be paired
- * with a free function, like protobuf_c_message_free_unpacked().
- *
- * 'descriptor' gives the locations and types of the members of message
- * 'n_unknown_fields' is the number of fields we didn't recognize.
- * 'unknown_fields' are fields we didn't recognize.
- */
-typedef struct _ProtobufCMessageUnknownField ProtobufCMessageUnknownField;
-struct _ProtobufCMessage
-{
-  const ProtobufCMessageDescriptor *descriptor;
-  unsigned n_unknown_fields;
-  ProtobufCMessageUnknownField *unknown_fields;
-};
-#define PROTOBUF_C_MESSAGE_INIT(descriptor) { descriptor, 0, NULL }
-
-/* To pack a message: you have two options:
-   (1) you can compute the size of the message
-       using protobuf_c_message_get_packed_size()
-       then pass protobuf_c_message_pack() a buffer of
-       that length.
-   (2) Provide a virtual buffer (a ProtobufCBuffer) to
-       accept data as we scan through it.
- */
-size_t    protobuf_c_message_get_packed_size(const ProtobufCMessage *message);
-size_t    protobuf_c_message_pack           (const ProtobufCMessage *message,
-                                             uint8_t                *out);
-size_t    protobuf_c_message_pack_to_buffer (const ProtobufCMessage *message,
-                                             ProtobufCBuffer  *buffer);
-
-ProtobufCMessage *
-          protobuf_c_message_unpack         (const ProtobufCMessageDescriptor *,
-                                             ProtobufCAllocator  *allocator,
-                                             size_t               len,
-                                             const uint8_t       *data);
-void      protobuf_c_message_free_unpacked  (ProtobufCMessage    *message,
-                                             ProtobufCAllocator  *allocator);
-
-/* WARNING: 'message' must be a block of memory
-   of size descriptor->sizeof_message. */
-#define protobuf_c_message_init(descriptor, message) ((descriptor)->message_init((ProtobufCMessage*) (message)))
-
-/* --- services --- */
-typedef struct _ProtobufCMethodDescriptor ProtobufCMethodDescriptor;
-typedef struct _ProtobufCServiceDescriptor ProtobufCServiceDescriptor;
-
-struct _ProtobufCMethodDescriptor
-{
-  const char *name;
-  const ProtobufCMessageDescriptor *input;
-  const ProtobufCMessageDescriptor *output;
-};
-struct _ProtobufCServiceDescriptor
-{
-  uint32_t magic;
-
-  const char *name;
-  const char *short_name;
-  const char *c_name;
-  const char *package;
-  unsigned n_methods;
-  const ProtobufCMethodDescriptor *methods;	/* in order from .proto file */
-  const unsigned *method_indices_by_name;
-};
-
-typedef struct _ProtobufCService ProtobufCService;
-typedef void (*ProtobufCClosure)(const ProtobufCMessage *message,
-                                 void                   *closure_data);
-struct _ProtobufCService
-{
-  const ProtobufCServiceDescriptor *descriptor;
-  void (*invoke)(ProtobufCService *service,
-                 unsigned          method_index,
-                 const ProtobufCMessage *input,
-                 ProtobufCClosure  closure,
-                 void             *closure_data);
-  void (*destroy) (ProtobufCService *service);
-};
-
-
-void protobuf_c_service_destroy (ProtobufCService *);
-
-
-/* --- querying the descriptors --- */
-const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value_by_name
-                         (const ProtobufCEnumDescriptor    *desc,
-                          const char                       *name);
-const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value
-                         (const ProtobufCEnumDescriptor    *desc,
-                          int                               value);
-const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field_by_name
-                         (const ProtobufCMessageDescriptor *desc,
-                          const char                       *name);
-const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field
-                         (const ProtobufCMessageDescriptor *desc,
-                          unsigned                          value);
-const ProtobufCMethodDescriptor *
-protobuf_c_service_descriptor_get_method_by_name
-                         (const ProtobufCServiceDescriptor *desc,
-                          const char                       *name);
-
-/* --- wire format enums --- */
-typedef enum
-{
-  PROTOBUF_C_WIRE_TYPE_VARINT,
-  PROTOBUF_C_WIRE_TYPE_64BIT,
-  PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED,
-  PROTOBUF_C_WIRE_TYPE_START_GROUP,     /* unsupported */
-  PROTOBUF_C_WIRE_TYPE_END_GROUP,       /* unsupported */
-  PROTOBUF_C_WIRE_TYPE_32BIT
-} ProtobufCWireType;
-
-/* --- unknown message fields --- */
-struct _ProtobufCMessageUnknownField
-{
-  uint32_t tag;
-  ProtobufCWireType wire_type;
-  size_t len;
-  uint8_t *data;
-};
-
-/* --- extra (superfluous) api:  trivial buffer --- */
-typedef struct _ProtobufCBufferSimple ProtobufCBufferSimple;
-struct _ProtobufCBufferSimple
-{
-  ProtobufCBuffer base;
-  size_t alloced;
-  size_t len;
-  uint8_t *data;
-  protobuf_c_boolean must_free_data;
-};
-#define PROTOBUF_C_BUFFER_SIMPLE_INIT(array_of_bytes) \
-{ { protobuf_c_buffer_simple_append }, \
-  sizeof(array_of_bytes), 0, (array_of_bytes), 0 }
-#define PROTOBUF_C_BUFFER_SIMPLE_CLEAR(simp_buf) \
-  do { if ((simp_buf)->must_free_data) \
-         protobuf_c_default_allocator.free (&protobuf_c_default_allocator.allocator_data, (simp_buf)->data); } while (0)
-
-/* ====== private ====== */
-#include "protobuf-c-private.h"
-
-
-PROTOBUF_C_END_DECLS
-
-#endif /* __PROTOBUF_C_RUNTIME_H_ */
diff --git a/navit/maptool/osm_protobuf.c b/navit/maptool/osm_protobuf.c
index b6af3adef..4f71010e4 100644
--- a/navit/maptool/osm_protobuf.c
+++ b/navit/maptool/osm_protobuf.c
@@ -26,8 +26,8 @@
 #include "debug.h"
 #include "linguistics.h"
 #include "file.h"
-#include "generated-code/fileformat.pb-c.h"
-#include "generated-code/osmformat.pb-c.h"
+#include "fileformat.pb-c.h"
+#include "osmformat.pb-c.h"
 
 
 static double latlon_scale=10000000.0;
@@ -57,7 +57,7 @@ static OSMPBF__BlobHeader *read_header(FILE *f) {
     buffer=alloca(len);
     if (fread(buffer, len, 1, f) != 1)
         return NULL;
-    return osmpbf__blob_header__unpack(&protobuf_c_system_allocator, len, buffer);
+    return osmpbf__blob_header__unpack(NULL, len, buffer);
 }
 
 
@@ -66,7 +66,7 @@ static OSMPBF__Blob *read_blob(OSMPBF__BlobHeader *header, FILE *f, unsigned cha
     SANITY_CHECK_LENGTH(len, MAX_BLOB_LENGTH)
     if (fread(buffer, len, 1, f) != 1)
         return NULL;
-    return osmpbf__blob__unpack(&protobuf_c_system_allocator, len, buffer);
+    return osmpbf__blob__unpack(NULL, len, buffer);
 }
 
 static unsigned char *uncompress_blob(OSMPBF__Blob *blob) {
@@ -136,8 +136,8 @@ static int get_string(char *buffer, int buffer_size, OSMPBF__PrimitiveBlock *pri
 
 static void process_osmheader(OSMPBF__Blob *blob, unsigned char *data) {
     OSMPBF__HeaderBlock *header_block;
-    header_block=osmpbf__header_block__unpack(&protobuf_c_system_allocator, blob->raw_size, data);
-    osmpbf__header_block__free_unpacked(header_block, &protobuf_c_system_allocator);
+    header_block=osmpbf__header_block__unpack(NULL, blob->raw_size, data);
+    osmpbf__header_block__free_unpacked(header_block, NULL);
 }
 
 #if 0
@@ -245,7 +245,7 @@ static void process_relation(OSMPBF__PrimitiveBlock *primitive_block, OSMPBF__Re
 static void process_osmdata(OSMPBF__Blob *blob, unsigned char *data, struct maptool_osm *osm) {
     int i,j;
     OSMPBF__PrimitiveBlock *primitive_block;
-    primitive_block=osmpbf__primitive_block__unpack(&protobuf_c_system_allocator, blob->raw_size, data);
+    primitive_block=osmpbf__primitive_block__unpack(NULL, blob->raw_size, data);
     for (i = 0 ; i < primitive_block->n_primitivegroup ; i++) {
         OSMPBF__PrimitiveGroup *primitive_group=primitive_block->primitivegroup[i];
         process_dense(primitive_block, primitive_group->dense, osm);
@@ -254,7 +254,7 @@ static void process_osmdata(OSMPBF__Blob *blob, unsigned char *data, struct mapt
         for (j = 0 ; j < primitive_group->n_relations ; j++)
             process_relation(primitive_block, primitive_group->relations[j], osm);
     }
-    osmpbf__primitive_block__free_unpacked(primitive_block, &protobuf_c_system_allocator);
+    osmpbf__primitive_block__free_unpacked(primitive_block, NULL);
 }
 
 
@@ -277,8 +277,8 @@ int map_collect_data_osm_protobuf(FILE *in, struct maptool_osm *osm) {
             return 0;
         }
         g_free(data);
-        osmpbf__blob__free_unpacked(blob, &protobuf_c_system_allocator);
-        osmpbf__blob_header__free_unpacked(header, &protobuf_c_system_allocator);
+        osmpbf__blob__free_unpacked(blob, NULL);
+        osmpbf__blob_header__free_unpacked(header, NULL);
     }
     g_free(buffer);
     return 1;
diff --git a/navit/maptool/osm_protobufdb.c b/navit/maptool/osm_protobufdb.c
index 79897eafb..64b601280 100644
--- a/navit/maptool/osm_protobufdb.c
+++ b/navit/maptool/osm_protobufdb.c
@@ -26,8 +26,8 @@
 #include "debug.h"
 #include "linguistics.h"
 #include "file.h"
-#include "generated-code/fileformat.pb-c.h"
-#include "generated-code/osmformat.pb-c.h"
+#include "fileformat.pb-c.h"
+#include "osmformat.pb-c.h"
 
 static double latlon_scale=10000000.0;
 
@@ -125,8 +125,8 @@ static int osm_protobufdb_finish_block(struct osm_protobufdb_context *ctx) {
     blob->raw.len=len;
     blob->raw_size=len;
     osm_protobufdb_write_blob(blob, ctx->f);
-    osmpbf__blob__free_unpacked(blob, &protobuf_c_system_allocator);
-    osmpbf__primitive_block__free_unpacked(ctx->pb, &protobuf_c_system_allocator);
+    osmpbf__blob__free_unpacked(blob, NULL);
+    osmpbf__primitive_block__free_unpacked(ctx->pb, NULL);
     ctx->pb=NULL;
     ctx->current_block++;
     return 1;
@@ -285,7 +285,7 @@ static void osm_protobufdb_modify_node(OSMPBF__Node *node, OSMPBF__Info *info, i
     *n=*node;
     if (!info) {
         if (old_info)
-            osmpbf__info__free_unpacked(old_info, &protobuf_c_system_allocator);
+            osmpbf__info__free_unpacked(old_info, NULL);
         n->info=NULL;
     } else {
         if (old_info)
@@ -325,7 +325,7 @@ static void osm_protobufdb_modify_way(OSMPBF__Way *way, OSMPBF__Info *info, int
     }
     if (!info) {
         if (old_info)
-            osmpbf__info__free_unpacked(old_info, &protobuf_c_system_allocator);
+            osmpbf__info__free_unpacked(old_info, NULL);
         w->info=NULL;
     } else {
         if (old_info)
@@ -368,7 +368,7 @@ static void osm_protobufdb_modify_relation(OSMPBF__Relation *relation, OSMPBF__I
     }
     if (!info) {
         if (old_info)
-            osmpbf__info__free_unpacked(old_info, &protobuf_c_system_allocator);
+            osmpbf__info__free_unpacked(old_info, NULL);
         r->info=NULL;
     } else {
         if (old_info)
diff --git a/navit/maptool/osmformat.proto b/navit/maptool/osmformat.proto
index 560d71deb..78d747ef6 100644
--- a/navit/maptool/osmformat.proto
+++ b/navit/maptool/osmformat.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
 option java_package = "crosby.binary";
 package OSMPBF;
 
@@ -206,4 +207,3 @@ message Relation {
    repeated sint64 memids = 9 [packed = true]; // DELTA encoded
    repeated MemberType types = 10 [packed = true];
 }
-
diff --git a/navit/navit.c b/navit/navit.c
index 84af773e2..90935786d 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -115,7 +115,8 @@ struct navit {
     GList *mapsets;
     GList *layouts;
     struct gui *gui;
-    struct layout *layout_current;
+    char *default_layout_name;	/*!< The default layout indicated by the config file (if any) */
+    struct layout *layout_current;	/*!< The current layout theme used to display the map */
     struct graphics *gra;
     struct action *action;
     struct transformation *trans, *trans_cursor;
@@ -1343,6 +1344,7 @@ navit_new(struct attr *parent, struct attr **attrs) {
     this_->tracking_flag=1;
     this_->recentdest_count=10;
     this_->osd_configuration=-1;
+    this_->default_layout_name=NULL;
 
     this_->center_timeout = 10;
     this_->use_mousewheel = 1;
@@ -2406,11 +2408,19 @@ static int navit_set_attr_do(struct navit *this_, struct attr *attr, int init) {
         attr_updated=(this_->vehicle->follow_curr != attr->u.num);
         this_->vehicle->follow_curr = attr->u.num;
         break;
+    case attr_default_layout:
+        if(!attr->u.str)
+            return 0;
+        if(this_->default_layout_name)	/* There is already a default layout, ignore this new value */
+            g_free(this_->default_layout_name);	/* Drop the previous layout name, use the this one instead */
+        this_->default_layout_name=g_strdup(attr->u.str);
+        attr_updated=1;
+        break;
     case attr_layout:
         if(!attr->u.layout)
             return 0;
         if(this_->layout_current!=attr->u.layout) {
-            this_->layout_current=attr->u.layout;
+            navit_update_current_layout(this_, attr->u.layout);
             graphics_font_destroy_all(this_->gra);
             navit_set_cursors(this_);
             if (this_->ready == 3)
@@ -2789,6 +2799,58 @@ int navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr,
     return ret;
 }
 
+/**
+ * @brief Select the default layout by name
+ *
+ * @param this_ The navit instance
+ * @param name The new default layout's name
+ *
+ * @return The first layout match (if any), or NULL if there was no match
+ */
+struct layout *navit_get_layout_by_name(struct navit *this_, const char *layout_name) {
+    struct attr_iter *iter;
+    struct attr layout_attr;
+    struct layout *result = NULL;
+
+    if (!layout_name)
+        return NULL;
+    iter=navit_attr_iter_new();
+    while (navit_get_attr(this_, attr_layout, &layout_attr, iter)) {
+        if (strcmp(layout_attr.u.layout->name, layout_name) == 0) {
+            result = layout_attr.u.layout;
+        }
+    }
+    navit_attr_iter_destroy(iter);
+    return result;
+}
+
+/**
+ * @brief Set the current layout
+ *
+ * @param this_ The navit instance
+ * @param layout The layout to set as default (if NULL, we will set the current layout according to the default name stored in this_->default_layout_name
+ *
+ * @note If argument @p layout is NULL and the default layout name in the config file does not exist or has not been provided in the config file, the default layout is unchanged
+ */
+void navit_update_current_layout(struct navit *this_, struct layout *layout) {
+    struct layout *default_layout = NULL;
+
+    if (layout) {
+        this_->layout_current=layout;
+    } else {
+        if (this_->default_layout_name) {	/* If a default layout name was provided */
+            default_layout=navit_get_layout_by_name(this_, this_->default_layout_name);
+            if (default_layout) {
+                dbg(lvl_debug, "Found the config-specified default layout '%s'", this_->default_layout_name);
+                this_->layout_current=default_layout;
+                return;
+            } else {
+                dbg(lvl_warning, "No definition exists in config for specified default layout '%s'", this_->default_layout_name);
+            }
+        }
+    }
+}
+
 static int navit_add_log(struct navit *this_, struct log *log) {
     struct attr type_attr;
     if (!log_get_attr(log, attr_type, &type_attr, NULL))
diff --git a/navit/navit.h b/navit/navit.h
index 898ff6cff..7125c1878 100644
--- a/navit/navit.h
+++ b/navit/navit.h
@@ -39,6 +39,7 @@ struct coord_rect;
 struct displaylist;
 struct graphics;
 struct gui;
+struct layout;
 struct mapset;
 struct message;
 struct navigation;
@@ -103,6 +104,8 @@ void navit_set_center_cursor(struct navit *this_, int autozoom, int keep_orienta
 void navit_set_center_screen(struct navit *this_, struct point *p, int set_timeout);
 int navit_set_attr(struct navit *this_, struct attr *attr);
 int navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
+struct layout *navit_get_layout_by_name(struct navit *this_, const char *layout_name);
+void navit_update_current_layout(struct navit *this_, struct layout *layout);
 int navit_add_attr(struct navit *this_, struct attr *attr);
 int navit_remove_attr(struct navit *this_, struct attr *attr);
 struct attr_iter *navit_attr_iter_new(void);
diff --git a/navit/navit_layout_bike_shipped.xml b/navit/navit_layout_bike_shipped.xml
new file mode 100644
index 000000000..dd5a9943a
--- /dev/null
+++ b/navit/navit_layout_bike_shipped.xml
@@ -0,0 +1,1052 @@
+<?xml version="1.0"?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude" name="Bike" color="#ffefb7" font="Liberation Sans">
+	<cursor w="26" h="26">
+		<itemgra>
+			<circle color="#0000ff" radius="24" width="2">
+				<coord x="0" y="0"/>
+			</circle>
+		</itemgra>
+		<itemgra speed_range="-2">
+			<polyline color="#0000ff" width="2">
+				<coord x="0" y="0"/>
+				<coord x="0" y="0"/>
+			</polyline>
+		</itemgra>
+		<itemgra speed_range="3-">
+			<polyline color="#0000ff" width="2">
+				<coord x="-7" y="-10"/>
+				<coord x="0" y="12"/>
+				<coord x="7" y="-10"/>
+			</polyline>
+		</itemgra>
+	</cursor>
+	<layer name="Landuse">
+		<itemgra item_types="image" order="0-">
+			<image/>
+		</itemgra>
+		<itemgra item_types="poly_wood" order="0-">
+			<polygon color="#8ec78d"/>
+		</itemgra>
+		<itemgra item_types="poly_town" order="0-">
+			<polygon color="#ffc895"/>
+			<polyline color="#ebb481"/>
+		</itemgra>
+		<itemgra item_types="poly_park" order="0-">
+			<polygon color="#7cc334"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_water" order="0-">
+			<polygon color="#82c8ea"/>
+			<polyline color="#5096b8"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_land" order="0-">
+			<polygon color="#ffefb7"/>
+			<polyline color="#ffefb7"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_airport" order="0-">
+			<polygon color="#a0a0a0"/>
+		</itemgra>
+		<itemgra item_types="poly_sport" order="0-">
+			<polygon color="#ff8c00"/>
+		</itemgra>
+		<itemgra item_types="poly_industry,poly_place,poly_railway" order="0-">
+			<polygon color="#e6e6e6"/>
+		</itemgra>
+		<itemgra item_types="poly_commercial" order="0-">
+			<polygon color="#fff8dc"/>
+		</itemgra>
+		<itemgra item_types="poly_industry,poly_building,poly_place,poly_brownfield,poly_greenfield,poly_construction,poly_railway" order="0-">
+			<polygon color="#ecd8ff"/>
+		</itemgra>
+		<itemgra item_types="poly_farm" order="0-">
+			<polygon color="#c7f1a3"/>
+			<polyline color="#79c691"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_meadow" order="0-">
+			<polygon color="#c7f1a3"/>
+			<polyline color="#79c691"/>
+		</itemgra>
+		<itemgra item_types="poly_scree,poly_scrub,poly_fell,poly_heath" order="0-">
+			<polygon color="#c7f1a3"/>
+			<polyline color="#79c691"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_marsh,poly_mud,poly_quarry" order="0-">
+			<polygon color="#DEB887"/>
+			<polyline color="#DEB887"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_allotments,poly_playground,poly_village_green,poly_recreation_ground,poly_common,poly_garden" order="0-">
+			<polygon color="#c7f1a3"/>
+			<polyline color="#79c691"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_ruins" order="0-">
+			<polygon color="#b6a6a6"/>
+		</itemgra>
+		<itemgra item_types="poly_apron" order="0-">
+			<polygon color="#d0d0d0"/>
+		</itemgra>
+		<itemgra item_types="poly_terminal" order="7-">
+			<polygon color="#e3c6a6"/>
+		</itemgra>
+		<itemgra item_types="poly_cemetery" order="1-">
+			<polygon color="#bde3cb"/>
+		</itemgra>
+		<itemgra item_types="poly_car_parking" order="1-">
+			<polygon color="#d2d2d2"/>
+		</itemgra>
+		<itemgra item_types="poly_building" order="0-">
+			<polygon color="#ff6347"/>
+		</itemgra>
+	</layer>
+	<layer name="Contour Lines">
+		<itemgra item_types="height_line_1" order="8">
+			<polyline color="#A9A9A9" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="height_line_1" order="9">
+			<polyline color="#A9A9A9" width="2"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="height_line_2" order="9">
+			<polyline color="#A9A9A9" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="height_line_1" order="10-">
+			<polyline color="#A9A9A9" width="3"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="height_line_2" order="10-">
+			<polyline color="#A9A9A9" width="2"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="height_line_3" order="10-">
+			<polyline color="#A9A9A9" width="1"/>
+		</itemgra>
+	</layer>
+	<!-- "Contour Lines" -->
+	<layer name="Barriers">
+		<itemgra item_types="ditch" order="8-">
+			<polyline color="#B8860B" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="hedge" order="8-">
+			<polyline color="#90EE90" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="fence" order="8-">
+			<polyline color="#808080" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="wall" order="8-">
+			<polyline color="#808080" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="retaining_wall" order="8-">
+			<polyline color="#808080" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="city_wall" order="8-">
+			<polyline color="#CD5C5C" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+	</layer>
+	<!-- "Barriers" -->
+	<layer name="Waterways">
+		<itemgra item_types="water_line" order="0-">
+			<polyline color="#82c8ea" width="2"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="0-">
+			<polyline color="#82c8ea" width="4"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="0-">
+			<polyline color="#82c8ea" width="3"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_stream" order="0-">
+			<polyline color="#82c8ea" width="2"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_drain" order="0-">
+			<polyline color="#82c8ea" width="1"/>
+			<text text_size="5"/>
+		</itemgra>
+	</layer>
+	<layer name="Borders">
+		<itemgra item_types="border_state" order="0-5">
+			<polyline color="#778899" width="3"/>
+			<polyline color="#ffefb7" dash="3,2,1,3" width="1"/>
+		</itemgra>
+		<itemgra item_types="border_country" order="0-5">
+			<polyline color="#778899" width="2"/>
+			<polyline color="#ffefb7" dash="3,2,1,3" width="1"/>
+		</itemgra>
+		<itemgra item_types="border_state" order="6-11">
+			<polyline color="#778899" width="3"/>
+			<polyline color="#ffefb7" dash="6,6,1,6" width="1"/>
+		</itemgra>
+		<itemgra item_types="border_country" order="6-11">
+			<polyline color="#778899" width="2"/>
+			<polyline color="#ffefb7" dash="6,6,1,6" width="1"/>
+		</itemgra>
+		<itemgra item_types="border_state" order="12-20">
+			<polyline color="#778899" width="3"/>
+			<polyline color="#ffefb7" dash="10,10,2,10" width="1"/>
+		</itemgra>
+		<itemgra item_types="border_country" order="12-20">
+			<polyline color="#778899" width="2"/>
+			<polyline color="#ffefb7" dash="10,10,2,10" width="1"/>
+		</itemgra>
+	</layer>
+	<layer name="Current Route">
+		<itemgra item_types="street_route" order="2">
+			<polyline color="#FF00FF" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="3-5">
+			<polyline color="#FF00FF" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="6">
+			<polyline color="#FF00FF" width="10"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="7-8">
+			<polyline color="#FF00FF" width="16"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="9-10">
+			<polyline color="#FF00FF" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="11">
+			<polyline color="#FF00FF" width="28"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="12">
+			<polyline color="#FF00FF" width="32"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="13">
+			<polyline color="#FF00FF" width="52"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="14">
+			<polyline color="#FF00FF" width="64"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="15">
+			<polyline color="#FF00FF" width="68"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="16">
+			<polyline color="#FF00FF" width="132"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="17">
+			<polyline color="#FF00FF" width="268"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="18">
+			<polyline color="#FF00FF" width="530"/>
+		</itemgra>
+	</layer>
+	<layer name="Ways and Paths">
+		<itemgra item_types="powerline" order="12-">
+			<polyline color="#778899" width="1"/>
+			<polyline color="#778899" dash="1,80" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_nopass" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_paved" order="8-">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#fefefe" width="3"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="9-">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="track_unpaved" order="10-">
+			<polyline color="#d2d2d2" width="3"/>
+			<polyline color="#fefefe" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_ground" order="11-">
+			<polyline color="#d2d2d2" width="3"/>
+			<polyline color="#fefefe" width="1" dash="6,6"/>
+		</itemgra>
+		<itemgra item_types="track_grass" order="12-">
+			<polyline color="#fefefe" width="2"/>
+			<polyline color="#ffefb7" width="1" dash="6,6"/>
+		</itemgra>
+		<itemgra item_types="bridleway" order="10-">
+			<polyline color="#8b4513" width="3"/>
+			<polyline color="#f4a460" width="1"/>
+		</itemgra>
+		<itemgra item_types="cycleway" order="10-">
+			<polyline color="#006400" width="4"/>
+			<polyline color="#3cb371" width="2"/>
+		</itemgra>
+		<itemgra item_types="footway" order="12-">
+			<polyline color="#8b4513" width="3"/>
+			<polyline color="#CD853F" width="1"/>
+		</itemgra>
+		<itemgra item_types="steps" order="12-">
+			<polyline color="#8b4513" width="3"/>
+			<polyline color="#F4A460" width="1" dash="6,4"/>
+		</itemgra>
+		<itemgra item_types="path" order="11-">
+			<polyline color="#8b4513" width="3"/>
+			<polyline color="#ffefb7" width="1" dash="2,4"/>
+		</itemgra>
+		<itemgra item_types="hiking" order="11-">
+			<polyline color="#8b4513" width="2"/>
+			<polyline color="#ffefb7" width="1" dash="4,4"/>
+		</itemgra>
+		<itemgra item_types="hiking_mountain" order="11-">
+			<polyline color="#8b4513" width="2"/>
+			<polyline color="#ffefb7" width="1" dash="6,4"/>
+		</itemgra>
+		<itemgra item_types="hiking_mountain_demanding" order="13-">
+			<polyline color="#8b4513" width="2"/>
+			<polyline color="#ffefb7" width="1" dash="8,4"/>
+		</itemgra>
+		<itemgra item_types="hiking_alpine" order="13-">
+			<polyline color="#8b4513" width="1" dash="10,4"/>
+		</itemgra>
+		<itemgra item_types="hiking_alpine_demanding" order="14-">
+			<polyline color="#8b4513" width="1" dash="12,4"/>
+		</itemgra>
+		<itemgra item_types="hiking_alpine_difficult" order="14-">
+			<polyline color="#8b4513" width="1" dash="14,4"/>
+		</itemgra>
+	</layer>
+	<layer name="Streets">
+		<itemgra item_types="poly_pedestrian,poly_plaza" order="0-">
+			<polygon color="#d2d2d2"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="10">
+			<polyline color="#d2d2d2" width="3"/>
+			<polyline color="#dddddd" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="11">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#dddddd" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="12">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#dddddd" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="13">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#dddddd" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="14">
+			<polyline color="#d2d2d2" width="13"/>
+			<polyline color="#dddddd" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#dddddd" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="16">
+			<polyline color="#d2d2d2" width="21"/>
+			<polyline color="#dddddd" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="17">
+			<polyline color="#d2d2d2" width="25"/>
+			<polyline color="#dddddd" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="18">
+			<polyline color="#d2d2d2" width="40"/>
+			<polyline color="#dddddd" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="9">
+			<polyline color="#d2d2d2" width="2"/>
+			<polyline color="#fefefe" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="10">
+			<polyline color="#d2d2d2" width="3"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="11">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="12">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#fefefe" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="13">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#fefefe" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="14">
+			<polyline color="#d2d2d2" width="7"/>
+			<polyline color="#fefefe" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="15">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#fefefe" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="16">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#fefefe" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="17">
+			<polyline color="#d2d2d2" width="10"/>
+			<polyline color="#fefefe" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="18">
+			<polyline color="#d2d2d2" width="11"/>
+			<polyline color="#fefefe" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="12">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="13">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="14">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#fefefe" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="15">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#fefefe" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="16">
+			<polyline color="#d2d2d2" width="7"/>
+			<polyline color="#fefefe" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="17">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#fefefe" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="18">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#fefefe" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="8-10">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#ffffff" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#ffffff" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
+			<polyline color="#d2d2d2" width="10"/>
+			<polyline color="#ffffff" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
+			<polyline color="#d2d2d2" width="12"/>
+			<polyline color="#ffffff" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
+			<polyline color="#d2d2d2" width="15"/>
+			<polyline color="#ffffff" width="13"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
+			<polyline color="#d2d2d2" width="17"/>
+			<polyline color="#ffffff" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
+			<polyline color="#d2d2d2" width="33"/>
+			<polyline color="#ffffff" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
+			<polyline color="#d2d2d2" width="69"/>
+			<polyline color="#ffffff" width="61"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
+			<polyline color="#d2d2d2" width="132"/>
+			<polyline color="#ffffff" width="126"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="7-8">
+			<polyline color="#c0c0c0" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="9">
+			<polyline color="#c0c0c0" width="3"/>
+			<polyline color="#ffff00" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="10">
+			<polyline color="#c0c0c0" width="4"/>
+			<polyline color="#ffff00" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="11">
+			<polyline color="#c0c0c0" width="5"/>
+			<polyline color="#ffff00" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="12">
+			<polyline color="#c0c0c0" width="7"/>
+			<polyline color="#ffff00" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="13">
+			<polyline color="#c0c0c0" width="11"/>
+			<polyline color="#ffff00" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="14">
+			<polyline color="#c0c0c0" width="14"/>
+			<polyline color="#ffff00" width="11"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="15">
+			<polyline color="#c0c0c0" width="19"/>
+			<polyline color="#ffff00" width="15"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="16">
+			<polyline color="#c0c0c0" width="30"/>
+			<polyline color="#ffff00" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="17">
+			<polyline color="#c0c0c0" width="63"/>
+			<polyline color="#ffff00" width="57"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="18">
+			<polyline color="#c0c0c0" width="100"/>
+			<polyline color="#ffff00" width="90"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="7-8">
+			<polyline color="#a0a0a0" width="3"/>
+			<polyline color="#ffff00" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="9">
+			<polyline color="#a0a0a0" width="5"/>
+			<polyline color="#ffff00" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="10">
+			<polyline color="#a0a0a0" width="8"/>
+			<polyline color="#ffff00" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="11">
+			<polyline color="#a0a0a0" width="9"/>
+			<polyline color="#ffff00" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="12">
+			<polyline color="#a0a0a0" width="13"/>
+			<polyline color="#ffff00" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="13">
+			<polyline color="#a0a0a0" width="18"/>
+			<polyline color="#ffff00" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="14">
+			<polyline color="#a0a0a0" width="21"/>
+			<polyline color="#ffff00" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="15">
+			<polyline color="#a0a0a0" width="25"/>
+			<polyline color="#ffff00" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="16">
+			<polyline color="#a0a0a0" width="40"/>
+			<polyline color="#ffff00" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="17">
+			<polyline color="#a0a0a0" width="79"/>
+			<polyline color="#ffff00" width="73"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="18">
+			<polyline color="#a0a0a0" width="156"/>
+			<polyline color="#ffff00" width="150"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
+			<polyline color="#404040" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
+			<polyline color="#404040" width="3"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
+			<polyline color="#000000" width="5"/>
+			<polyline color="#ff0000" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
+			<polyline color="#000000" width="6"/>
+			<polyline color="#ff0000" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
+			<polyline color="#000000" width="9"/>
+			<polyline color="#ff0000" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
+			<polyline color="#000000" width="13"/>
+			<polyline color="#ff0000" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
+			<polyline color="#000000" width="18"/>
+			<polyline color="#ff0000" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
+			<polyline color="#000000" width="21"/>
+			<polyline color="#ff0000" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
+			<polyline color="#000000" width="24"/>
+			<polyline color="#ff0000" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
+			<polyline color="#000000" width="39"/>
+			<polyline color="#ff0000" width="33"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
+			<polyline color="#000000" width="78"/>
+			<polyline color="#ff0000" width="72"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
+			<polyline color="#000000" width="156"/>
+			<polyline color="#ff0000" width="150"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="2">
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="3-5">
+			<polyline color="#ff0000" width="3"/>
+			<polyline color="#ffff00" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="6">
+			<polyline color="#ff0000" width="4"/>
+			<polyline color="#ffff00" width="2"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="7-8">
+			<polyline color="#ff0000" width="7"/>
+			<polyline color="#ffff00" width="5"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="9-10">
+			<polyline color="#ff0000" width="9"/>
+			<polyline color="#ffff00" width="5"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="11">
+			<polyline color="#ff0000" width="13"/>
+			<polyline color="#ffff00" width="9"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="12">
+			<polyline color="#ff0000" width="15"/>
+			<polyline color="#ffff00" width="10"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="13">
+			<polyline color="#ff0000" width="25"/>
+			<polyline color="#ffff00" width="17"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="14">
+			<polyline color="#ff0000" width="31"/>
+			<polyline color="#ffff00" width="24"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="15">
+			<polyline color="#ff0000" width="33"/>
+			<polyline color="#ffff00" width="27"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="16">
+			<polyline color="#ff0000" width="65"/>
+			<polyline color="#ffff00" width="59"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="17">
+			<polyline color="#ff0000" width="133"/>
+			<polyline color="#ffff00" width="127"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="18">
+			<polyline color="#ff0000" width="264"/>
+			<polyline color="#ffff00" width="258"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+	</layer>
+	<layer name="Aerialways">
+		<itemgra item_types="aeroway_taxiway" order="10">
+			<polyline color="#989994" width="4"/>
+			<polyline color="#d3dbbc" width="2"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="11">
+			<polyline color="#989994" width="6"/>
+			<polyline color="#d3dbbc" width="4"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="12">
+			<polyline color="#989994" width="10"/>
+			<polyline color="#d3dbbc" width="8"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="13">
+			<polyline color="#989994" width="12"/>
+			<polyline color="#d3dbbc" width="9"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="14">
+			<polyline color="#989994" width="15"/>
+			<polyline color="#d3dbbc" width="13"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="15">
+			<polyline color="#989994" width="17"/>
+			<polyline color="#d3dbbc" width="14"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="16">
+			<polyline color="#989994" width="33"/>
+			<polyline color="#d3dbbc" width="26"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="17">
+			<polyline color="#989994" width="69"/>
+			<polyline color="#d3dbbc" width="61"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="18">
+			<polyline color="#989994" width="132"/>
+			<polyline color="#d3dbbc" width="126"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="2-6">
+			<polyline color="#404040" width="1"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="7-8">
+			<polyline color="#404040" width="3"/>
+			<polyline color="#d3dbbc" width="1"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="9">
+			<polyline color="#6b6f5f" width="5"/>
+			<polyline color="#d3dbbc" width="3"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="10">
+			<polyline color="#6b6f5f" width="6"/>
+			<polyline color="#d3dbbc" width="4"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="11">
+			<polyline color="#6b6f5f" width="9"/>
+			<polyline color="#d3dbbc" width="7"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="12">
+			<polyline color="#6b6f5f" width="13"/>
+			<polyline color="#d3dbbc" width="9"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="13">
+			<polyline color="#6b6f5f" width="18"/>
+			<polyline color="#d3dbbc" width="14"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="14">
+			<polyline color="#6b6f5f" width="21"/>
+			<polyline color="#d3dbbc" width="17"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="15">
+			<polyline color="#6b6f5f" width="24"/>
+			<polyline color="#d3dbbc" width="20"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="16">
+			<polyline color="#6b6f5f" width="39"/>
+			<polyline color="#d3dbbc" width="33"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="17">
+			<polyline color="#6b6f5f" width="78"/>
+			<polyline color="#d3dbbc" width="72"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="18">
+			<polyline color="#6b6f5f" width="156"/>
+			<polyline color="#d3dbbc" width="150"/>
+		</itemgra>
+	</layer>
+	<layer name="Railways">
+		<itemgra item_types="rail" order="6-9">
+			<polyline color="#696969" width="4"/>
+			<polyline color="#FFFFFF" dash="2,5" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail_narrow_gauge" order="6-9">
+			<polyline color="#696969" width="4"/>
+			<polyline color="#FFFFFF" dash="2,5" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail" order="10-13">
+			<polyline color="#696969" width="6"/>
+			<polyline color="#FFFFFF" dash="3,8" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail_narrow_gauge" order="10-13">
+			<polyline color="#696969" width="6"/>
+			<polyline color="#FFFFFF" dash="3,8" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail" order="14-18">
+			<polyline color="#696969" width="8"/>
+			<polyline color="#FFFFFF" dash="4,12" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail_narrow_gauge" order="14-18">
+			<polyline color="#696969" width="8"/>
+			<polyline color="#FFFFFF" dash="4,12" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail_light" order="10-13">
+			<polyline color="#696969" width="4"/>
+			<polyline color="#FFFFFF" dash="2,5" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail_light" order="14-18">
+			<polyline color="#696969" width="6"/>
+			<polyline color="#FFFFFF" dash="4,8" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail_subway" order="8-">
+			<polyline color="#696969" width="2"/>
+			<polyline color="#FFFFFF" dash="5,5" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail_mono" order="10-">
+			<polyline color="#696969" width="2"/>
+		</itemgra>
+		<itemgra item_types="rail_tram,bus_guideway" order="10-">
+			<polyline color="#696969" width="2"/>
+		</itemgra>
+		<itemgra item_types="rail_preserved" order="10-">
+			<polyline color="#696969" width="1" dash="7"/>
+		</itemgra>
+		<itemgra item_types="rail_disused" order="12-">
+			<polyline color="#d3d3d3" width="1" dash="10"/>
+		</itemgra>
+		<itemgra item_types="rail_abandoned" order="12-">
+			<polyline color="#f5f5f5" width="1" dash="10"/>
+		</itemgra>
+		<itemgra item_types="lift_cable_car" order="10-">
+			<polyline color="#778899" width="5"/>
+			<polyline color="#ffefb7" dash="1,40" width="1"/>
+		</itemgra>
+		<itemgra item_types="lift_chair" order="10-">
+			<polyline color="#778899" width="5"/>
+			<polyline color="#ffefb7" dash="1,40" width="1"/>
+		</itemgra>
+		<itemgra item_types="lift_drag" order="10-">
+			<polyline color="#778899" width="5"/>
+			<polyline color="#ffefb7" dash="1,40" width="1"/>
+		</itemgra>
+		<itemgra item_types="ferry" order="5-">
+			<polyline color="#000000" width="3"/>
+			<polyline color="#ffefb7" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="track" order="3-">
+			<polyline color="#3f3f3f" width="1"/>
+		</itemgra>
+	</layer>
+	<layer name="Internal">
+		<itemgra item_types="track" order="7-">
+			<polyline color="#3f3f3f" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_tracked" order="7-">
+			<polyline color="#3f3fff" width="3"/>
+		</itemgra>
+		<itemgra item_types="rg_segment" order="12-">
+			<polyline color="#FF089C" width="1"/>
+			<arrows color="#FF089C" width="1"/>
+		</itemgra>
+		<itemgra item_types="rg_point" order="12-">
+			<circle color="#FF089C" radius="10" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="nav_left_1" order="0-">
+			<icon src="nav_left_1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_2" order="0-">
+			<icon src="nav_left_2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_3" order="0-">
+			<icon src="nav_left_3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_1" order="0-">
+			<icon src="nav_right_1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_2" order="0-">
+			<icon src="nav_right_2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_3" order="0-">
+			<icon src="nav_right_3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_straight" order="0-">
+			<icon src="nav_straight_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_left" order="0-">
+			<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_right" order="0-">
+			<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l1" order="0-">
+			<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r1" order="0-">
+			<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l2" order="0-">
+			<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r2" order="0-">
+			<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l3" order="0-">
+			<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r3" order="0-">
+			<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l4" order="0-">
+			<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r4" order="0-">
+			<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l5" order="0-">
+			<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r5" order="0-">
+			<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l6" order="0-">
+			<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r6" order="0-">
+			<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l7" order="0-">
+			<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r7" order="0-">
+			<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l8" order="0-">
+			<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r8" order="0-">
+			<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_left" order="0-">
+			<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_left" order="0-">
+			<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_right" order="0-">
+			<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_right" order="0-">
+			<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_left" order="0-">
+			<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_right" order="0-">
+			<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="route_end" order="0-">
+			<icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="2">
+			<circle color="#000000" radius="4" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="3-5">
+			<circle color="#000000" radius="8" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="6">
+			<circle color="#000000" radius="10" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="7-8">
+			<circle color="#000000" radius="16" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="9-10">
+			<circle color="#000000" radius="20" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="11">
+			<circle color="#000000" radius="28" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="12">
+			<circle color="#000000" radius="32" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="13">
+			<circle color="#000000" radius="52" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="14">
+			<circle color="#000000" radius="64" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="15">
+			<circle color="#000000" radius="68" width="6" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="16">
+			<circle color="#000000" radius="132" width="8" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="17">
+			<circle color="#000000" radius="268" width="8" text_size="48"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="18">
+			<circle color="#000000" radius="530" width="8" text_size="48"/>
+		</itemgra>
+		<itemgra item_types="nav_none" order="0-">
+			<icon src="unknown.svg"/>
+		</itemgra>
+		<itemgra item_types="announcement" order="7-">
+			<icon src="gui_sound_32_32.png"/>
+			<circle color="#FF089C" radius="10" text_size="7"/>
+		</itemgra>
+	</layer>
+	<layer name="Street Labels">
+		<itemgra item_types="highway_exit_label" order="10-">
+			<circle color="#000000" radius="3" text_size="12"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land" order="12-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="track,track_paved,track_gravelled,track_unpaved,track_ground,track_grass" order="12-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="bridleway,cycleway,footway,steps,path" order="12-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="hiking,hiking_mountain,hiking_mountain_demanding,hiking_alpine,hiking_alpine_demanding,hiking_alpine_difficult" order="12-18">
+			<text text_size="9"/>
+		</itemgra>
+	</layer>
+	<layer name="Unknown Elements">
+		<!-- This entry shows all unknown linear elements as blue lines -->
+		<!--
+				<itemgra item_types="street_unkn" order="0-">
+					<polyline color="#8080ff" width="3"/>
+				</itemgra>
+				-->
+	</layer>
+	<layer name="Place Labels">
+		<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
+			<circle color="#000000" radius="3" text_size="12"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="9-">
+			<circle color="#000000" radius="3" text_size="12"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="9-">
+			<circle color="#000000" radius="3" text_size="12"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="7-">
+			<circle color="#000000" radius="3" text_size="12"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="7-">
+			<circle color="#000000" radius="3" text_size="12"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="5-">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="3-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+	</layer>
+	<xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
+	<!--<xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
+	<!-- "Bicycle POIs" -->
+	<layer name="Bicycle POI Symbols">
+		<itemgra item_types="poi_bicycle_parking" order="12-">
+			<icon src="bicycle_parking.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bicycle_rental" order="11-">
+			<icon src="bicycle_rental.png"/>
+		</itemgra>
+	</layer>
+	<layer name="Bicycle POI Labels">
+		<itemgra item_types="poi_bicycle_parking,poi_bicycle_rental" order="14-">
+			<circle color="#606060" radius="0" width="0" text_size="10"/>
+		</itemgra>
+	</layer>
+	<layer name="Found items" ref="Found items"/>
+</layout>
diff --git a/navit/navit_layout_car_android_shipped.xml b/navit/navit_layout_car_android_shipped.xml
new file mode 100644
index 000000000..046d52d37
--- /dev/null
+++ b/navit/navit_layout_car_android_shipped.xml
@@ -0,0 +1,1338 @@
+<?xml version="1.0"?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude" name="Car-Android" color="#fef9ee" font="Liberation Sans">
+	<cursor w="57" h="57">
+		<itemgra speed_range="-2">
+			<polyline color="#00BC00" radius="0" width="4">
+				<coord x="0" y="0"/>
+			</polyline>
+			<circle color="#008500" radius="9" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+			<circle color="#00BC00" radius="13" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+			<circle color="#008500" radius="18" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+		</itemgra>
+		<itemgra speed_range="3-">
+			<polygon color="#00000066">
+				<coord x="-21" y="-27"/>
+				<coord x="0" y="12"/>
+				<coord x="21" y="-27"/>
+				<coord x="0" y="-12"/>
+				<coord x="-21" y="-27"/>
+			</polygon>
+			<polygon color="#008500">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="-21" y="-18"/>
+			</polygon>
+			<polygon color="#00BC00">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="21" y="-18"/>
+			</polygon>
+			<polyline color="#008500" width="1">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="-21" y="-18"/>
+			</polyline>
+			<polyline color="#008500" width="1">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="21" y="-18"/>
+			</polyline>
+		</itemgra>
+	</cursor>
+	<layer name="polygons">
+		<itemgra item_types="poly_wood" order="13-">
+			<polygon color="#8ec78d"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_water_tiled">
+			<polygon color="#82c8ea"/>
+		</itemgra>
+		<itemgra item_types="poly_water" order="10-">
+			<polygon color="#82c8ea"/>
+			<polyline color="#5096b8"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="14-">
+			<polygon color="#a0a0a0"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_park" order="14-">
+			<polygon color="#7cc334"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="14">
+			<polyline color="#d2d2d2" width="13"/>
+			<polyline color="#dddddd" width="9"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#dddddd" width="14"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="16">
+			<polyline color="#d2d2d2" width="21"/>
+			<polyline color="#dddddd" width="17"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="17">
+			<polyline color="#d2d2d2" width="25"/>
+			<polyline color="#dddddd" width="21"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="18">
+			<polyline color="#d2d2d2" width="40"/>
+			<polyline color="#dddddd" width="34"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_airport" order="5-">
+			<polygon color="#a0a0a0"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="6-7">
+			<polyline color="#82c8ea" width="3"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="8-9">
+			<polyline color="#82c8ea" width="4"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="10-">
+			<polyline color="#82c8ea" width="4"/>
+			<text text_size="10"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="13-">
+			<polyline color="#82c8ea" width="3"/>
+			<text text_size="10"/>
+		</itemgra>
+		<itemgra item_types="water_stream" order="13-">
+			<polyline color="#82c8ea" width="2"/>
+			<text text_size="7"/>
+		</itemgra>
+		<itemgra item_types="water_drain" order="14-">
+			<polyline color="#82c8ea" width="1"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_apron" order="13-">
+			<polygon color="#d0d0d0"/>
+		</itemgra>
+		<itemgra item_types="poly_terminal" order="14-">
+			<polygon color="#e3c6a6"/>
+		</itemgra>
+		<itemgra item_types="poly_car_parking" order="15-">
+			<polygon color="#e7cf87"/>
+		</itemgra>
+		<itemgra item_types="poly_building" order="14-">
+			<polygon color="#b6a6a6"/>
+		</itemgra>
+		<itemgra item_types="rail" order="13-">
+			<polyline color="#696969" width="3"/>
+			<polyline color="#ffffff" width="1" dash="5,5"/>
+		</itemgra>
+		<itemgra item_types="ferry" order="14-">
+			<polyline color="#000000" width="1" dash="10"/>
+		</itemgra>
+		<itemgra item_types="border_country" order="0-">
+			<polyline color="#808080" width="1" dash="10,5,2,5"/>
+		</itemgra>
+		<itemgra item_types="border_state" order="0-">
+			<polyline color="#808080" width="4"/>
+		</itemgra>
+	</layer>
+	<layer name="streets">
+		<itemgra item_types="street_route" order="2">
+			<polyline color="#69e068" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="3-5">
+			<polyline color="#69e068" width="10"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="6">
+			<polyline color="#69e068" width="12"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="7-8">
+			<polyline color="#69e068" width="16"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="9-10">
+			<polyline color="#69e068" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="11">
+			<polyline color="#69e068" width="28"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="12">
+			<polyline color="#69e068" width="32"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="13">
+			<polyline color="#69e068" width="52"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="14">
+			<polyline color="#69e068" width="64"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="15">
+			<polyline color="#69e068" width="68"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="16">
+			<polyline color="#69e068" width="132"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="17">
+			<polyline color="#69e068" width="268"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="18">
+			<polyline color="#69e068" width="530"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="2">
+			<polyline color="#ba00b8" width="4"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="3-5">
+			<polyline color="#ba00b8" width="8"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="6">
+			<polyline color="#ba00b8" width="10"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="7-8">
+			<polyline color="#ba00b8" width="16"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="9-10">
+			<polyline color="#ba00b8" width="20"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="11">
+			<polyline color="#ba00b8" width="28"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="12">
+			<polyline color="#ba00b8" width="32"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="13">
+			<polyline color="#ba00b8" width="52"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="14">
+			<polyline color="#ba00b8" width="64"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="15">
+			<polyline color="#ba00b8" width="68"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="16">
+			<polyline color="#ba00b8" width="132"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="17">
+			<polyline color="#ba00b8" width="268"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="18">
+			<polyline color="#ba00b8" width="530"/>
+		</itemgra>
+		<itemgra item_types="forest_way_1" order="14-">
+			<polyline color="#0070c0" width="6"/>
+		</itemgra>
+		<itemgra item_types="forest_way_2" order="14-">
+			<polyline color="#ff0000" width="3"/>
+		</itemgra>
+		<itemgra item_types="forest_way_3" order="14-">
+			<polyline color="#ff0000" width="1" dash="2,4"/>
+		</itemgra>
+		<itemgra item_types="forest_way_4" order="14-">
+			<polyline color="#119a2e" width="1" dash="4,10"/>
+		</itemgra>
+		<itemgra item_types="street_nopass" order="14-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_paved" order="14-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="14">
+			<polyline color="#ffffff" width="4"/>
+			<polyline color="#800000" width="1" dash="4,8"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="15-16">
+			<polyline color="#ffffff" width="5"/>
+			<polyline color="#800000" width="1" dash="5,10"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="17-">
+			<polyline color="#ffffff" width="7"/>
+			<polyline color="#800000" width="1" dash="7,15"/>
+		</itemgra>
+		<itemgra item_types="track_unpaved" order="14-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="bridleway" order="14-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="cycleway" order="14-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="lift_cable_car" order="15-">
+			<polyline color="#696969" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="lift_chair" order="15-">
+			<polyline color="#696969" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="lift_drag" order="15-">
+			<polyline color="#696969" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="footway" order="15-16">
+			<polyline color="#ffffff" width="5"/>
+			<polyline color="#ff0000" width="1" dash="5,10"/>
+		</itemgra>
+		<itemgra item_types="footway" order="17-">
+			<polyline color="#ffffff" width="7"/>
+			<polyline color="#ff0000" width="1" dash="7,15"/>
+		</itemgra>
+		<itemgra item_types="steps" order="15-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="14">
+			<polyline color="#d2d2d2" width="13"/>
+			<polyline color="#dddddd" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#dddddd" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="16">
+			<polyline color="#d2d2d2" width="21"/>
+			<polyline color="#dddddd" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="17">
+			<polyline color="#d2d2d2" width="25"/>
+			<polyline color="#dddddd" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="18">
+			<polyline color="#d2d2d2" width="40"/>
+			<polyline color="#dddddd" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="14">
+			<polyline color="#d2d2d2" width="7"/>
+			<polyline color="#fefefe" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="15">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#fefefe" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="16">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#fefefe" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="17">
+			<polyline color="#d2d2d2" width="10"/>
+			<polyline color="#fefefe" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="18">
+			<polyline color="#d2d2d2" width="11"/>
+			<polyline color="#fefefe" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="15">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#fefefe" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="16">
+			<polyline color="#d2d2d2" width="7"/>
+			<polyline color="#fefefe" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="17">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#fefefe" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="18">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#fefefe" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
+			<polyline color="#d2d2d2" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="13-14">
+			<polyline color="#d2d2d2" width="17"/>
+			<polyline color="#ffffff" width="13"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#ffffff" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
+			<polyline color="#d2d2d2" width="30"/>
+			<polyline color="#ffffff" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
+			<polyline color="#d2d2d2" width="67"/>
+			<polyline color="#ffffff" width="61"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
+			<polyline color="#d2d2d2" width="132"/>
+			<polyline color="#ffffff" width="126"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="11-12">
+			<polyline color="#c0c0c0" width="9"/>
+			<polyline color="#fefc8c" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="13-14">
+			<polyline color="#c0c0c0" width="13"/>
+			<polyline color="#fefc8c" width="11"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="15">
+			<polyline color="#c0c0c0" width="19"/>
+			<polyline color="#fefc8c" width="15"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="16">
+			<polyline color="#c0c0c0" width="30"/>
+			<polyline color="#fefc8c" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="17">
+			<polyline color="#c0c0c0" width="63"/>
+			<polyline color="#fefc8c" width="57"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="18">
+			<polyline color="#c0c0c0" width="100"/>
+			<polyline color="#fefc8c" width="90"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="11-12">
+			<polyline color="#a0a0a0" width="9"/>
+			<polyline color="#fefc8c" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="13-14">
+			<polyline color="#a0a0a0" width="21"/>
+			<polyline color="#fefc8c" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="15">
+			<polyline color="#a0a0a0" width="25"/>
+			<polyline color="#fefc8c" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="16">
+			<polyline color="#a0a0a0" width="40"/>
+			<polyline color="#fefc8c" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="17">
+			<polyline color="#a0a0a0" width="79"/>
+			<polyline color="#fefc8c" width="73"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="18">
+			<polyline color="#a0a0a0" width="156"/>
+			<polyline color="#fefc8c" width="150"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
+			<polyline color="#f8dc79" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
+			<polyline color="#f8dc79" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
+			<polyline color="#f8dc79" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
+			<polyline color="#f8dc79" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
+			<polyline color="#000000" width="9"/>
+			<polyline color="#f8dc79" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
+			<polyline color="#000000" width="13"/>
+			<polyline color="#f8dc79" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
+			<polyline color="#000000" width="18"/>
+			<polyline color="#f8dc79" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
+			<polyline color="#000000" width="21"/>
+			<polyline color="#f8dc79" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
+			<polyline color="#000000" width="24"/>
+			<polyline color="#f8dc79" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
+			<polyline color="#000000" width="39"/>
+			<polyline color="#f8dc79" width="33"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
+			<polyline color="#000000" width="78"/>
+			<polyline color="#f8dc79" width="72"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
+			<polyline color="#000000" width="156"/>
+			<polyline color="#f8dc79" width="150"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="0-1">
+			<polyline color="#fc843b" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="2">
+			<polyline color="#fc843b" width="3"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="3-5">
+			<polyline color="#fc843b" width="6"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="6">
+			<polyline color="#fc843b" width="6"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="7-8">
+			<polyline color="#fc843b" width="6"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="9">
+			<polyline color="#fc843b" width="7"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="10">
+			<polyline color="#fc843b" width="9"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="11">
+			<polyline color="#a8aab3" width="13"/>
+			<polyline color="#fc843b" width="9"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="12">
+			<polyline color="#a8aab3" width="15"/>
+			<polyline color="#fc843b" width="10"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="13">
+			<polyline color="#a8aab3" width="25"/>
+			<polyline color="#fc843b" width="17"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="14">
+			<polyline color="#a8aab3" width="31"/>
+			<polyline color="#fc843b" width="24"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="15">
+			<polyline color="#a8aab3" width="33"/>
+			<polyline color="#fc843b" width="27"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="16">
+			<polyline color="#a8aab3" width="65"/>
+			<polyline color="#fc843b" width="59"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="17">
+			<polyline color="#a8aab3" width="133"/>
+			<polyline color="#fc843b" width="127"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="18">
+			<polyline color="#a8aab3" width="264"/>
+			<polyline color="#fc843b" width="258"/>
+			<polyline color="#a8aab3" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_exit_label" order="13-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="13-18">
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="13-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="13-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="7-8">
+			<polyline color="#ff9000" width="8"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="9-10">
+			<polyline color="#ff9000" width="10"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="11">
+			<polyline color="#ff9000" width="14"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="12">
+			<polyline color="#ff9000" width="16"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="13">
+			<polyline color="#ff9000" width="26"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="14">
+			<polyline color="#ff9000" width="32"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="15">
+			<polyline color="#ff9000" width="34"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="16">
+			<polyline color="#ff9000" width="66"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="17">
+			<polyline color="#ff9000" width="134"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="18">
+			<polyline color="#ff9000" width="265"/>
+		</itemgra>
+	</layer>
+	<layer name="polylines">
+		<itemgra item_types="rail_tram" order="13-">
+			<polyline color="#606060" width="2"/>
+		</itemgra>
+	</layer>
+	<layer name="labels">
+		<itemgra item_types="house_number" order="15-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="13-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="12-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e3,place_label" order="10-">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="11-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e3" order="11-">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4" order="11-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="10-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e3" order="10">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="9-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_5e3" order="9-10">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e4" order="8-9">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e4,town_label_5e4" order="7-8">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="5-">
+			<circle color="#000000" radius="3" text_size="20"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="4">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-3">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+	</layer>
+	<layer name="Internal">
+		<itemgra item_types="track" order="7-">
+			<polyline color="#3f3f3f" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_tracked" order="7-">
+			<polyline color="#3f3fff" width="3"/>
+		</itemgra>
+		<itemgra item_types="rg_segment" order="12-">
+			<polyline color="#FF089C" width="1"/>
+			<arrows color="#FF089C" width="1"/>
+		</itemgra>
+		<itemgra item_types="rg_point" order="12-">
+			<circle color="#FF089C" radius="10" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="nav_left_1" order="0-">
+			<icon src="nav_left_1_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_2" order="0-">
+			<icon src="nav_left_2_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_3" order="0-">
+			<icon src="nav_left_3_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_1" order="0-">
+			<icon src="nav_right_1_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_2" order="0-">
+			<icon src="nav_right_2_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_3" order="0-">
+			<icon src="nav_right_3_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_straight" order="0-">
+			<icon src="nav_straight_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_left" order="0-">
+			<icon src="nav_turnaround_left_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_right" order="0-">
+			<icon src="nav_turnaround_right_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l1" order="0-">
+			<icon src="nav_roundabout_l1_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r1" order="0-">
+			<icon src="nav_roundabout_r1_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l2" order="0-">
+			<icon src="nav_roundabout_l2_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r2" order="0-">
+			<icon src="nav_roundabout_r2_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l3" order="0-">
+			<icon src="nav_roundabout_l3_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r3" order="0-">
+			<icon src="nav_roundabout_r3_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l4" order="0-">
+			<icon src="nav_roundabout_l4_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r4" order="0-">
+			<icon src="nav_roundabout_r4_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l5" order="0-">
+			<icon src="nav_roundabout_l5_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r5" order="0-">
+			<icon src="nav_roundabout_r5_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l6" order="0-">
+			<icon src="nav_roundabout_l6_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r6" order="0-">
+			<icon src="nav_roundabout_r6_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l7" order="0-">
+			<icon src="nav_roundabout_l7_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r7" order="0-">
+			<icon src="nav_roundabout_r7_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l8" order="0-">
+			<icon src="nav_roundabout_l8_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r8" order="0-">
+			<icon src="nav_roundabout_r8_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_left" order="0-">
+			<icon src="nav_keep_left_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_left" order="0-">
+			<icon src="nav_merge_left_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_right" order="0-">
+			<icon src="nav_keep_right_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_right" order="0-">
+			<icon src="nav_merge_right_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_left" order="0-">
+			<icon src="nav_exit_left_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_right" order="0-">
+			<icon src="nav_exit_right_bk.png" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="route_end" order="0-">
+			<icon src="nav_destination_bk.png" w="32" h="32" x="4" y="30"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="2">
+			<circle color="#000000" radius="4" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="3-5">
+			<circle color="#000000" radius="8" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="6">
+			<circle color="#000000" radius="10" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="7-8">
+			<circle color="#000000" radius="16" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="9-10">
+			<circle color="#000000" radius="20" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="11">
+			<circle color="#000000" radius="28" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="12">
+			<circle color="#000000" radius="32" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="13">
+			<circle color="#000000" radius="52" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="14">
+			<circle color="#000000" radius="64" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="15">
+			<circle color="#000000" radius="68" width="6" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="16">
+			<circle color="#000000" radius="132" width="8" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="17">
+			<circle color="#000000" radius="268" width="8" text_size="48"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="18">
+			<circle color="#000000" radius="530" width="8" text_size="48"/>
+		</itemgra>
+		<itemgra item_types="nav_none" order="0-">
+			<icon src="unknown.png"/>
+		</itemgra>
+		<itemgra item_types="announcement" order="7-">
+			<icon src="gui_sound_32_32.png"/>
+			<circle color="#FF089C" radius="10" text_size="7"/>
+		</itemgra>
+	</layer>
+	<layer name="POI Symbols" active="1">
+		<itemgra item_types="mini_roundabout" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="turning_circle" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="poi_airport" order="6-">
+			<icon src="airport.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fuel" order="12-">
+			<icon src="fuel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bridge" order="12-">
+			<icon src="bridge.png"/>
+		</itemgra>
+		<itemgra item_types="highway_exit" order="12-">
+			<icon src="exit.png"/>
+		</itemgra>
+		<itemgra item_types="poi_auto_club" order="13-">
+			<icon src="auto_club.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bank" order="13-">
+			<icon src="bank.png"/>
+		</itemgra>
+		<itemgra item_types="poi_atm" order="13-">
+			<icon src="atm.png"/>
+		</itemgra>
+		<itemgra item_types="poi_danger_area" order="13-">
+			<icon src="danger_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="poi_forbidden_area" order="13-">
+			<icon src="forbidden_area.png"/>
+		</itemgra>
+		<itemgra item_types="poi_tunnel" order="12-">
+			<icon src="tunnel.png"/>
+		</itemgra>
+		<itemgra item_types="traffic_signals" order="14-">
+			<icon src="traffic_signals.png"/>
+		</itemgra>
+	</layer>
+	<layer name="POI Labels" active="1">
+		<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="15-">
+			<circle color="#606060" radius="0" width="0" text_size="10"/>
+		</itemgra>
+	</layer>
+	<layer name="Android-POI-Icons-full" active="0">
+		<itemgra item_types="mini_roundabout" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="turning_circle" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="poi_airport" order="5-">
+			<icon src="airport.png"/>
+		</itemgra>
+		<itemgra item_types="town_ghost" order="10-">
+			<icon src="ghost_town.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hotel" order="12-">
+			<icon src="hotel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_parking" order="11-">
+			<icon src="parking.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_dealer_parts" order="12-">
+			<icon src="car_dealer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fuel" order="12-">
+			<icon src="fuel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shopping" order="12-">
+			<icon src="shopping.png"/>
+		</itemgra>
+		<itemgra item_types="poi_attraction" order="11-">
+			<icon src="attraction.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cafe" order="12-">
+			<icon src="cafe.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bar" order="12-">
+			<icon src="bar.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pub" order="12-">
+			<icon src="beer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bridge" order="12-">
+			<icon src="bridge.png"/>
+		</itemgra>
+		<itemgra item_types="highway_exit" order="11-">
+			<icon src="exit.png"/>
+		</itemgra>
+		<itemgra item_types="poi_camp_rv" order="12-">
+			<icon src="camping.png"/>
+		</itemgra>
+		<itemgra item_types="poi_museum_history" order="12-">
+			<icon src="museum.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hospital" order="12-">
+			<icon src="hospital.png"/>
+		</itemgra>
+		<itemgra item_types="poi_dining" order="12-">
+			<icon src="restaurant.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fastfood" order="12-">
+			<icon src="fastfood.png"/>
+		</itemgra>
+		<itemgra item_types="poi_police" order="12-">
+			<icon src="police.png"/>
+		</itemgra>
+		<itemgra item_types="poi_auto_club" order="12-">
+			<icon src="auto_club.png"/>
+		</itemgra>
+		<itemgra item_types="poi_autoservice" order="12-">
+			<icon src="car_dealer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bank" order="12-">
+			<icon src="bank.png"/>
+		</itemgra>
+		<itemgra item_types="poi_atm" order="12-">
+			<icon src="atm.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bay" order="12-">
+			<icon src="bay.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bend" order="12-">
+			<icon src="bend.png"/>
+		</itemgra>
+		<itemgra item_types="poi_boat_ramp" order="12-">
+			<icon src="boat_ramp.png"/>
+		</itemgra>
+		<itemgra item_types="poi_border_station" order="12-">
+			<icon src="border_station.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bowling" order="12-">
+			<icon src="bowling.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bus_station" order="11-">
+			<icon src="bus.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bus_stop" order="12-">
+			<icon src="bus_stop.png"/>
+		</itemgra>
+		<itemgra item_types="poi_business_service" order="12-">
+			<icon src="bussines_service.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_rent" order="12-">
+			<icon src="car_rent.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_sharing" order="11-">
+			<icon src="car_sharing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_wash" order="12-">
+			<icon src="car_wash.png"/>
+		</itemgra>
+		<itemgra item_types="poi_casino" order="12-">
+			<icon src="casino.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cemetery" order="12-">
+			<icon src="cemetery.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_church" order="11-">
+			<icon src="church.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bahai" order="11-">
+			<icon src="bahai.png"/>
+		</itemgra>
+		<itemgra item_types="poi_buddhist" order="11-">
+			<icon src="buddhist.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hindu" order="11-">
+			<icon src="hindu.png"/>
+		</itemgra>
+		<itemgra item_types="poi_islamic" order="11-">
+			<icon src="islamic.png"/>
+		</itemgra>
+		<itemgra item_types="poi_jain" order="11-">
+			<icon src="jain.png"/>
+		</itemgra>
+		<itemgra item_types="poi_jewish" order="11-">
+			<icon src="jewish.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pagan" order="11-">
+			<icon src="pagan.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pastafarian" order="11-">
+			<icon src="pastafarian.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shinto" order="11-">
+			<icon src="shinto.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sikh" order="11-">
+			<icon src="sikh.png"/>
+		</itemgra>
+		<itemgra item_types="poi_taoist" order="11-">
+			<icon src="taoist.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cinema" order="12-">
+			<icon src="cinema.png"/>
+		</itemgra>
+		<itemgra item_types="poi_communication" order="12-">
+			<icon src="communication.png"/>
+		</itemgra>
+		<itemgra item_types="poi_concert" order="12-">
+			<icon src="concert.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cove" order="12-">
+			<icon src="cove.png"/>
+		</itemgra>
+		<itemgra item_types="poi_crossing" order="12-">
+			<icon src="crossing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_dam" order="12-">
+			<icon src="dam.png"/>
+		</itemgra>
+		<itemgra item_types="poi_danger_area" order="12-">
+			<icon src="danger_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="poi_danger_sea_wreck" order="12-">
+			<icon src="dangerous.png"/>
+		</itemgra>
+		<itemgra item_types="poi_daymark" order="12-">
+			<icon src="daymark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_diving" order="12-">
+			<icon src="diving.png"/>
+		</itemgra>
+		<itemgra item_types="poi_drinking_water" order="13-">
+			<icon src="drinking_water.png"/>
+		</itemgra>
+		<itemgra item_types="poi_emergency" order="12-">
+			<icon src="emergency.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fair" order="12-">
+			<icon src="fair.png"/>
+		</itemgra>
+		<itemgra item_types="poi_firebrigade" order="12-">
+			<icon src="firebrigade.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fish" order="9-">
+			<icon src="fish.png"/>
+		</itemgra>
+		<itemgra item_types="poi_forbidden_area" order="12-">
+			<icon src="forbidden_area.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_gps" order="15-">
+			<icon src="garmin.png"/>
+		</itemgra>
+		<itemgra item_types="poi_golf" order="12-">
+			<icon src="golf.png"/>
+		</itemgra>
+		<itemgra item_types="poi_government_building" order="12-">
+			<icon src="government_building.png"/>
+		</itemgra>
+		<itemgra item_types="poi_height" order="12-">
+			<icon src="height.png"/>
+		</itemgra>
+		<itemgra item_types="poi_heliport" order="8-">
+			<icon src="heliport.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hotspring" order="12-">
+			<icon src="hotspring.png"/>
+		</itemgra>
+		<itemgra item_types="poi_icesport" order="12-">
+			<icon src="icesport.png"/>
+		</itemgra>
+		<itemgra item_types="poi_information" order="12-">
+			<icon src="information.png"/>
+		</itemgra>
+		<itemgra item_types="poi_justice" order="12-">
+			<icon src="justice.png"/>
+		</itemgra>
+		<itemgra item_types="poi_landmark" order="11-">
+			<icon src="landmark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_levee" order="12-">
+			<icon src="levee.png"/>
+		</itemgra>
+		<itemgra item_types="poi_level_crossing" order="11-">
+			<icon src="level_crossing.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_library" order="12-">
+			<icon src="library.png"/>
+		</itemgra>
+		<itemgra item_types="poi_locale" order="12-">
+			<icon src="locale.png"/>
+		</itemgra>
+		<itemgra item_types="poi_loudspeaker" order="12-">
+			<icon src="loudspeaker.png"/>
+		</itemgra>
+		<itemgra item_types="poi_mall" order="12-">
+			<icon src="mall.png"/>
+		</itemgra>
+		<itemgra item_types="poi_manmade_feature" order="12-">
+			<icon src="manmade_feature.png"/>
+		</itemgra>
+		<itemgra item_types="poi_marine" order="12-">
+			<icon src="marine.png"/>
+		</itemgra>
+		<itemgra item_types="poi_marine_type" order="12-">
+			<icon src="marine_type.png"/>
+		</itemgra>
+		<itemgra item_types="poi_mark" order="12-">
+			<icon src="mark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_military" order="11-">
+			<icon src="military.png"/>
+		</itemgra>
+		<itemgra item_types="poi_mine" order="12-">
+			<icon src="mine.png"/>
+		</itemgra>
+		<itemgra item_types="poi_nondangerous" order="12-">
+			<icon src="nondangerous.png"/>
+		</itemgra>
+		<itemgra item_types="poi_oil_field" order="12-">
+			<icon src="oil_field.png"/>
+		</itemgra>
+		<itemgra item_types="poi_peak" order="7-">
+			<icon src="peak.png"/>
+		</itemgra>
+		<itemgra item_types="poi_personal_service" order="12-">
+			<icon src="personal_service.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pharmacy" order="12-">
+			<icon src="pharmacy.png"/>
+		</itemgra>
+		<itemgra item_types="poi_post_office,poi_post_box" order="13-">
+			<icon src="post.png"/>
+		</itemgra>
+		<itemgra item_types="poi_public_office" order="12-">
+			<icon src="public_office.png"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_halt" order="11-">
+			<circle color="#ff0000" radius="3" width="3"/>
+			<circle color="#000000" radius="5" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_station" order="9-">
+			<circle color="#ff0000" radius="3" width="3"/>
+			<circle color="#000000" radius="6" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_tram_stop" order="10-11">
+			<circle color="#ff0000" radius="2" width="2"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_tram_stop" order="12-">
+			<circle color="#ff0000" radius="3" width="3"/>
+			<circle color="#606060" radius="5" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_repair_service" order="12-">
+			<icon src="repair_service.png"/>
+		</itemgra>
+		<itemgra item_types="poi_resort" order="12-">
+			<icon src="resort.png"/>
+		</itemgra>
+		<itemgra item_types="poi_restaurant" order="12-">
+			<icon src="restaurant.png"/>
+		</itemgra>
+		<itemgra item_types="poi_restricted_area" order="12-">
+			<icon src="restricted_area.png"/>
+		</itemgra>
+		<itemgra item_types="poi_restroom" order="13-">
+			<icon src="toilets.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sailing" order="12-">
+			<icon src="sailing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_scenic_area" order="12-">
+			<icon src="scenic_area.png"/>
+		</itemgra>
+		<itemgra item_types="poi_school" order="12-">
+			<icon src="school.png"/>
+		</itemgra>
+		<itemgra item_types="poi_service" order="12-">
+			<icon src="service.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_apparel" order="12-">
+			<icon src="shop_apparel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_bicycle" order="12-">
+			<icon src="bicycle_shop.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_computer" order="12-">
+			<icon src="shop_computer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_department" order="12-">
+			<icon src="shop_department.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_furniture" order="12-">
+			<icon src="shop_furnish.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_grocery" order="12-">
+			<icon src="shop_grocery.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_handg" order="12-">
+			<icon src="shop_handg.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_merchandise" order="12-">
+			<icon src="shop_merchandise.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_retail" order="12-">
+			<icon src="shop_retail.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shower" order="13-">
+			<icon src="shower.png"/>
+		</itemgra>
+		<itemgra item_types="poi_skiing" order="11-">
+			<icon src="skiing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_social_service" order="12-">
+			<icon src="social_service.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sounding" order="12-">
+			<icon src="sounding.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sport" order="12-">
+			<icon src="sport.png"/>
+		</itemgra>
+		<itemgra item_types="poi_stadium" order="11-">
+			<icon src="stadium.png"/>
+		</itemgra>
+		<itemgra item_types="poi_swimming" order="12-">
+			<icon src="swimming.png"/>
+		</itemgra>
+		<itemgra item_types="poi_telephone" order="13-">
+			<icon src="telephone.png"/>
+		</itemgra>
+		<itemgra item_types="poi_theater" order="12-">
+			<icon src="theater.png"/>
+		</itemgra>
+		<itemgra item_types="poi_tide" order="12-">
+			<icon src="tide.png"/>
+		</itemgra>
+		<itemgra item_types="poi_tower" order="13-">
+			<icon src="tower.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_townhall" order="12-">
+			<icon src="townhall.png"/>
+		</itemgra>
+		<itemgra item_types="poi_trail" order="12-">
+			<icon src="trail.png"/>
+		</itemgra>
+		<itemgra item_types="poi_truck_stop" order="12-">
+			<icon src="truck_stop.png"/>
+		</itemgra>
+		<itemgra item_types="poi_tunnel" order="12-">
+			<icon src="tunnel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_wine" order="12-">
+			<icon src="wine.png"/>
+		</itemgra>
+		<itemgra item_types="poi_worship" order="8-">
+			<icon src="worship.png"/>
+		</itemgra>
+		<itemgra item_types="poi_wrecker" order="12-">
+			<icon src="wrecker.png"/>
+		</itemgra>
+		<itemgra item_types="poi_zoo" order="9-">
+			<icon src="zoo.png"/>
+		</itemgra>
+		<itemgra item_types="poi_picnic" order="12-">
+			<icon src="picnic.png"/>
+		</itemgra>
+		<itemgra item_types="poi_playground" order="12-">
+			<icon src="playground.png"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_multi" order="12-">
+			<icon src="gc_multi.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_tradi" order="12-">
+			<icon src="gc_tradi.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_event" order="12-">
+			<icon src="gc_event.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_mystery" order="12-">
+			<icon src="gc_mystery.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_question" order="12-">
+			<icon src="gc_question.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_stages" order="12-">
+			<icon src="gc_stages.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_reference" order="12-">
+			<icon src="gc_reference.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_webcam" order="12-">
+			<icon src="gc_webcam.xpm"/>
+		</itemgra>
+		<itemgra item_types="traffic_signals" order="13-">
+			<icon src="traffic_signals.png"/>
+		</itemgra>
+		<itemgra item_types="poi_wifi" order="13-">
+			<icon src="wifi.png"/>
+		</itemgra>
+		<itemgra item_types="poi_image" order="12-">
+			<image/>
+		</itemgra>
+		<itemgra item_types="poi_bench" order="13-">
+			<icon src="bench.png"/>
+		</itemgra>
+		<itemgra item_types="poi_biergarten" order="12-">
+			<icon src="biergarten.png"/>
+		</itemgra>
+		<itemgra item_types="poi_boundary_stone" order="13-">
+			<icon src="boundary_stone.png"/>
+		</itemgra>
+		<itemgra item_types="poi_castle" order="11-">
+			<icon src="castle.png"/>
+		</itemgra>
+		<itemgra item_types="poi_ruins" order="11-">
+			<icon src="ruins.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hunting_stand" order="12-">
+			<icon src="hunting_stand.png"/>
+		</itemgra>
+		<itemgra item_types="poi_memorial" order="12-">
+			<icon src="memorial.png"/>
+		</itemgra>
+		<itemgra item_types="poi_monument" order="12-">
+			<icon src="memorial.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shelter" order="11-">
+			<icon src="shelter.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fountain" order="13-">
+			<icon src="fountain.png"/>
+		</itemgra>
+		<itemgra item_types="poi_potable_water" order="13-">
+			<icon src="drinking_water.png"/>
+		</itemgra>
+		<itemgra item_types="poi_toilets" order="12-">
+			<icon src="toilets.png"/>
+		</itemgra>
+		<itemgra item_types="poi_viewpoint" order="10-">
+			<icon src="viewpoint.png"/>
+		</itemgra>
+		<itemgra item_types="tec_common" order="11-">
+			<icon src="tec_common.png"/>
+		</itemgra>
+		<itemgra item_types="vehicle" order="0-">
+			<icon src="gui_vehicle_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="vehicle_pedestrian" order="0-">
+			<icon src="gui_vehicle_pedestrian_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="10-">
+			<icon src="%s"/>
+		</itemgra>
+	</layer>
+	<layer name="Android-POI-Labels-full" active="0">
+		<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_shop_bicycle,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
+			<circle color="#606060" radius="0" width="0" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="14-">
+			<circle color="#606060" radius="0" width="0" text_size="10"/>
+		</itemgra>
+	</layer>
+	<layer name="Found items" ref="Found items"/>
+</layout>
diff --git a/navit/navit_layout_car_dark_shipped.xml b/navit/navit_layout_car_dark_shipped.xml
new file mode 100644
index 000000000..b24978a57
--- /dev/null
+++ b/navit/navit_layout_car_dark_shipped.xml
@@ -0,0 +1,1725 @@
+<?xml version="1.0"?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude" name="Car-dark" daylayout="Car" color="#011001">
+	<cursor w="57" h="57">
+		<itemgra speed_range="-2">
+			<polyline color="#0000BC" radius="0" width="4">
+				<coord x="0" y="0"/>
+			</polyline>
+			<circle color="#000085" radius="9" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+			<circle color="#0000BC" radius="13" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+			<circle color="#000085" radius="18" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+		</itemgra>
+		<itemgra speed_range="3-">
+			<polygon color="#000085">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="-21" y="-18"/>
+			</polygon>
+			<polygon color="#0000BC">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="21" y="-18"/>
+			</polygon>
+			<polygon color="#00009C">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="-21" y="-18"/>
+			</polygon>
+			<polygon color="#000065">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="21" y="-18"/>
+			</polygon>
+			<polyline color="#000085" width="1">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="-21" y="-18"/>
+			</polyline>
+			<polyline color="#000085" width="1">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="21" y="-18"/>
+			</polyline>
+			<polyline color="#000085" width="1">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="-21" y="-18"/>
+			</polyline>
+			<polyline color="#000085" width="1">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="21" y="-18"/>
+			</polyline>
+		</itemgra>
+	</cursor>
+	<layer name="polygons">
+		<!-- Colors based on Car layout; R/34 G/8 B/9 -->
+		<itemgra item_types="image" order="0-">
+			<image/>
+		</itemgra>
+		<itemgra item_types="poly_nature_reserve" order="10-">
+			<polygon color="#061d15"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_glacier" order="10-">
+			<polygon color="#071e19"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_town" order="0-">
+			<polygon color="#191711"/>
+		</itemgra>
+		<itemgra item_types="poly_naval_base" order="10-">
+			<polygon color="#03140f"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_airfield" order="10-">
+			<polygon color="#071b16"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_university" order="8-">
+			<polygon color="#140f14"/>
+		</itemgra>
+		<itemgra item_types="poly_college" order="10-">
+			<polygon color="#071f1a"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_attraction" order="10-">
+			<polygon color="#00150b"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_theme_park" order="10-">
+			<polygon color="#00150b"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_water_park" order="10-">
+			<polygon color="#041915"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_zoo" order="10-">
+			<polygon color="#061811"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_depot" order="10-">
+			<polygon color="#051610"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_railway" order="10-">
+			<polygon color="#051815"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_port" order="10-">
+			<polygon color="#031111"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_marina" order="10-">
+			<polygon color="#051916"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_commercial" order="10-">
+			<polygon color="#071f16"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_retail" order="10-">
+			<polygon color="#06170f"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_plaza" order="10-">
+			<polygon color="#061914"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_battlefield" order="10-">
+			<polygon color="#010703"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_archaeological_site" order="10-">
+			<polygon color="#061b13"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_ruins" order="10-">
+			<polygon color="#061b13"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_camp_site" order="10-">
+			<polygon color="#011400"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_caravan_site" order="10-">
+			<polygon color="#041303"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_golf_course" order="10-">
+			<polygon color="#021403"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_marsh" order="10-">
+			<polygon color="#020803"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_fell" order="10-">
+			<polygon color="#05170b"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_greenfield" order="10-">
+			<polygon color="#071f19"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_brownfield" order="10-">
+			<polygon color="#05170f"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_heath" order="10-">
+			<polygon color="#061c11"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_scree" order="10-">
+			<polygon color="#071d17"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_quarry" order="10-">
+			<polygon color="#071a12"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_landfill" order="10-">
+			<polygon color="#04130f"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_construction" order="10-">
+			<polygon color="#070e02"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_range" order="10-">
+			<polygon color="#030d0a"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_danger_area" order="10-">
+			<polygon color="#071802"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_common" order="10-">
+			<polygon color="#031605"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_recreation_ground" order="10-">
+			<polygon color="#041500"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_playground" order="10-">
+			<polygon color="#05190d"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_fishing" order="10-">
+			<polygon color="#030700"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_allotments" order="10-">
+			<polygon color="#071b13"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_garden" order="10-">
+			<polygon color="#061e12"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_village_green" order="10-">
+			<polygon color="#041607"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_picnic_site" order="10-">
+			<polygon color="#030f07"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_wood" order="0-">
+			<polygon color="#041a06"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_greenhouse" order="10-">
+			<polygon color="#071d16"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_orchard" order="10-">
+			<polygon color="#041b10"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_plantnursery" order="10-">
+			<polygon color="#051b12"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_farm" order="0-">
+			<polygon color="#041a06"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_meadow" order="0-">
+			<polygon color="#041a06"/>
+		</itemgra>
+		<itemgra item_types="poly_land" order="0-">
+			<polygon color="#011001"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
+			<polygon color="#041a06"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_park" order="0-">
+			<polygon color="#041a06"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_beach" order="0-">
+			<polygon color="#081f0b"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_mud" order="0-">
+			<polygon color="#02071d"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="10">
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="11">
+			<polyline color="#1e0728" width="3"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="12">
+			<polyline color="#1e0728" width="5"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="13">
+			<polyline color="#1e0728" width="6"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="14">
+			<polyline color="#1e0728" width="7"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="15">
+			<polyline color="#1e0728" width="9"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="16">
+			<polyline color="#1e0728" width="10"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="17">
+			<polyline color="#1e0728" width="12"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="18">
+			<polyline color="#1e0728" width="20"/>
+			<polygon color="#202020"/>
+		</itemgra>
+		<itemgra item_types="poly_airport" order="0-">
+			<polygon color="#002e00"/>
+		</itemgra>
+		<itemgra item_types="poly_sport,poly_sports_pitch" order="0-">
+			<polygon color="#0c220c"/>
+		</itemgra>
+		<itemgra item_types="poly_industry,poly_place" order="0-">
+			<polygon color="#111111"/>
+		</itemgra>
+		<itemgra item_types="poly_service" order="8-18">
+			<polygon color="#1a1a1a"/>
+			<polyline color="#282828" width="1"/>
+		</itemgra>
+		<itemgra item_types="poly_street_1" order="8-13">
+			<polygon color="#24092f"/>
+		</itemgra>
+		<itemgra item_types="poly_street_1" order="14-16">
+			<polygon color="#24092f"/>
+		</itemgra>
+		<itemgra item_types="poly_street_1" order="17-18">
+			<polygon color="#24092f"/>
+		</itemgra>
+		<itemgra item_types="poly_street_2" order="7-12">
+			<polygon color="#c5c300"/>
+			<polyline color="#c0c0c0" width="1"/>
+		</itemgra>
+		<itemgra item_types="poly_street_2" order="13-16">
+			<polygon color="#c5c300"/>
+			<polyline color="#c0c0c0" width="2"/>
+		</itemgra>
+		<itemgra item_types="poly_street_2" order="17-18">
+			<polygon color="#c5c300"/>
+			<polyline color="#c0c0c0" width="3"/>
+		</itemgra>
+		<itemgra item_types="poly_street_3" order="7-11">
+			<polygon color="#c5c300"/>
+			<polyline color="#a0a0a0" width="1"/>
+		</itemgra>
+		<itemgra item_types="poly_street_3" order="12-15">
+			<polygon color="#c5c300"/>
+			<polyline color="#a0a0a0" width="2"/>
+		</itemgra>
+		<itemgra item_types="poly_street_3" order="16-18">
+			<polygon color="#c5c300"/>
+			<polyline color="#a0a0a0" width="3"/>
+		</itemgra>
+		<itemgra item_types="poly_saltpond" order="10-">
+			<polygon color="#061008"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
+			<polygon color="#010321"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_line" order="0-">
+			<polyline color="#010321" width="1"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="4-5">
+			<polyline color="#010321" width="1"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="6">
+			<polyline color="#010321" width="2"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="7">
+			<polyline color="#010321" width="3"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="8-9">
+			<polyline color="#010321" width="4"/>
+			<text color="#55c4bd" background_color="#000000" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="10-">
+			<polyline color="#010321" width="4"/>
+			<text color="#55c4bd" background_color="#000000" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="6">
+			<polyline color="#010321" width="1"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="7">
+			<polyline color="#010321" width="2"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="8-9">
+			<polyline color="#010321" width="3"/>
+			<text color="#55c4bd" background_color="#000000" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="10-">
+			<polyline color="#010321" width="3"/>
+			<text color="#55c4bd" background_color="#000000" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="water_stream" order="8-9">
+			<polyline color="#010321" width="1"/>
+		</itemgra>
+		<itemgra item_types="water_stream" order="10-">
+			<polyline color="#010321" width="2"/>
+			<text color="#55c4bd" background_color="#000000" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="water_drain" order="10-">
+			<polyline color="#010321" width="1"/>
+			<text color="#55c4bd" background_color="#000000" text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_apron" order="0-">
+			<polygon color="#041a06"/>
+		</itemgra>
+		<itemgra item_types="poly_terminal" order="7-">
+			<polygon color="#282424"/>
+		</itemgra>
+		<itemgra item_types="poly_cemetery" order="8-">
+			<polygon color="#041a06"/>
+		</itemgra>
+		<itemgra item_types="poly_car_parking" order="8-">
+			<polygon color="#1a170f"/>
+		</itemgra>
+		<itemgra item_types="poly_artwork" order="10-">
+			<polygon color="#082015"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_sports_stadium" order="10-">
+			<polygon color="#03180a"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_sports_track" order="10-">
+			<polygon color="#050b08"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_barracks" order="10-">
+			<polygon color="#051511"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_garages" order="10-">
+			<polygon color="#061b16"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_building" order="8-">
+			<polygon color="#282424"/>
+		</itemgra>
+		<itemgra item_types="rail" order="6-8">
+			<polyline color="#282828" width="2"/>
+			<polyline color="#3d3d3d" dash="1,5" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail" order="9-">
+			<polyline color="#282828" width="3"/>
+			<polyline color="#3d3d3d" dash="1,5" width="1"/>
+		</itemgra>
+		<itemgra item_types="ferry" order="5-">
+			<polyline color="#113111" width="1" dash="10"/>
+		</itemgra>
+		<itemgra item_types="border_country" order="0-">
+			<polyline color="#0d0b41" width="1" dash="10,5,2,5"/>
+		</itemgra>
+		<itemgra item_types="border_state" order="0-">
+			<polyline color="#808080" width="1"/>
+		</itemgra>
+	</layer>
+	<layer name="heightlines">
+		<itemgra item_types="height_line_1" order="0-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="height_line_2" order="0-">
+			<polyline color="#000000" width="2"/>
+		</itemgra>
+	</layer>
+	<layer name="streets">
+		<itemgra item_types="street_route" order="2">
+			<polyline color="#0000a0" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="3-5">
+			<polyline color="#0000a0" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="6">
+			<polyline color="#0000a0" width="10"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="7-8">
+			<polyline color="#0000a0" width="16"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="9-10">
+			<polyline color="#0000a0" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="11">
+			<polyline color="#0000a0" width="28"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="12">
+			<polyline color="#0000a0" width="32"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="13">
+			<polyline color="#0000a0" width="52"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="14">
+			<polyline color="#0000a0" width="64"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="15">
+			<polyline color="#0000a0" width="68"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="16">
+			<polyline color="#0000a0" width="132"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="17">
+			<polyline color="#0000a0" width="268"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="18">
+			<polyline color="#0000a0" width="530"/>
+		</itemgra>
+		<itemgra item_types="street_nopass" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_paved" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="10-12">
+			<polyline color="#800000" width="1" dash="3,6"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="13-14">
+			<polyline color="#3d3d3d" width="4"/>
+			<polyline color="#800000" width="1" dash="4,8"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="15-16">
+			<polyline color="#3d3d3d" width="5"/>
+			<polyline color="#800000" width="1" dash="5,10"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled" order="17-">
+			<polyline color="#3d3d3d" width="7"/>
+			<polyline color="#800000" width="1" dash="7,15"/>
+		</itemgra>
+		<itemgra item_types="track_unpaved" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="bridleway" order="10-">
+			<polyline color="#1e0728" width="1"/>
+		</itemgra>
+		<itemgra item_types="cycleway" order="10-">
+			<polyline color="#1e0728" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="10-12">
+			<polyline color="#00A000" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="13-14">
+			<polyline color="#00A000" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="15-16">
+			<polyline color="#00A000" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="17-">
+			<polyline color="#00A000" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="10-12">
+			<polyline color="#0000ff" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="13-14">
+			<polyline color="#0000ff" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="15-16">
+			<polyline color="#0000ff" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="17-">
+			<polyline color="#0000ff" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="10-12">
+			<polyline color="#900000" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="13-14">
+			<polyline color="#900000" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="15-16">
+			<polyline color="#900000" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="17-">
+			<polyline color="#900000" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="10-12">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="13-14">
+			<polyline color="#000000" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="15-16">
+			<polyline color="#000000" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="17-">
+			<polyline color="#000000" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="10-12">
+			<polyline color="#ffaa00" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="13-14">
+			<polyline color="#ffaa00" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="15-16">
+			<polyline color="#ffaa00" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="17-">
+			<polyline color="#ffaa00" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="10-12">
+			<polyline color="#c5c300" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="13-14">
+			<polyline color="#c5c300" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="15-16">
+			<polyline color="#c5c300" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="17-">
+			<polyline color="#c5c300" width="5"/>
+		</itemgra>
+		<itemgra item_types="lift_cable_car" order="6-">
+			<polyline color="#3d3d3d" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="lift_chair" order="6-">
+			<polyline color="#3d3d3d" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="lift_drag" order="6-">
+			<polyline color="#3d3d3d" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="10-12">
+			<polyline color="#0000ff" width="1" dash="3,6"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="13-14">
+			<polyline color="#0000ff" width="2"/>
+			<polyline color="#000000" width="1" dash="4,8"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="15-16">
+			<polyline color="#0000ff" width="3"/>
+			<polyline color="#000000" width="1" dash="5,10"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="17-">
+			<polyline color="#0000ff" width="5"/>
+			<polyline color="#000000" width="1" dash="7,15"/>
+		</itemgra>
+		<itemgra item_types="footway" order="11-12">
+			<polyline color="#4e0000" width="1" dash="3,6"/>
+		</itemgra>
+		<itemgra item_types="footway" order="13-14">
+			<polyline color="#4e0000" width="2"/>
+			<polyline color="#000000" width="1" dash="4,8"/>
+		</itemgra>
+		<itemgra item_types="footway" order="15-16">
+			<polyline color="#4e0000" width="3"/>
+			<polyline color="#000000" width="1" dash="5,10"/>
+		</itemgra>
+		<itemgra item_types="footway" order="17-">
+			<polyline color="#4e0000" width="5"/>
+			<polyline color="#000000" width="1" dash="7,15"/>
+		</itemgra>
+		<itemgra item_types="steps" order="14-15">
+			<polyline color="#4d4e11" width="1"/>
+		</itemgra>
+		<itemgra item_types="steps" order="16">
+			<polyline color="#4d4e11" width="2"/>
+		</itemgra>
+		<itemgra item_types="steps" order="17-18">
+			<polyline color="#4d4e11" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="10">
+			<polyline color="#1e0728" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="11">
+			<polyline color="#1e0728" width="5"/>
+			<polyline color="#202020" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="12">
+			<polyline color="#1e0728" width="8"/>
+			<polyline color="#202020" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="13">
+			<polyline color="#1e0728" width="9"/>
+			<polyline color="#202020" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="14">
+			<polyline color="#1e0728" width="13"/>
+			<polyline color="#202020" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="15">
+			<polyline color="#1e0728" width="18"/>
+			<polyline color="#202020" width="10"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="16">
+			<polyline color="#1e0728" width="21"/>
+			<polyline color="#202020" width="13"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="17">
+			<polyline color="#1e0728" width="25"/>
+			<polyline color="#202020" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="18">
+			<polyline color="#1e0728" width="40"/>
+			<polyline color="#202020" width="30"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="10">
+			<polyline color="#2c2c2c" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="11">
+			<polyline color="#2c2c2c" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="12">
+			<polyline color="#2c2c2c" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="13">
+			<polyline color="#2c2c2c" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="14">
+			<polyline color="#2c2c2c" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="15">
+			<polyline color="#2c2c2c" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="16">
+			<polyline color="#2c2c2c" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="17">
+			<polyline color="#2c2c2c" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="18">
+			<polyline color="#2c2c2c" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="12">
+			<polyline color="#2c2c2c" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="13">
+			<polyline color="#2c2c2c" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="14">
+			<polyline color="#2c2c2c" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="15">
+			<polyline color="#2c2c2c" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="16">
+			<polyline color="#2c2c2c" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="17">
+			<polyline color="#2c2c2c" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="18">
+			<polyline color="#2c2c2c" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
+			<polyline color="#24092f" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
+			<polyline color="#24092f" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
+			<polyline color="#24092f" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
+			<polyline color="#24092f" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
+			<polyline color="#24092f" width="13"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
+			<polyline color="#24092f" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
+			<polyline color="#24092f" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
+			<polyline color="#24092f" width="61"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
+			<polyline color="#24092f" width="126"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="8">
+			<polyline color="#1d4c19" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="9">
+			<polyline color="#1d4c19" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="10">
+			<polyline color="#1d4c19" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="11">
+			<polyline color="#1d4c19" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="12">
+			<polyline color="#1d4c19" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="13">
+			<polyline color="#1d4c19" width="11"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="14">
+			<polyline color="#1d4c19" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="15">
+			<polyline color="#1d4c19" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="16">
+			<polyline color="#1d4c19" width="30"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="17">
+			<polyline color="#1d4c19" width="67"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="18">
+			<polyline color="#1d4c19" width="138"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="7-8">
+			<polyline color="#4d4e11" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="9">
+			<polyline color="#4d4e11" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="10">
+			<polyline color="#4d4e11" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="11">
+			<polyline color="#4d4e11" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="12">
+			<polyline color="#4d4e11" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="13">
+			<polyline color="#4d4e11" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="14">
+			<polyline color="#4d4e11" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="15">
+			<polyline color="#4d4e11" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="16">
+			<polyline color="#4d4e11" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="17">
+			<polyline color="#4d4e11" width="73"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="18">
+			<polyline color="#4d4e11" width="150"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-5">
+			<polyline color="#430000" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-8">
+			<polyline color="#430000" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
+			<polyline color="#430000" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
+			<polyline color="#430000" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
+			<polyline color="#430000" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
+			<polyline color="#430000" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
+			<polyline color="#430000" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
+			<polyline color="#430000" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
+			<polyline color="#430000" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
+			<polyline color="#430000" width="33"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
+			<polyline color="#430000" width="72"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
+			<polyline color="#430000" width="150"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="2">
+			<polyline color="#760000" width="1"/>
+		</itemgra>
+		<!--1d4c19/0d740d-->
+		<itemgra item_types="highway_city,highway_land" order="3-5">
+			<polyline color="#640000" width="3"/>
+			<polyline color="#0a5c0a" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="6">
+			<polyline color="#640000" width="4"/>
+			<polyline color="#0a5c0a" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="7-8">
+			<polyline color="#640000" width="6"/>
+			<polyline color="#005b00" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="9-10">
+			<polyline color="#640000" width="8"/>
+			<polyline color="#0a5c0a" width="2"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="11">
+			<polyline color="#640000" width="12"/>
+			<polyline color="#0a5c0a" width="3"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="12">
+			<polyline color="#640000" width="13"/>
+			<polyline color="#0a5c0a" width="3"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="13">
+			<polyline color="#640000" width="17"/>
+			<polyline color="#0a5c0a" width="4"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="14">
+			<polyline color="#640000" width="24"/>
+			<polyline color="#0a5c0a" width="4"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="15">
+			<polyline color="#640000" width="27"/>
+			<polyline color="#0a5c0a" width="5"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="16">
+			<polyline color="#640000" width="59"/>
+			<polyline color="#0a5c0a" width="6"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="17">
+			<polyline color="#640000" width="127"/>
+			<polyline color="#0a5c0a" width="7"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="18">
+			<polyline color="#640000" width="258"/>
+			<polyline color="#0a5c0a" width="8"/>
+		</itemgra>
+		<!-- This entry shows all unknown linear elements as blue lines -->
+		<!--
+				<itemgra item_types="street_unkn" order="0-">
+					<polyline color="#8080ff" width="3"/>
+				</itemgra>
+				-->
+		<itemgra item_types="highway_exit_label" order="10-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
+			<text text_size="8" color="#55c4bd" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
+			<text text_size="9" color="#55c4bd" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
+			<text text_size="9" color="#55c4bd" background_color="#000000"/>
+		</itemgra>
+	</layer>
+	<layer name="polylines">
+		<itemgra item_types="aeroway_taxiway" order="10">
+			<polyline color="#404040" width="4"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="11">
+			<polyline color="#404040" width="6"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="12">
+			<polyline color="#404040" width="10"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="13">
+			<polyline color="#404040" width="12"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="14">
+			<polyline color="#404040" width="15"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="15">
+			<polyline color="#404040" width="17"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="16">
+			<polyline color="#404040" width="33"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="17">
+			<polyline color="#404040" width="69"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="18">
+			<polyline color="#404040" width="132"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="2-6">
+			<polyline color="#404040" width="1"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="7-8">
+			<polyline color="#404040" width="3"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="9">
+			<polyline color="#404040" width="5"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="10">
+			<polyline color="#404040" width="6"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="11">
+			<polyline color="#404040" width="9"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="12">
+			<polyline color="#404040" width="13"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="13">
+			<polyline color="#404040" width="18"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="14">
+			<polyline color="#404040" width="21"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="15">
+			<polyline color="#404040" width="24"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="16">
+			<polyline color="#404040" width="39"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="17">
+			<polyline color="#404040" width="78"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="18">
+			<polyline color="#404040" width="156"/>
+		</itemgra>
+		<itemgra item_types="rail_tram,bus_guideway" order="10-">
+			<polyline color="#3d3d3d" width="2"/>
+		</itemgra>
+	</layer>
+	<layer name="labels">
+		<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="10-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
+			<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+	</layer>
+	<layer name="Internal">
+		<itemgra item_types="track" order="3-">
+			<polyline color="#3f3f3f" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_tracked" order="7-">
+			<polyline color="#3f3fff" width="3"/>
+		</itemgra>
+		<itemgra item_types="rg_segment" order="0-">
+			<polyline color="#FF089C" width="1"/>
+			<arrows color="#FF089C" width="1"/>
+		</itemgra>
+		<itemgra item_types="rg_point" order="0-">
+			<circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="nav_left_1" order="0-">
+			<icon src="nav_left_1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_2" order="0-">
+			<icon src="nav_left_2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_3" order="0-">
+			<icon src="nav_left_3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_1" order="0-">
+			<icon src="nav_right_1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_2" order="0-">
+			<icon src="nav_right_2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_3" order="0-">
+			<icon src="nav_right_3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_straight" order="0-">
+			<icon src="nav_straight_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_left" order="0-">
+			<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_right" order="0-">
+			<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l1" order="0-">
+			<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r1" order="0-">
+			<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l2" order="0-">
+			<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r2" order="0-">
+			<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l3" order="0-">
+			<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r3" order="0-">
+			<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l4" order="0-">
+			<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r4" order="0-">
+			<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l5" order="0-">
+			<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r5" order="0-">
+			<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l6" order="0-">
+			<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r6" order="0-">
+			<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l7" order="0-">
+			<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r7" order="0-">
+			<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l8" order="0-">
+			<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r8" order="0-">
+			<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_left" order="0-">
+			<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_left" order="0-">
+			<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_right" order="0-">
+			<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_right" order="0-">
+			<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_left" order="0-">
+			<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_right" order="0-">
+			<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="route_end" order="0-">
+			<icon src="nav_destination_wh.svg" w="32" h="32" x="4" y="30"/>
+		</itemgra>
+		<itemgra item_types="nav_none" order="0-">
+			<icon src="unknown.svg"/>
+		</itemgra>
+		<itemgra item_types="announcement" order="7-">
+			<icon src="gui_sound_32_32.png"/>
+			<circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="2">
+			<circle color="#00a0a0" radius="4" width="2" background_color="#000000" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="3-5">
+			<circle color="#00a0a0" radius="8" width="2" background_color="#000000" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="6">
+			<circle color="#00a0a0" radius="10" width="2" background_color="#000000" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="7-8">
+			<circle color="#00a0a0" radius="16" width="2" background_color="#000000" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="9-10">
+			<circle color="#00a0a0" radius="20" width="4" background_color="#000000" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="11">
+			<circle color="#00a0a0" radius="28" width="4" background_color="#000000" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="12">
+			<circle color="#00a0a0" radius="32" width="4" background_color="#000000" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="13">
+			<circle color="#00a0a0" radius="52" width="4" background_color="#000000" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="14">
+			<circle color="#00a0a0" radius="64" width="4" background_color="#000000" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="15">
+			<circle color="#00a0a0" radius="68" width="6" background_color="#000000" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="16">
+			<circle color="#00a0a0" radius="132" width="8" background_color="#000000" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="17">
+			<circle color="#00a0a0" radius="268" width="8" background_color="#000000" text_size="48"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="18">
+			<circle color="#00a0a0" radius="530" width="8" background_color="#000000" text_size="48"/>
+		</itemgra>
+	</layer>
+	<layer name="POI Symbols">
+		<itemgra item_types="mini_roundabout" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="turning_circle" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="poi_airport" order="5-">
+			<icon src="airport.png"/>
+		</itemgra>
+		<itemgra item_types="town_ghost" order="0-">
+			<icon src="ghost_town.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_hotel" order="12-">
+			<icon src="hotel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_parking" order="11-">
+			<icon src="parking.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_sharing" order="11-">
+			<icon src="car_sharing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_dealer_parts" order="0-">
+			<icon src="car_dealer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fuel" order="10-">
+			<icon src="fuel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shopping" order="10-">
+			<icon src="shopping.png"/>
+		</itemgra>
+		<itemgra item_types="poi_attraction" order="8-">
+			<icon src="attraction.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cafe" order="12-">
+			<icon src="cafe.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bar" order="12-">
+			<icon src="bar.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pub" order="12-">
+			<icon src="beer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bridge" order="0-">
+			<icon src="bridge.xpm"/>
+		</itemgra>
+		<itemgra item_types="highway_exit" order="11-">
+			<icon src="exit.png"/>
+		</itemgra>
+		<itemgra item_types="poi_camp_rv" order="9-">
+			<icon src="camping.png"/>
+		</itemgra>
+		<itemgra item_types="poi_museum_history" order="12-">
+			<icon src="museum.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hospital" order="12-">
+			<icon src="hospital.png"/>
+		</itemgra>
+		<!-- not really usefull -->
+		<!--
+				<itemgra item_types="point_unkn" order="0-">
+						<circle color="#8080ff" radius="3"/>
+				</itemgra>
+				-->
+		<itemgra item_types="poi_dining" order="12-">
+			<icon src="restaurant.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fastfood" order="12-">
+			<icon src="fastfood.png"/>
+		</itemgra>
+		<itemgra item_types="poi_police" order="12-">
+			<icon src="police.png"/>
+		</itemgra>
+		<itemgra item_types="poi_auto_club" order="0-">
+			<icon src="auto_club.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_autoservice" order="0-">
+			<icon src="car_dealer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bank" order="12-">
+			<icon src="bank.png"/>
+		</itemgra>
+		<itemgra item_types="poi_atm" order="12-">
+			<icon src="atm.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bay" order="0-">
+			<icon src="bay.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_bend" order="0-">
+			<icon src="bend.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_boat_ramp" order="12-">
+			<icon src="boat_ramp.png"/>
+		</itemgra>
+		<itemgra item_types="poi_border_station" order="0-">
+			<icon src="border_station.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_bowling" order="0-">
+			<icon src="bowling.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_bus_station" order="12-">
+			<icon src="bus.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bus_stop" order="12-">
+			<icon src="bus_stop.png"/>
+		</itemgra>
+		<itemgra item_types="poi_business_service" order="0-">
+			<icon src="bussines_service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_car_rent" order="11-">
+			<icon src="car_rent.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_wash" order="12-">
+			<icon src="car_wash.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_casino" order="11-">
+			<icon src="casino.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cemetery" order="11-">
+			<icon src="cemetery.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_church" order="11-">
+			<icon src="church.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bahai" order="11-">
+			<icon src="bahai.png"/>
+		</itemgra>
+		<itemgra item_types="poi_buddhist" order="11-">
+			<icon src="buddhist.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hindu" order="11-">
+			<icon src="hindu.png"/>
+		</itemgra>
+		<itemgra item_types="poi_islamic" order="11-">
+			<icon src="islamic.png"/>
+		</itemgra>
+		<itemgra item_types="poi_jain" order="11-">
+			<icon src="jain.png"/>
+		</itemgra>
+		<itemgra item_types="poi_jewish" order="11-">
+			<icon src="jewish.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pagan" order="11-">
+			<icon src="pagan.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pastafarian" order="11-">
+			<icon src="pastafarian.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shinto" order="11-">
+			<icon src="shinto.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sikh" order="11-">
+			<icon src="sikh.png"/>
+		</itemgra>
+		<itemgra item_types="poi_taoist" order="11-">
+			<icon src="taoist.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cinema" order="12-">
+			<icon src="cinema.png"/>
+		</itemgra>
+		<itemgra item_types="poi_communication" order="0-">
+			<icon src="communication.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_concert" order="0-">
+			<icon src="concert.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_cove" order="0-">
+			<icon src="cove.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_crossing" order="0-">
+			<icon src="crossing.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_dam" order="0-">
+			<icon src="dam.png"/>
+		</itemgra>
+		<itemgra item_types="poi_danger_area" order="12-">
+			<icon src="danger_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="poi_danger_sea_wreck" order="0-">
+			<icon src="dangerous.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_daymark" order="0-">
+			<icon src="daymark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_diving" order="0-">
+			<icon src="diving.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_drinking_water" order="0-">
+			<icon src="drinking_water.png"/>
+		</itemgra>
+		<itemgra item_types="poi_emergency" order="0-">
+			<icon src="emergency.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fair" order="0-">
+			<icon src="fair.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_firebrigade" order="12-">
+			<icon src="firebrigade.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fish" order="0-">
+			<icon src="fish.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_forbidden_area" order="0-">
+			<icon src="forbidden_area.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_gps" order="0-">
+			<icon src="garmin.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_golf" order="12-">
+			<icon src="golf.png"/>
+		</itemgra>
+		<itemgra item_types="poi_government_building" order="0-">
+			<icon src="government_building.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_height" order="0-">
+			<icon src="height.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_heliport" order="7-">
+			<icon src="heliport.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hotspring" order="0-">
+			<icon src="hotspring.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_icesport" order="0-">
+			<icon src="icesport.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_information" order="12-">
+			<icon src="information.png"/>
+		</itemgra>
+		<itemgra item_types="poi_justice" order="10-">
+			<icon src="justice.png"/>
+		</itemgra>
+		<itemgra item_types="poi_landmark" order="0-">
+			<icon src="landmark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_levee" order="0-">
+			<icon src="levee.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_level_crossing" order="11-">
+			<icon src="level_crossing.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_library" order="12-">
+			<icon src="library.png"/>
+		</itemgra>
+		<itemgra item_types="poi_locale" order="0-">
+			<icon src="locale.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_loudspeaker" order="0-">
+			<icon src="loudspeaker.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_mall" order="0-">
+			<icon src="mall.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_manmade_feature" order="0-">
+			<icon src="manmade_feature.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_marine" order="0-">
+			<icon src="marine.png"/>
+		</itemgra>
+		<itemgra item_types="poi_marine_type" order="0-">
+			<icon src="marine_type.png"/>
+		</itemgra>
+		<itemgra item_types="poi_mark" order="0-">
+			<icon src="mark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_military" order="0-">
+			<icon src="military.png"/>
+		</itemgra>
+		<itemgra item_types="poi_mine" order="0-">
+			<icon src="mine.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_nondangerous" order="0-">
+			<icon src="nondangerous.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_oil_field" order="0-">
+			<icon src="oil_field.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_peak" order="6-">
+			<icon src="peak.png"/>
+		</itemgra>
+		<itemgra item_types="poi_personal_service" order="0-">
+			<icon src="personal_service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_pharmacy" order="12-">
+			<icon src="pharmacy.png"/>
+		</itemgra>
+		<itemgra item_types="poi_post_office,poi_post_box" order="13-">
+			<icon src="post.png"/>
+		</itemgra>
+		<itemgra item_types="poi_public_office" order="0-">
+			<icon src="public_office.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_halt" order="10-">
+			<circle color="#000000" radius="3" width="3"/>
+			<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_station" order="11-">
+			<circle color="#000000" radius="3" width="3"/>
+			<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_tram_stop" order="10-11">
+			<circle color="#3d3d3d" background_color="#000000" radius="2" width="2"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_tram_stop" order="12-">
+			<circle color="#000000" radius="3" width="3"/>
+			<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_repair_service" order="0-">
+			<icon src="repair_service.png"/>
+		</itemgra>
+		<itemgra item_types="poi_resort" order="0-">
+			<icon src="resort.png"/>
+		</itemgra>
+		<itemgra item_types="poi_restaurant" order="12-">
+			<icon src="restaurant.png"/>
+		</itemgra>
+		<itemgra item_types="poi_restricted_area" order="0-">
+			<icon src="restricted_area.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_restroom" order="13-">
+			<icon src="toilets.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sailing" order="0-">
+			<icon src="sailing.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_scenic_area" order="0-">
+			<icon src="scenic_area.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_school" order="12-">
+			<icon src="school.png"/>
+		</itemgra>
+		<itemgra item_types="poi_service" order="0-">
+			<icon src="service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_apparel" order="0-">
+			<icon src="shop_apparel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_computer" order="0-">
+			<icon src="shop_computer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_department" order="0-">
+			<icon src="shop_department.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_furniture" order="0-">
+			<icon src="shop_furnish.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_grocery" order="0-">
+			<icon src="shop_grocery.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_handg" order="0-">
+			<icon src="shop_handg.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_merchandise" order="0-">
+			<icon src="shop_merchandise.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_retail" order="0-">
+			<icon src="shop_retail.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shower" order="0-">
+			<icon src="shower.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_skiing" order="12-">
+			<icon src="skiing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_social_service" order="0-">
+			<icon src="social_service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_sounding" order="0-">
+			<icon src="sounding.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_sport" order="12-">
+			<icon src="sport.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_stadium" order="0-">
+			<icon src="stadium.png"/>
+		</itemgra>
+		<itemgra item_types="poi_swimming" order="12-">
+			<icon src="swimming.png"/>
+		</itemgra>
+		<itemgra item_types="poi_taxi" order="13-">
+			<icon src="taxi.png"/>
+		</itemgra>
+		<itemgra item_types="poi_telephone" order="13-">
+			<icon src="telephone.png"/>
+		</itemgra>
+		<itemgra item_types="poi_theater" order="12-">
+			<icon src="theater.png"/>
+		</itemgra>
+		<itemgra item_types="poi_tide" order="0-">
+			<icon src="tide.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_tower" order="13-">
+			<icon src="tower.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_townhall" order="12-">
+			<icon src="townhall.png"/>
+		</itemgra>
+		<itemgra item_types="poi_trail" order="0-">
+			<icon src="trail.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_truck_stop" order="0-">
+			<icon src="truck_stop.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_tunnel" order="0-">
+			<icon src="tunnel.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_wifi" order="11-">
+			<icon src="wifi.png"/>
+		</itemgra>
+		<itemgra item_types="poi_wine" order="0-">
+			<icon src="wine.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_worship" order="0-">
+			<icon src="worship.png"/>
+		</itemgra>
+		<itemgra item_types="poi_wrecker" order="0-">
+			<icon src="wrecker.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_zoo" order="10-">
+			<icon src="zoo.png"/>
+		</itemgra>
+		<itemgra item_types="poi_picnic" order="11-">
+			<icon src="picnic.png"/>
+		</itemgra>
+		<itemgra item_types="poi_playground" order="12-">
+			<icon src="playground.png"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_multi" order="0-">
+			<icon src="gc_multi.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_tradi" order="0-">
+			<icon src="gc_tradi.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_event" order="0-">
+			<icon src="gc_event.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_mystery" order="0-">
+			<icon src="gc_mystery.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_question" order="0-">
+			<icon src="gc_question.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_stages" order="0-">
+			<icon src="gc_stages.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_reference" order="0-">
+			<icon src="gc_reference.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_webcam" order="0-">
+			<icon src="gc_webcam.xpm"/>
+		</itemgra>
+		<itemgra item_types="traffic_signals" order="13-">
+			<icon src="traffic_signals.png"/>
+		</itemgra>
+		<itemgra item_types="poi_image" order="0-">
+			<image/>
+		</itemgra>
+		<!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bike layout? -->
+		<itemgra item_types="poi_bench" order="13-">
+			<icon src="bench.png"/>
+		</itemgra>
+		<itemgra item_types="poi_biergarten" order="12-">
+			<icon src="beer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_boundary_stone" order="13-">
+			<icon src="boundary_stone.png"/>
+		</itemgra>
+		<itemgra item_types="poi_castle" order="12-">
+			<icon src="castle.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hunting_stand" order="13-">
+			<icon src="hunting_stand.png"/>
+		</itemgra>
+		<itemgra item_types="poi_memorial" order="12-">
+			<icon src="memorial.png"/>
+		</itemgra>
+		<itemgra item_types="poi_monument" order="12-">
+			<icon src="memorial.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shelter" order="10-">
+			<icon src="shelter.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fountain" order="12-">
+			<icon src="fountain.png"/>
+		</itemgra>
+		<itemgra item_types="poi_potable_water" order="12-">
+			<icon src="drinking_water.png"/>
+		</itemgra>
+		<itemgra item_types="poi_toilets" order="12-">
+			<icon src="toilets.png"/>
+		</itemgra>
+		<itemgra item_types="poi_viewpoint" order="12-">
+			<icon src="viewpoint.png"/>
+		</itemgra>
+		<itemgra item_types="tec_common" order="11-">
+			<icon src="tec_common.png"/>
+		</itemgra>
+		<itemgra item_types="vehicle" order="0-">
+			<icon src="gui_vehicle_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="vehicle_pedestrian" order="0-">
+			<icon src="gui_vehicle_pedestrian_16_16.png"/>
+		</itemgra>
+	</layer>
+	<layer name="POI Labels">
+		<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_car_sharing,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
+			<circle color="#606060" background_color="#000000" radius="0" width="0" text_size="10"/>
+		</itemgra>
+	</layer>
+	<layer name="Found items" ref="Found items"/>
+</layout>
diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml
new file mode 100644
index 000000000..e772ab9f4
--- /dev/null
+++ b/navit/navit_layout_car_shipped.xml
@@ -0,0 +1,2015 @@
+<?xml version="1.0"?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude" name="Car" nightlayout="Car-dark" color="#ffefb7" font="Liberation Sans">
+	<cursor w="57" h="57">
+		<itemgra speed_range="-2">
+			<polyline color="#00BC00" radius="0" width="4">
+				<coord x="0" y="0"/>
+			</polyline>
+			<circle color="#008500" radius="9" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+			<circle color="#00BC00" radius="13" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+			<circle color="#008500" radius="18" width="3">
+				<coord x="0" y="0"/>
+			</circle>
+		</itemgra>
+		<itemgra speed_range="3-">
+			<polygon color="#008500">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="-21" y="-18"/>
+			</polygon>
+			<polygon color="#00BC00">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="21" y="-18"/>
+			</polygon>
+			<polygon color="#009C00">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="-21" y="-18"/>
+			</polygon>
+			<polygon color="#006500">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="21" y="-18"/>
+			</polygon>
+			<polyline color="#008500" width="1">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="-21" y="-18"/>
+			</polyline>
+			<polyline color="#008500" width="1">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="21"/>
+				<coord x="0" y="-3"/>
+				<coord x="21" y="-18"/>
+			</polyline>
+			<polyline color="#008500" width="1">
+				<coord x="-21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="-21" y="-18"/>
+			</polyline>
+			<polyline color="#008500" width="1">
+				<coord x="21" y="-18"/>
+				<coord x="0" y="-3"/>
+				<coord x="0" y="-9"/>
+				<coord x="21" y="-18"/>
+			</polyline>
+		</itemgra>
+	</cursor>
+	<layer name="polygons">
+		<itemgra item_types="image" order="0-">
+			<image/>
+		</itemgra>
+		<itemgra item_types="poly_nature_reserve" order="10-">
+			<polygon color="#cedec6"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_glacier" order="10-">
+			<polygon color="#ddecec"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_town" order="0-">
+			<polygon color="#ffc895"/>
+			<polyline color="#ebb481"/>
+		</itemgra>
+		<itemgra item_types="poly_naval_base" order="10-">
+			<polygon color="#6a9993"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_airfield" order="10-">
+			<polygon color="#ecd3cf"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_university" order="8-">
+			<polygon color="#d68fb8"/>
+			<polyline color="#881155"/>
+		</itemgra>
+		<itemgra item_types="poly_college" order="10-">
+			<polygon color="#f4f4f4"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_attraction" order="10-">
+			<polygon color="#01a36c"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_theme_park" order="10-">
+			<polygon color="#01a36c"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_water_park" order="10-">
+			<polygon color="#8cc1c8"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_zoo" order="10-">
+			<polygon color="#ccbda5"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_depot" order="10-">
+			<polygon color="#c2b098"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_railway" order="10-">
+			<polygon color="#b3b9c5"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_port" order="10-">
+			<polygon color="#8188a0"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_marina" order="10-">
+			<polygon color="#aac4d2"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_commercial" order="10-">
+			<polygon color="#eaeed3"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_retail" order="10-">
+			<polygon color="#d6b690"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_plaza" order="10-">
+			<polygon color="#cac4bc"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_battlefield" order="10-">
+			<polygon color="#373d1c"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_archaeological_site" order="10-">
+			<polygon color="#d9cfb6"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_ruins" order="10-">
+			<polygon color="#d9cfb6"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_camp_site" order="10-">
+			<polygon color="#339900"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_caravan_site" order="10-">
+			<polygon color="#8d9723"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_golf_course" order="10-">
+			<polygon color="#419a22"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_marsh" order="10-">
+			<polygon color="#553f23"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_fell" order="10-">
+			<polygon color="#bbb56b"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_greenfield" order="10-">
+			<polygon color="#f1eee8"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_brownfield" order="10-">
+			<polygon color="#b6b690"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_heath" order="10-">
+			<polygon color="#d6d99f"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_scree" order="10-">
+			<polygon color="#eee5dc"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_quarry" order="10-">
+			<polygon color="#e4caad"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_landfill" order="10-">
+			<polygon color="#999893"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_construction" order="10-">
+			<polygon color="#f47216"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_range" order="10-">
+			<polygon color="#6d6b63"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_danger_area" order="10-">
+			<polygon color="#f2ba1b"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_common" order="10-">
+			<polygon color="#7bab36"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_recreation_ground" order="10-">
+			<polygon color="#8fa400"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_playground" order="10-">
+			<polygon color="#b4c479"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_fishing" order="10-">
+			<polygon color="#713907"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_allotments" order="10-">
+			<polygon color="#eecfb3"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_garden" order="10-">
+			<polygon color="#cfeca8"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_village_green" order="10-">
+			<polygon color="#93ac47"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_picnic_site" order="10-">
+			<polygon color="#797548"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_wood" order="0-">
+			<polygon color="#8ec78d"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_greenhouse" order="10-">
+			<polygon color="#f9e8cb"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_orchard" order="10-">
+			<polygon color="#9edc90"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_plantnursery" order="10-">
+			<polygon color="#addea2"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_farm" order="0-">
+			<polygon color="#c7f1a3"/>
+			<polyline color="#79c691"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_meadow" order="0-">
+			<polygon color="#c7f1a3"/>
+			<polyline color="#79c691"/>
+		</itemgra>
+		<itemgra item_types="poly_water_tiled" order="0-">
+			<polygon color="#82c8ea"/>
+		</itemgra>
+		<itemgra item_types="poly_land" order="0-">
+			<polygon color="#ffefb7"/>
+			<polyline color="#ffefb7"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="9-">
+			<polygon color="#a0a0a0"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_park" order="0-">
+			<polygon color="#7cc334"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_beach" order="0-">
+			<polygon color="#fbed66"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_mud" order="0-">
+			<polygon color="#96ced4"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="10">
+			<polyline color="#d2d2d2" width="3"/>
+			<polyline color="#dddddd" width="1"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="11">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#dddddd" width="3"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="12">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#dddddd" width="6"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="13">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#dddddd" width="7"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="14">
+			<polyline color="#d2d2d2" width="13"/>
+			<polyline color="#dddddd" width="9"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#dddddd" width="14"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="16">
+			<polyline color="#d2d2d2" width="21"/>
+			<polyline color="#dddddd" width="17"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="17">
+			<polyline color="#d2d2d2" width="25"/>
+			<polyline color="#dddddd" width="21"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_pedestrian" order="18">
+			<polyline color="#d2d2d2" width="40"/>
+			<polyline color="#dddddd" width="34"/>
+			<polygon color="#dddddd"/>
+		</itemgra>
+		<itemgra item_types="poly_airport" order="0-">
+			<polygon color="#a0a0a0"/>
+		</itemgra>
+		<itemgra item_types="poly_sport,poly_sports_pitch" order="0-">
+			<polygon color="#4af04f"/>
+		</itemgra>
+		<itemgra item_types="poly_industry,poly_place" order="0-">
+			<polygon color="#e6e6e6"/>
+		</itemgra>
+		<itemgra item_types="poly_service" order="8-18">
+			<polygon color="#fefefe"/>
+			<polyline color="#d2d2d2" width="1"/>
+		</itemgra>
+		<itemgra item_types="poly_street_1" order="8-13">
+			<polygon color="#ffffff"/>
+			<polyline color="#d2d2d2" width="1"/>
+		</itemgra>
+		<itemgra item_types="poly_street_1" order="14-16">
+			<polygon color="#ffffff"/>
+			<polyline color="#d2d2d2" width="2"/>
+		</itemgra>
+		<itemgra item_types="poly_street_1" order="17-18">
+			<polygon color="#ffffff"/>
+			<polyline color="#d2d2d2" width="3"/>
+		</itemgra>
+		<itemgra item_types="poly_street_2" order="7-12">
+			<polygon color="#ffff00"/>
+			<polyline color="#c0c0c0" width="1"/>
+		</itemgra>
+		<itemgra item_types="poly_street_2" order="13-16">
+			<polygon color="#ffff00"/>
+			<polyline color="#c0c0c0" width="2"/>
+		</itemgra>
+		<itemgra item_types="poly_street_2" order="17-18">
+			<polygon color="#ffff00"/>
+			<polyline color="#c0c0c0" width="3"/>
+		</itemgra>
+		<itemgra item_types="poly_street_3" order="7-11">
+			<polygon color="#ffff00"/>
+			<polyline color="#a0a0a0" width="1"/>
+		</itemgra>
+		<itemgra item_types="poly_street_3" order="12-15">
+			<polygon color="#ffff00"/>
+			<polyline color="#a0a0a0" width="2"/>
+		</itemgra>
+		<itemgra item_types="poly_street_3" order="16-18">
+			<polygon color="#ffff00"/>
+			<polyline color="#a0a0a0" width="3"/>
+		</itemgra>
+		<itemgra item_types="poly_saltpond" order="10-">
+			<polygon color="#d7804a"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
+			<polygon color="#82c8ea"/>
+			<polyline color="#5096b8"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_line" order="0-">
+			<polyline color="#5096b8" width="1"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="4-5">
+			<polyline color="#82c8ea" width="1"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="6">
+			<polyline color="#82c8ea" width="2"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="7">
+			<polyline color="#82c8ea" width="3"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="8-9">
+			<polyline color="#82c8ea" width="4"/>
+			<text text_size="7"/>
+		</itemgra>
+		<itemgra item_types="water_river" order="10-">
+			<polyline color="#82c8ea" width="4"/>
+			<text text_size="10"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="6">
+			<polyline color="#82c8ea" width="1"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="7">
+			<polyline color="#82c8ea" width="2"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="8-9">
+			<polyline color="#82c8ea" width="3"/>
+			<text text_size="7"/>
+		</itemgra>
+		<itemgra item_types="water_canal" order="10-">
+			<polyline color="#82c8ea" width="3"/>
+			<text text_size="10"/>
+		</itemgra>
+		<itemgra item_types="water_stream" order="8-9">
+			<polyline color="#82c8ea" width="1"/>
+		</itemgra>
+		<itemgra item_types="water_stream" order="10-">
+			<polyline color="#82c8ea" width="2"/>
+			<text text_size="7"/>
+		</itemgra>
+		<itemgra item_types="water_drain" order="10-">
+			<polyline color="#82c8ea" width="1"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_apron" order="0-">
+			<polygon color="#d0d0d0"/>
+		</itemgra>
+		<itemgra item_types="poly_terminal" order="7-">
+			<polygon color="#e3c6a6"/>
+		</itemgra>
+		<itemgra item_types="poly_cemetery" order="1-">
+			<polygon color="#bde3cb"/>
+		</itemgra>
+		<itemgra item_types="poly_car_parking" order="1-">
+			<polygon color="#e7cf87"/>
+		</itemgra>
+		<itemgra item_types="poly_artwork" order="10-">
+			<polygon color="#fefbc5"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_sports_stadium" order="10-">
+			<polygon color="#6eb85d"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_sports_track" order="10-">
+			<polygon color="#b6554e"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_barracks" order="10-">
+			<polygon color="#b6a6a6"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_garages" order="10-">
+			<polygon color="#deddcc"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_building" order="0-">
+			<polygon color="#b6a6a6"/>
+		</itemgra>
+		<itemgra item_types="rail" order="6-">
+			<polyline color="#696969" width="3"/>
+			<polyline color="#ffffff" width="1" dash="5,5"/>
+		</itemgra>
+		<itemgra item_types="ferry" order="5-">
+			<polyline color="#000000" width="1" dash="10"/>
+		</itemgra>
+		<itemgra item_types="border_country" order="0-">
+			<polyline color="#b8434e" width="1" dash="10,5,2,5"/>
+		</itemgra>
+		<itemgra item_types="border_state" order="0-">
+			<polyline color="#808080" width="1"/>
+		</itemgra>
+	</layer>
+	<layer name="heightlines">
+		<itemgra item_types="height_line_1" order="7">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<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="12-">
+			<polyline color="#000000" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+	</layer>
+	<layer name="streets">
+		<itemgra item_types="street_route" order="2">
+			<polyline color="#0000a0" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="3-5">
+			<polyline color="#0000a0" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="6">
+			<polyline color="#0000a0" width="10"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="7-8">
+			<polyline color="#0000a0" width="16"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="9-10">
+			<polyline color="#0000a0" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="11">
+			<polyline color="#0000a0" width="28"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="12">
+			<polyline color="#0000a0" width="32"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="13">
+			<polyline color="#0000a0" width="52"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="14">
+			<polyline color="#0000a0" width="64"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="15">
+			<polyline color="#0000a0" width="68"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="16">
+			<polyline color="#0000a0" width="132"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="17">
+			<polyline color="#0000a0" width="268"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="18">
+			<polyline color="#0000a0" width="530"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="2">
+			<polyline color="#ba00b8" width="4"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="3-5">
+			<polyline color="#ba00b8" width="8"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="6">
+			<polyline color="#ba00b8" width="10"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="7-8">
+			<polyline color="#ba00b8" width="16"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="9-10">
+			<polyline color="#ba00b8" width="20"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="11">
+			<polyline color="#ba00b8" width="28"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="12">
+			<polyline color="#ba00b8" width="32"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="13">
+			<polyline color="#ba00b8" width="52"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="14">
+			<polyline color="#ba00b8" width="64"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="15">
+			<polyline color="#ba00b8" width="68"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="16">
+			<polyline color="#ba00b8" width="132"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="17">
+			<polyline color="#ba00b8" width="268"/>
+		</itemgra>
+		<itemgra item_types="selected_line" order="18">
+			<polyline color="#ba00b8" width="530"/>
+		</itemgra>
+		<itemgra item_types="forest_way_1" order="10-">
+			<polyline color="#0070c0" width="6"/>
+		</itemgra>
+		<itemgra item_types="forest_way_2" order="10-">
+			<polyline color="#ff0000" width="3"/>
+		</itemgra>
+		<itemgra item_types="forest_way_3" order="10-">
+			<polyline color="#ff0000" width="1" dash="2,4"/>
+		</itemgra>
+		<itemgra item_types="forest_way_4" order="10-">
+			<polyline color="#119a2e" width="1" dash="4,10"/>
+		</itemgra>
+		<itemgra item_types="street_nopass" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_paved" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled,track_grass" order="10-12">
+			<polyline color="#800000" width="1" dash="3,6"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled,track_grass" order="13-14">
+			<polyline color="#ffffff" width="4"/>
+			<polyline color="#800000" width="1" dash="4,8"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled,track_grass" order="15-16">
+			<polyline color="#ffffff" width="5"/>
+			<polyline color="#800000" width="1" dash="5,10"/>
+		</itemgra>
+		<itemgra item_types="track_gravelled,track_grass" order="17-">
+			<polyline color="#ffffff" width="7"/>
+			<polyline color="#800000" width="1" dash="7,15"/>
+		</itemgra>
+		<itemgra item_types="track_unpaved,track_ground,path,hiking,hiking_mountain,hiking_mountain_demanding,hiking_alpine,hiking_alpine_demanding,hiking_alpine_difficult" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="bridleway" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="cycleway" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="10-12">
+			<polyline color="#00A000" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="13-14">
+			<polyline color="#00A000" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="15-16">
+			<polyline color="#00A000" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_novice" order="17-">
+			<polyline color="#00A000" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="10-12">
+			<polyline color="#0000ff" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="13-14">
+			<polyline color="#0000ff" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="15-16">
+			<polyline color="#0000ff" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_easy" order="17-">
+			<polyline color="#0000ff" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="10-12">
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="13-14">
+			<polyline color="#ff0000" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="15-16">
+			<polyline color="#ff0000" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_intermediate" order="17-">
+			<polyline color="#ff0000" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="10-12">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="13-14">
+			<polyline color="#000000" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="15-16">
+			<polyline color="#000000" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_advanced" order="17-">
+			<polyline color="#000000" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="10-12">
+			<polyline color="#ffaa00" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="13-14">
+			<polyline color="#ffaa00" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="15-16">
+			<polyline color="#ffaa00" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_expert" order="17-">
+			<polyline color="#ffaa00" width="5"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="10-12">
+			<polyline color="#ffff00" width="1"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="13-14">
+			<polyline color="#ffff00" width="2"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="15-16">
+			<polyline color="#ffff00" width="3"/>
+		</itemgra>
+		<itemgra item_types="piste_downhill_freeride" order="17-">
+			<polyline color="#ffff00" width="5"/>
+		</itemgra>
+		<itemgra item_types="lift_cable_car" order="6-">
+			<polyline color="#696969" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="lift_chair" order="6-">
+			<polyline color="#696969" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="lift_drag" order="6-">
+			<polyline color="#696969" width="1" dash="5"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="10-12">
+			<polyline color="#0000ff" width="1" dash="3,6" offset="4"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="13-14">
+			<polyline color="#ffffff" width="4" offset="6"/>
+			<polyline color="#0000ff" width="1" dash="4,8" offset="6"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="15-16">
+			<polyline color="#ffffff" width="5" offset="7"/>
+			<polyline color="#0000ff" width="1" dash="5,10" offset="7"/>
+		</itemgra>
+		<itemgra item_types="piste_nordic" order="17-">
+			<polyline color="#ffffff" width="7" offset="10"/>
+			<polyline color="#0000ff" width="1" dash="7,15" offset="10"/>
+		</itemgra>
+		<itemgra item_types="footway_and_piste_nordic" order="10-12">
+			<polyline color="#ff0000" width="1" dash="3,15"/>
+			<polyline color="#0000ff" width="1" dash="3,15" offset="9"/>
+		</itemgra>
+		<itemgra item_types="footway_and_piste_nordic" order="13-14">
+			<polyline color="#ffffff" width="4"/>
+			<polyline color="#ff0000" width="2"/>
+			<polyline color="#0000ff" width="1" dash="4,20" offset="12"/>
+		</itemgra>
+		<itemgra item_types="footway_and_piste_nordic" order="15-16">
+			<polyline color="#ffffff" width="5"/>
+			<polyline color="#ff0000" width="3"/>
+			<polyline color="#0000ff" width="1" dash="5,25" offset="15"/>
+		</itemgra>
+		<itemgra item_types="footway_and_piste_nordic" order="17-">
+			<polyline color="#ffffff" width="7"/>
+			<polyline color="#ff0000" width="5"/>
+			<polyline color="#0000ff" width="1" dash="7,37" offset="22"/>
+		</itemgra>
+		<itemgra item_types="footway" order="10-12">
+			<polyline color="#ff0000" width="1" dash="3,6"/>
+		</itemgra>
+		<itemgra item_types="footway" order="13-14">
+			<polyline color="#ffffff" width="4"/>
+			<polyline color="#ff0000" width="1" dash="4,8"/>
+		</itemgra>
+		<itemgra item_types="footway" order="15-16">
+			<polyline color="#ffffff" width="5"/>
+			<polyline color="#ff0000" width="1" dash="5,10"/>
+		</itemgra>
+		<itemgra item_types="footway" order="17-">
+			<polyline color="#ffffff" width="7"/>
+			<polyline color="#ff0000" width="1" dash="7,15"/>
+		</itemgra>
+		<itemgra item_types="steps" order="10-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="10">
+			<polyline color="#d2d2d2" width="3"/>
+			<polyline color="#dddddd" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="11">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#dddddd" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="12">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#dddddd" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="13">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#dddddd" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="14">
+			<polyline color="#d2d2d2" width="13"/>
+			<polyline color="#dddddd" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#dddddd" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="16">
+			<polyline color="#d2d2d2" width="21"/>
+			<polyline color="#dddddd" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="17">
+			<polyline color="#d2d2d2" width="25"/>
+			<polyline color="#dddddd" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="18">
+			<polyline color="#d2d2d2" width="40"/>
+			<polyline color="#dddddd" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="10">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="11">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="12">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#fefefe" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="13">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#fefefe" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="14">
+			<polyline color="#d2d2d2" width="7"/>
+			<polyline color="#fefefe" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="15">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#fefefe" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="16">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#fefefe" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="17">
+			<polyline color="#d2d2d2" width="10"/>
+			<polyline color="#fefefe" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_service" order="18">
+			<polyline color="#d2d2d2" width="11"/>
+			<polyline color="#fefefe" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="12">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="13">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#fefefe" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="14">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#fefefe" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="15">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#fefefe" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="16">
+			<polyline color="#d2d2d2" width="7"/>
+			<polyline color="#fefefe" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="17">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#fefefe" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_parking_lane" order="18">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#fefefe" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#ffffff" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#ffffff" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
+			<polyline color="#d2d2d2" width="10"/>
+			<polyline color="#ffffff" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
+			<polyline color="#d2d2d2" width="11"/>
+			<polyline color="#ffffff" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
+			<polyline color="#d2d2d2" width="17"/>
+			<polyline color="#ffffff" width="13"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#ffffff" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
+			<polyline color="#d2d2d2" width="30"/>
+			<polyline color="#ffffff" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
+			<polyline color="#d2d2d2" width="67"/>
+			<polyline color="#ffffff" width="61"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
+			<polyline color="#d2d2d2" width="132"/>
+			<polyline color="#ffffff" width="126"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="7-8">
+			<polyline color="#c0c0c0" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="9">
+			<polyline color="#c0c0c0" width="3"/>
+			<polyline color="#ffff00" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="10">
+			<polyline color="#c0c0c0" width="4"/>
+			<polyline color="#ffff00" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="11">
+			<polyline color="#c0c0c0" width="5"/>
+			<polyline color="#ffff00" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="12">
+			<polyline color="#c0c0c0" width="7"/>
+			<polyline color="#ffff00" width="5"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="13">
+			<polyline color="#c0c0c0" width="11"/>
+			<polyline color="#ffff00" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="14">
+			<polyline color="#c0c0c0" width="14"/>
+			<polyline color="#ffff00" width="11"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="15">
+			<polyline color="#c0c0c0" width="19"/>
+			<polyline color="#ffff00" width="15"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="16">
+			<polyline color="#c0c0c0" width="30"/>
+			<polyline color="#ffff00" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="17">
+			<polyline color="#c0c0c0" width="63"/>
+			<polyline color="#ffff00" width="57"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,ramp" order="18">
+			<polyline color="#c0c0c0" width="100"/>
+			<polyline color="#ffff00" width="90"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="7-8">
+			<polyline color="#a0a0a0" width="3"/>
+			<polyline color="#ffff00" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="9">
+			<polyline color="#a0a0a0" width="5"/>
+			<polyline color="#ffff00" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="10">
+			<polyline color="#a0a0a0" width="8"/>
+			<polyline color="#ffff00" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="11">
+			<polyline color="#a0a0a0" width="9"/>
+			<polyline color="#ffff00" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="12">
+			<polyline color="#a0a0a0" width="13"/>
+			<polyline color="#ffff00" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="13">
+			<polyline color="#a0a0a0" width="18"/>
+			<polyline color="#ffff00" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="14">
+			<polyline color="#a0a0a0" width="21"/>
+			<polyline color="#ffff00" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="15">
+			<polyline color="#a0a0a0" width="25"/>
+			<polyline color="#ffff00" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="16">
+			<polyline color="#a0a0a0" width="40"/>
+			<polyline color="#ffff00" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="17">
+			<polyline color="#a0a0a0" width="79"/>
+			<polyline color="#ffff00" width="73"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,roundabout" order="18">
+			<polyline color="#a0a0a0" width="156"/>
+			<polyline color="#ffff00" width="150"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
+			<polyline color="#404040" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
+			<polyline color="#404040" width="3"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
+			<polyline color="#000000" width="5"/>
+			<polyline color="#ff0000" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
+			<polyline color="#000000" width="6"/>
+			<polyline color="#ff0000" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
+			<polyline color="#000000" width="9"/>
+			<polyline color="#ff0000" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
+			<polyline color="#000000" width="13"/>
+			<polyline color="#ff0000" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
+			<polyline color="#000000" width="18"/>
+			<polyline color="#ff0000" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
+			<polyline color="#000000" width="21"/>
+			<polyline color="#ff0000" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
+			<polyline color="#000000" width="24"/>
+			<polyline color="#ff0000" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
+			<polyline color="#000000" width="39"/>
+			<polyline color="#ff0000" width="33"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
+			<polyline color="#000000" width="78"/>
+			<polyline color="#ff0000" width="72"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
+			<polyline color="#000000" width="156"/>
+			<polyline color="#ff0000" width="150"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="2">
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="3-5">
+			<polyline color="#ff0000" width="3"/>
+			<polyline color="#ffff00" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="6">
+			<polyline color="#ff0000" width="4"/>
+			<polyline color="#ffff00" width="2"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="7-8">
+			<polyline color="#ff0000" width="7"/>
+			<polyline color="#ffff00" width="5"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="9-10">
+			<polyline color="#ff0000" width="9"/>
+			<polyline color="#ffff00" width="5"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="11">
+			<polyline color="#ff0000" width="13"/>
+			<polyline color="#ffff00" width="9"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="12">
+			<polyline color="#ff0000" width="15"/>
+			<polyline color="#ffff00" width="10"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="13">
+			<polyline color="#ff0000" width="25"/>
+			<polyline color="#ffff00" width="17"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="14">
+			<polyline color="#ff0000" width="31"/>
+			<polyline color="#ffff00" width="24"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="15">
+			<polyline color="#ff0000" width="33"/>
+			<polyline color="#ffff00" width="27"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="16">
+			<polyline color="#ff0000" width="65"/>
+			<polyline color="#ffff00" width="59"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="17">
+			<polyline color="#ff0000" width="133"/>
+			<polyline color="#ffff00" width="127"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="18">
+			<polyline color="#ff0000" width="264"/>
+			<polyline color="#ffff00" width="258"/>
+			<polyline color="#ff0000" width="1"/>
+		</itemgra>
+		<itemgra item_types="tracking_0" order="0-">
+			<polyline color="#000000" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_10" order="0-">
+			<polyline color="#191919" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_20" order="0-">
+			<polyline color="#333333" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_30" order="0-">
+			<polyline color="#4c4c4c" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_40" order="0-">
+			<polyline color="#666666" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_50" order="0-">
+			<polyline color="#7f7f7f" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_60" order="0-">
+			<polyline color="#999999" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_70" order="0-">
+			<polyline color="#b2b2b2" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_80" order="0-">
+			<polyline color="#cccccc" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_90" order="0-">
+			<polyline color="#e5e5e5" width="3"/>
+		</itemgra>
+		<itemgra item_types="tracking_100" order="0-">
+			<polyline color="#ffffff" width="3"/>
+		</itemgra>
+		<itemgra item_types="highway_exit_label" order="10-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="2">
+			<polyline color="#ff9000" width="2"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="3-5">
+			<polyline color="#ff9000" width="4"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="6">
+			<polyline color="#ff9000" width="5"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="7-8">
+			<polyline color="#ff9000" width="8"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="9-10">
+			<polyline color="#ff9000" width="10"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="11">
+			<polyline color="#ff9000" width="14"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="12">
+			<polyline color="#ff9000" width="16"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="13">
+			<polyline color="#ff9000" width="26"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="14">
+			<polyline color="#ff9000" width="32"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="15">
+			<polyline color="#ff9000" width="34"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="16">
+			<polyline color="#ff9000" width="66"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="17">
+			<polyline color="#ff9000" width="134"/>
+		</itemgra>
+		<itemgra item_types="traffic_distortion" order="18">
+			<polyline color="#ff9000" width="265"/>
+		</itemgra>
+	</layer>
+	<layer name="polylines">
+		<itemgra item_types="aeroway_taxiway" order="10">
+			<polyline color="#989994" width="4"/>
+			<polyline color="#d3dbbc" width="2"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="11">
+			<polyline color="#989994" width="6"/>
+			<polyline color="#d3dbbc" width="4"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="12">
+			<polyline color="#989994" width="10"/>
+			<polyline color="#d3dbbc" width="8"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="13">
+			<polyline color="#989994" width="12"/>
+			<polyline color="#d3dbbc" width="9"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="14">
+			<polyline color="#989994" width="15"/>
+			<polyline color="#d3dbbc" width="13"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="15">
+			<polyline color="#989994" width="17"/>
+			<polyline color="#d3dbbc" width="14"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="16">
+			<polyline color="#989994" width="33"/>
+			<polyline color="#d3dbbc" width="26"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="17">
+			<polyline color="#989994" width="69"/>
+			<polyline color="#d3dbbc" width="61"/>
+		</itemgra>
+		<itemgra item_types="aeroway_taxiway" order="18">
+			<polyline color="#989994" width="132"/>
+			<polyline color="#d3dbbc" width="126"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="2-6">
+			<polyline color="#404040" width="1"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="7-8">
+			<polyline color="#404040" width="3"/>
+			<polyline color="#d3dbbc" width="1"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="9">
+			<polyline color="#6b6f5f" width="5"/>
+			<polyline color="#d3dbbc" width="3"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="10">
+			<polyline color="#6b6f5f" width="6"/>
+			<polyline color="#d3dbbc" width="4"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="11">
+			<polyline color="#6b6f5f" width="9"/>
+			<polyline color="#d3dbbc" width="7"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="12">
+			<polyline color="#6b6f5f" width="13"/>
+			<polyline color="#d3dbbc" width="9"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="13">
+			<polyline color="#6b6f5f" width="18"/>
+			<polyline color="#d3dbbc" width="14"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="14">
+			<polyline color="#6b6f5f" width="21"/>
+			<polyline color="#d3dbbc" width="17"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="15">
+			<polyline color="#6b6f5f" width="24"/>
+			<polyline color="#d3dbbc" width="20"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="16">
+			<polyline color="#6b6f5f" width="39"/>
+			<polyline color="#d3dbbc" width="33"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="17">
+			<polyline color="#6b6f5f" width="78"/>
+			<polyline color="#d3dbbc" width="72"/>
+		</itemgra>
+		<itemgra item_types="aeroway_runway" order="18">
+			<polyline color="#6b6f5f" width="156"/>
+			<polyline color="#d3dbbc" width="150"/>
+		</itemgra>
+		<itemgra item_types="rail_tram" order="10-">
+			<polyline color="#606060" width="2"/>
+		</itemgra>
+	</layer>
+	<layer name="labels">
+		<itemgra item_types="house_number" order="15-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="11-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="10-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e3,place_label" order="10-">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e3" order="9-">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4" order="9-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="8-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e3" order="8">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="7-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_5e3" order="7-8">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e4" order="6-8">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e4,town_label_5e4" order="5-8">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="5-">
+			<circle color="#000000" radius="3" text_size="20"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="3-4">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="3-4">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-2">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+	</layer>
+	<layer name="Internal">
+		<itemgra item_types="track" order="7-">
+			<polyline color="#3f3f3f" width="1"/>
+		</itemgra>
+		<itemgra item_types="track_tracked" order="7-">
+			<polyline color="#3f3fff" width="3"/>
+		</itemgra>
+		<itemgra item_types="rg_segment" order="12-">
+			<polyline color="#FF089C" width="1"/>
+			<arrows color="#FF089C" width="1"/>
+			<text text_size="15"/>
+		</itemgra>
+		<itemgra item_types="rg_point" order="12-">
+			<circle color="#FF089C" radius="10" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="nav_left_1" order="0-">
+			<icon src="nav_left_1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_2" order="0-">
+			<icon src="nav_left_2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_left_3" order="0-">
+			<icon src="nav_left_3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_1" order="0-">
+			<icon src="nav_right_1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_2" order="0-">
+			<icon src="nav_right_2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_right_3" order="0-">
+			<icon src="nav_right_3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_straight" order="0-">
+			<icon src="nav_straight_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_left" order="0-">
+			<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_turnaround_right" order="0-">
+			<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l1" order="0-">
+			<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r1" order="0-">
+			<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l2" order="0-">
+			<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r2" order="0-">
+			<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l3" order="0-">
+			<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r3" order="0-">
+			<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l4" order="0-">
+			<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r4" order="0-">
+			<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l5" order="0-">
+			<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r5" order="0-">
+			<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l6" order="0-">
+			<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r6" order="0-">
+			<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l7" order="0-">
+			<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r7" order="0-">
+			<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_l8" order="0-">
+			<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_roundabout_r8" order="0-">
+			<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_left" order="0-">
+			<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_left" order="0-">
+			<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_keep_right" order="0-">
+			<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_merge_right" order="0-">
+			<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_left" order="0-">
+			<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="nav_exit_right" order="0-">
+			<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
+		</itemgra>
+		<itemgra item_types="route_end" order="0-">
+			<icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
+		</itemgra>
+		<itemgra item_types="nav_none" order="0-">
+			<icon src="unknown.svg"/>
+		</itemgra>
+		<itemgra item_types="announcement" order="7-">
+			<icon src="gui_sound_32_32.png"/>
+			<circle color="#FF089C" radius="10" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="2">
+			<circle color="#008080" radius="4" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="3-5">
+			<circle color="#008080" radius="8" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="6">
+			<circle color="#008080" radius="10" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="7-8">
+			<circle color="#008080" radius="16" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="9-10">
+			<circle color="#008080" radius="20" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="11">
+			<circle color="#008080" radius="28" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="12">
+			<circle color="#008080" radius="32" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="13">
+			<circle color="#008080" radius="52" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="14">
+			<circle color="#008080" radius="64" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="15">
+			<circle color="#008080" radius="68" width="6" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="16">
+			<circle color="#008080" radius="132" width="8" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="17">
+			<circle color="#008080" radius="268" width="8" text_size="48"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="18">
+			<circle color="#008080" radius="530" width="8" text_size="48"/>
+		</itemgra>
+	</layer>
+	<layer name="Unknown" enabled="no">
+		<!-- This entry shows all unknow point elements as blue circles -->
+		<itemgra item_types="point_unkn" order="9-">
+			<circle color="#8080ff" radius="3"/>
+		</itemgra>
+		<!-- This entry shows all unknown linear elements as blue lines -->
+		<itemgra item_types="street_unkn" order="0-">
+			<polyline color="#8080ff" width="3"/>
+		</itemgra>
+	</layer>
+	<layer name="POI Symbols">
+		<itemgra item_types="mini_roundabout" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="turning_circle" order="12-">
+			<icon src="mini_roundabout.png"/>
+		</itemgra>
+		<itemgra item_types="poi_airport" order="5-">
+			<icon src="airport.png"/>
+		</itemgra>
+		<itemgra item_types="town_ghost" order="10-">
+			<icon src="ghost_town.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_hotel" order="12-">
+			<icon src="hotel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_parking" order="11-">
+			<icon src="parking.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_dealer_parts" order="12-">
+			<icon src="car_dealer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_sharing" order="11-">
+			<icon src="car_sharing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fuel" order="12-">
+			<icon src="fuel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shopping" order="12-">
+			<icon src="shopping.png"/>
+		</itemgra>
+		<itemgra item_types="poi_attraction" order="11-">
+			<icon src="attraction.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cafe" order="12-">
+			<icon src="cafe.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bar" order="12-">
+			<icon src="bar.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pub" order="12-">
+			<icon src="beer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bridge" order="12-">
+			<icon src="bridge.xpm"/>
+		</itemgra>
+		<itemgra item_types="highway_exit" order="11-">
+			<icon src="exit.png"/>
+		</itemgra>
+		<itemgra item_types="poi_camp_rv" order="12-">
+			<icon src="camping.png"/>
+		</itemgra>
+		<itemgra item_types="poi_museum_history" order="12-">
+			<icon src="museum.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hospital" order="12-">
+			<icon src="hospital.png"/>
+		</itemgra>
+		<itemgra item_types="poi_dining" order="12-">
+			<icon src="restaurant.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fastfood" order="12-">
+			<icon src="fastfood.png"/>
+		</itemgra>
+		<itemgra item_types="poi_police" order="12-">
+			<icon src="police.png"/>
+		</itemgra>
+		<itemgra item_types="poi_auto_club" order="12-">
+			<icon src="auto_club.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_autoservice" order="12-">
+			<icon src="car_dealer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bank" order="12-">
+			<icon src="bank.png"/>
+		</itemgra>
+		<itemgra item_types="poi_atm" order="12-">
+			<icon src="atm.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bay" order="12-">
+			<icon src="bay.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_bend" order="12-">
+			<icon src="bend.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_boat_ramp" order="12-">
+			<icon src="boat_ramp.png"/>
+		</itemgra>
+		<itemgra item_types="poi_border_station" order="12-">
+			<icon src="border_station.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_bowling" order="12-">
+			<icon src="bowling.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_bus_station" order="11-">
+			<icon src="bus.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bus_stop" order="12-">
+			<icon src="bus_stop.png"/>
+		</itemgra>
+		<itemgra item_types="poi_business_service" order="12-">
+			<icon src="bussines_service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_car_rent" order="12-">
+			<icon src="car_rent.png"/>
+		</itemgra>
+		<itemgra item_types="poi_car_wash" order="12-">
+			<icon src="car_wash.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_casino" order="12-">
+			<icon src="casino.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cemetery" order="12-">
+			<icon src="cemetery.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_church" order="11-">
+			<icon src="church.png"/>
+		</itemgra>
+		<itemgra item_types="poi_bahai" order="11-">
+			<icon src="bahai.png"/>
+		</itemgra>
+		<itemgra item_types="poi_buddhist" order="11-">
+			<icon src="buddhist.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hindu" order="11-">
+			<icon src="hindu.png"/>
+		</itemgra>
+		<itemgra item_types="poi_islamic" order="11-">
+			<icon src="islamic.png"/>
+		</itemgra>
+		<itemgra item_types="poi_jain" order="11-">
+			<icon src="jain.png"/>
+		</itemgra>
+		<itemgra item_types="poi_jewish" order="11-">
+			<icon src="jewish.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pagan" order="11-">
+			<icon src="pagan.png"/>
+		</itemgra>
+		<itemgra item_types="poi_pastafarian" order="11-">
+			<icon src="pastafarian.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shinto" order="11-">
+			<icon src="shinto.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sikh" order="11-">
+			<icon src="sikh.png"/>
+		</itemgra>
+		<itemgra item_types="poi_taoist" order="11-">
+			<icon src="taoist.png"/>
+		</itemgra>
+		<itemgra item_types="poi_cinema" order="12-">
+			<icon src="cinema.png"/>
+		</itemgra>
+		<itemgra item_types="poi_communication" order="12-">
+			<icon src="communication.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_concert" order="12-">
+			<icon src="concert.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_cove" order="12-">
+			<icon src="cove.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_crossing" order="12-">
+			<icon src="crossing.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_dam" order="12-">
+			<icon src="dam.png"/>
+		</itemgra>
+		<itemgra item_types="poi_danger_area" order="12-">
+			<icon src="danger_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="poi_danger_sea_wreck" order="12-">
+			<icon src="dangerous.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_daymark" order="12-">
+			<icon src="daymark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_diving" order="12-">
+			<icon src="diving.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_drinking_water" order="13-">
+			<icon src="drinking_water.png"/>
+		</itemgra>
+		<itemgra item_types="poi_emergency" order="12-">
+			<icon src="emergency.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fair" order="12-">
+			<icon src="fair.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_firebrigade" order="12-">
+			<icon src="firebrigade.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fish" order="9-">
+			<icon src="fish.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_forbidden_area" order="12-">
+			<icon src="forbidden_area.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_bicycle" order="12-">
+			<icon src="bicycle_shop.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_gps" order="15-">
+			<icon src="garmin.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_golf" order="12-">
+			<icon src="golf.png"/>
+		</itemgra>
+		<itemgra item_types="poi_government_building" order="12-">
+			<icon src="government_building.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_height" order="12-">
+			<icon src="height.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_heliport" order="8-">
+			<icon src="heliport.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hotspring" order="12-">
+			<icon src="hotspring.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_icesport" order="12-">
+			<icon src="icesport.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_information" order="12-">
+			<icon src="information.png"/>
+		</itemgra>
+		<itemgra item_types="poi_justice" order="12-">
+			<icon src="justice.png"/>
+		</itemgra>
+		<itemgra item_types="poi_landmark" order="11-">
+			<icon src="landmark.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_levee" order="12-">
+			<icon src="levee.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_level_crossing" order="11-">
+			<icon src="level_crossing.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_library" order="12-">
+			<icon src="library.png"/>
+		</itemgra>
+		<itemgra item_types="poi_locale" order="12-">
+			<icon src="locale.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_loudspeaker" order="12-">
+			<icon src="loudspeaker.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_mall" order="12-">
+			<icon src="mall.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_manmade_feature" order="12-">
+			<icon src="manmade_feature.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_marine" order="12-">
+			<icon src="marine.png"/>
+		</itemgra>
+		<itemgra item_types="poi_marine_type" order="12-">
+			<icon src="marine_type.png"/>
+		</itemgra>
+		<itemgra item_types="poi_mark" order="12-">
+			<icon src="mark.png"/>
+		</itemgra>
+		<itemgra item_types="poi_military" order="11-">
+			<icon src="military.png"/>
+		</itemgra>
+		<itemgra item_types="poi_mine" order="12-">
+			<icon src="mine.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_nondangerous" order="12-">
+			<icon src="nondangerous.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_oil_field" order="12-">
+			<icon src="oil_field.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_peak" order="7-">
+			<icon src="peak.png"/>
+		</itemgra>
+		<itemgra item_types="poi_personal_service" order="12-">
+			<icon src="personal_service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_pharmacy" order="12-">
+			<icon src="pharmacy.png"/>
+		</itemgra>
+		<itemgra item_types="poi_post_office,poi_post_box" order="13-">
+			<icon src="post.png"/>
+		</itemgra>
+		<itemgra item_types="poi_public_office" order="12-">
+			<icon src="public_office.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_halt" order="11-">
+			<circle color="#ff0000" radius="3" width="3"/>
+			<circle color="#000000" radius="5" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_station" order="9-">
+			<circle color="#ff0000" radius="3" width="3"/>
+			<circle color="#000000" radius="6" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_tram_stop" order="10-11">
+			<circle color="#ff0000" radius="2" width="2"/>
+		</itemgra>
+		<itemgra item_types="poi_rail_tram_stop" order="12-">
+			<circle color="#ff0000" radius="3" width="3"/>
+			<circle color="#606060" radius="5" width="2" text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poi_repair_service" order="12-">
+			<icon src="repair_service.png"/>
+		</itemgra>
+		<itemgra item_types="poi_resort" order="12-">
+			<icon src="resort.png"/>
+		</itemgra>
+		<itemgra item_types="poi_restaurant" order="12-">
+			<icon src="restaurant.png"/>
+		</itemgra>
+		<itemgra item_types="poi_restricted_area" order="12-">
+			<icon src="restricted_area.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_restroom" order="13-">
+			<icon src="toilets.png"/>
+		</itemgra>
+		<itemgra item_types="poi_sailing" order="12-">
+			<icon src="sailing.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_scenic_area" order="12-">
+			<icon src="scenic_area.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_school" order="12-">
+			<icon src="school.png"/>
+		</itemgra>
+		<itemgra item_types="poi_service" order="12-">
+			<icon src="service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_apparel" order="12-">
+			<icon src="shop_apparel.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_computer" order="12-">
+			<icon src="shop_computer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_department" order="12-">
+			<icon src="shop_department.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_furniture" order="12-">
+			<icon src="shop_furnish.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_grocery" order="12-">
+			<icon src="shop_grocery.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_handg" order="12-">
+			<icon src="shop_handg.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_merchandise" order="12-">
+			<icon src="shop_merchandise.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shop_retail" order="12-">
+			<icon src="shop_retail.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_shower" order="13-">
+			<icon src="shower.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_skiing" order="11-">
+			<icon src="skiing.png"/>
+		</itemgra>
+		<itemgra item_types="poi_social_service" order="12-">
+			<icon src="social_service.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_sounding" order="12-">
+			<icon src="sounding.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_sport" order="12-">
+			<icon src="sport.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_stadium" order="11-">
+			<icon src="stadium.png"/>
+		</itemgra>
+		<itemgra item_types="poi_swimming" order="12-">
+			<icon src="swimming.png"/>
+		</itemgra>
+		<itemgra item_types="poi_telephone" order="13-">
+			<icon src="telephone.png"/>
+		</itemgra>
+		<itemgra item_types="poi_theater" order="12-">
+			<icon src="theater.png"/>
+		</itemgra>
+		<itemgra item_types="poi_tide" order="12-">
+			<icon src="tide.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_tower" order="13-">
+			<icon src="tower.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_townhall" order="12-">
+			<icon src="townhall.png"/>
+		</itemgra>
+		<itemgra item_types="poi_trail" order="12-">
+			<icon src="trail.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_truck_stop" order="12-">
+			<icon src="truck_stop.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_tunnel" order="12-">
+			<icon src="tunnel.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_wine" order="12-">
+			<icon src="wine.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_worship" order="8-">
+			<icon src="worship.png"/>
+		</itemgra>
+		<itemgra item_types="poi_wrecker" order="12-">
+			<icon src="wrecker.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_zoo" order="9-">
+			<icon src="zoo.png"/>
+		</itemgra>
+		<itemgra item_types="poi_picnic" order="12-">
+			<icon src="picnic.png"/>
+		</itemgra>
+		<itemgra item_types="poi_playground" order="12-">
+			<icon src="playground.png"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_multi" order="12-">
+			<icon src="gc_multi.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_tradi" order="12-">
+			<icon src="gc_tradi.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_event" order="12-">
+			<icon src="gc_event.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_mystery" order="12-">
+			<icon src="gc_mystery.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_question" order="12-">
+			<icon src="gc_question.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_stages" order="12-">
+			<icon src="gc_stages.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_reference" order="12-">
+			<icon src="gc_reference.xpm"/>
+		</itemgra>
+		<itemgra item_types="poi_gc_webcam" order="12-">
+			<icon src="gc_webcam.xpm"/>
+		</itemgra>
+		<itemgra item_types="traffic_signals" order="13-">
+			<icon src="traffic_signals.png"/>
+		</itemgra>
+		<itemgra item_types="poi_wifi" order="13-">
+			<icon src="wifi.png"/>
+		</itemgra>
+		<itemgra item_types="poi_taxi" order="13-">
+			<icon src="taxi.png"/>
+		</itemgra>
+		<itemgra item_types="poi_image" order="12-">
+			<image/>
+		</itemgra>
+		<!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bicyle layout. -->
+		<itemgra item_types="poi_bench" order="13-">
+			<icon src="bench.png"/>
+		</itemgra>
+		<itemgra item_types="poi_biergarten" order="12-">
+			<icon src="beer.png"/>
+		</itemgra>
+		<itemgra item_types="poi_boundary_stone" order="13-">
+			<icon src="boundary_stone.png"/>
+		</itemgra>
+		<itemgra item_types="poi_castle" order="11-">
+			<icon src="castle.png"/>
+		</itemgra>
+		<itemgra item_types="poi_ruins" order="11-">
+			<icon src="ruins.png"/>
+		</itemgra>
+		<itemgra item_types="poi_hunting_stand" order="12-">
+			<icon src="hunting_stand.png"/>
+		</itemgra>
+		<itemgra item_types="poi_memorial" order="12-">
+			<icon src="memorial.png"/>
+		</itemgra>
+		<itemgra item_types="poi_monument" order="12-">
+			<icon src="memorial.png"/>
+		</itemgra>
+		<itemgra item_types="poi_shelter" order="11-">
+			<icon src="shelter.png"/>
+		</itemgra>
+		<itemgra item_types="poi_fountain" order="13-">
+			<icon src="fountain.png"/>
+		</itemgra>
+		<itemgra item_types="poi_potable_water" order="13-">
+			<icon src="drinking_water.png"/>
+		</itemgra>
+		<itemgra item_types="poi_toilets" order="12-">
+			<icon src="toilets.png"/>
+		</itemgra>
+		<itemgra item_types="poi_viewpoint" order="10-">
+			<icon src="viewpoint.png"/>
+		</itemgra>
+		<itemgra item_types="tec_common" order="11-">
+			<icon src="tec_common.png"/>
+		</itemgra>
+		<itemgra item_types="vehicle" order="0-">
+			<icon src="gui_vehicle_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="vehicle_pedestrian" order="0-">
+			<icon src="gui_vehicle_pedestrian_16_16.png"/>
+		</itemgra>
+		<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="10-">
+			<icon src="%s"/>
+		</itemgra>
+	</layer>
+	<layer name="POI Labels">
+		<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_bicycle,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
+			<circle color="#606060" radius="0" width="0" text_size="10"/>
+		</itemgra>
+		<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="14-">
+			<circle color="#606060" radius="0" width="0" text_size="10"/>
+		</itemgra>
+	</layer>
+	<layer name="Found items" ref="Found items"/>
+</layout>
diff --git a/navit/navit_layout_car_simple_shipped.xml b/navit/navit_layout_car_simple_shipped.xml
new file mode 100644
index 000000000..4029833f5
--- /dev/null
+++ b/navit/navit_layout_car_simple_shipped.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude" name="Car-simple" color="#839ea9">
+	<layer name="polygon">
+		<itemgra item_types="poly_town" order="8-">
+			<polygon color="#6b8091"/>
+		</itemgra>
+	</layer>
+	<layer name="streets">
+		<itemgra item_types="water_line" order="11-">
+			<polyline width="3" color="#5e71a7"/>
+		</itemgra>
+		<itemgra item_types="rail" order="9-">
+			<polyline width="4" color="#a4bac8"/>
+			<polyline width="1" color="#e0e0e0" dash="4,6"/>
+		</itemgra>
+		<itemgra item_types="street_1_city,street_1_land" order="12-">
+			<polyline width="5" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="12-">
+			<polyline width="7" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_1_city,street_1_land" order="11">
+			<polyline width="3" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="9-11">
+			<polyline width="5" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="11-">
+			<polyline width="9" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="8-10">
+			<polyline width="7" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-">
+			<polyline width="9" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10">
+			<polyline width="7" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7">
+			<polyline width="3" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="4-">
+			<polyline width="9" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_route">
+			<polyline width="11" color="#516170"/>
+		</itemgra>
+		<itemgra item_types="street_1_city,street_1_land" order="12-">
+			<polyline width="3" color="#a4bac8"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="12-">
+			<polyline width="5" color="#90a3af"/>
+		</itemgra>
+		<itemgra item_types="street_1_city,street_1_land" order="11">
+			<polyline width="1" color="#a4bac8"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="9-11">
+			<polyline width="3" color="#90a3af"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="11-">
+			<polyline width="6" color="#a4bac8"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="8-10">
+			<polyline width="4" color="#a4bac8"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-">
+			<polyline width="6" color="#c7e1f2"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10">
+			<polyline width="4" color="#c7e1f2"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7">
+			<polyline width="1" color="#c7e1f2"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="4-">
+			<polyline width="3" color="#c0e1ff"/>
+		</itemgra>
+		<itemgra item_types="street_route">
+			<polyline width="9" color="#ffffff"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end">
+			<circle color="#000000" radius="8" width="2" text_size="24"/>
+		</itemgra>
+	</layer>
+	<layer name="labels">
+		<itemgra item_types="water_line" order="11-">
+			<text text_size="16" color="#0000ff"/>
+		</itemgra>
+		<itemgra item_types="street_1_city,street_2_city,street_3_city,street_4_city,highway_city,street_1_land,street_2_land,street_3_land,street_4_land,street_n_lanes,highway_land,living_street,footway">
+			<text text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="10-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e3,town_label_2e3,district_label_1e3,district_label_2e3" order="9-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_5e3,district_label_5e3" order="8-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e4,district_label_1e4" order="7-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e4,district_label_2e4" order="6-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_5e4,town_label_1e5,district_label_5e4,district_label_1e5" order="5-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_2e5,district_label_2e5" order="4-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_5e5,district_label_5e5" order="2-">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7,district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7">
+			<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
+		</itemgra>
+	</layer>
+	<layer name="Found items" ref="Found items"/>
+</layout>
diff --git a/navit/navit_layout_th_shipped.xml b/navit/navit_layout_th_shipped.xml
new file mode 100644
index 000000000..aebc79d6e
--- /dev/null
+++ b/navit/navit_layout_th_shipped.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0"?>
+<layout xmlns:xi="http://www.w3.org/2001/XInclude" name="T@H" font="Liberation Sans">
+	<cursor w="26" h="26">
+		<itemgra>
+			<circle color="#0000ff" radius="24" width="2">
+				<coord x="0" y="0"/>
+			</circle>
+		</itemgra>
+		<itemgra speed_range="-2">
+			<polyline color="#0000ff" width="2">
+				<coord x="0" y="0"/>
+				<coord x="0" y="0"/>
+			</polyline>
+		</itemgra>
+		<itemgra speed_range="3-">
+			<polyline color="#0000ff" width="2">
+				<coord x="-7" y="-10"/>
+				<coord x="0" y="12"/>
+				<coord x="7" y="-10"/>
+			</polyline>
+		</itemgra>
+	</cursor>
+	<layer name="sea" details="0">
+		<!-- landuse=forest -->
+		<itemgra item_types="poly_wood" order="0-">
+			<polygon color="#72bf81"/>
+		</itemgra>
+		<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
+			<polygon color="#a0a0a0"/>
+			<text text_size="5"/>
+		</itemgra>
+		<!-- landuse=residential -->
+		<itemgra item_types="poly_town" order="0-">
+			<polygon color="#f2f2f2"/>
+		</itemgra>
+		<!-- natural=water -->
+		<itemgra item_types="poly_water" order="0-">
+			<polygon color="#b5d6f1"/>
+			<polyline color="#b5d6f1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<itemgra item_types="poly_water_tiled" order="0-">
+			<polygon color="#b5d6f1"/>
+		</itemgra>
+		<!-- leisure=park -->
+		<itemgra item_types="poly_park" order="0-">
+			<polygon color="#c7f1a3"/>
+			<polyline color="#79c691"/>
+			<text text_size="5"/>
+		</itemgra>
+		<itemgra item_types="poly_airport" order="0-">
+			<polygon color="#a0a0a0"/>
+		</itemgra>
+		<itemgra item_types="poly_sport" order="0-">
+			<polygon color="#4af04f"/>
+		</itemgra>
+		<!-- landuse=industrial -->
+		<itemgra item_types="poly_industry,poly_building,poly_place" order="0-">
+			<polygon color="#ecd8ff"/>
+		</itemgra>
+		<!-- waterway=stream -->
+		<itemgra item_types="water_line" order="0-4">
+			<polyline color="#b5d6f1" width="1"/>
+			<text text_size="8"/>
+		</itemgra>
+		<!-- railway=subway -->
+		<itemgra item_types="rail" order="6">
+			<polyline color="#aaaaaa" width="1"/>
+		</itemgra>
+		<itemgra item_types="rail" order="7-8">
+			<polyline color="#aaaaaa" width="2"/>
+		</itemgra>
+		<itemgra item_types="rail" order="9-">
+			<polyline color="#aaaaaa" width="6"/>
+		</itemgra>
+		<itemgra item_types="ferry" order="5-">
+			<polyline color="#000000" width="1"/>
+		</itemgra>
+		<itemgra item_types="border_country" order="0-">
+			<polyline color="#b8434e" width="1"/>
+		</itemgra>
+		<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="1"/>
+		</itemgra>
+		<itemgra item_types="height_line_2" order="0-">
+			<polyline color="#000000" width="2"/>
+		</itemgra>
+		<!-- routing -->
+		<itemgra item_types="street_route" order="2">
+			<polyline color="#0000a0" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="3-5">
+			<polyline color="#0000a0" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="6">
+			<polyline color="#0000a0" width="10"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="7-8">
+			<polyline color="#0000a0" width="16"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="9-10">
+			<polyline color="#0000a0" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="11">
+			<polyline color="#0000a0" width="28"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="12">
+			<polyline color="#0000a0" width="32"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="13">
+			<polyline color="#0000a0" width="52"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="14">
+			<polyline color="#0000a0" width="64"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="15">
+			<polyline color="#0000a0" width="68"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="16">
+			<polyline color="#0000a0" width="132"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="17">
+			<polyline color="#0000a0" width="268"/>
+		</itemgra>
+		<itemgra item_types="street_route" order="18">
+			<polyline color="#0000a0" width="530"/>
+		</itemgra>
+		<!-- highway=service,footway, ,... -->
+		<itemgra item_types="street_pedestrian,living_street" order="10">
+			<polyline color="#d2d2d2" width="3"/>
+			<polyline color="#dddddd" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="11">
+			<polyline color="#d2d2d2" width="5"/>
+			<polyline color="#dddddd" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="12">
+			<polyline color="#d2d2d2" width="8"/>
+			<polyline color="#dddddd" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="13">
+			<polyline color="#d2d2d2" width="9"/>
+			<polyline color="#dddddd" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="14">
+			<polyline color="#d2d2d2" width="13"/>
+			<polyline color="#dddddd" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="15">
+			<polyline color="#d2d2d2" width="18"/>
+			<polyline color="#dddddd" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="16">
+			<polyline color="#d2d2d2" width="21"/>
+			<polyline color="#dddddd" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="17">
+			<polyline color="#d2d2d2" width="25"/>
+			<polyline color="#dddddd" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_pedestrian,living_street" order="18">
+			<polyline color="#d2d2d2" width="40"/>
+			<polyline color="#dddddd" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_nopass" order="10">
+			<polyline color="#efeaa0" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_nopass" order="11-12">
+			<polyline color="#efeaa0" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_nopass" order="13-">
+			<polyline color="#efeaa0" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
+			<polyline color="#d2d2d2" width="4"/>
+			<polyline color="#ffffff" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
+			<polyline color="#d2d2d2" width="6"/>
+			<polyline color="#ffffff" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
+			<polyline color="#d2d2d2" width="10"/>
+			<polyline color="#ffffff" width="8"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
+			<polyline color="#d2d2d2" width="12"/>
+			<polyline color="#ffffff" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
+			<polyline color="#d2d2d2" width="15"/>
+			<polyline color="#ffffff" width="13"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
+			<polyline color="#d2d2d2" width="17"/>
+			<polyline color="#ffffff" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
+			<polyline color="#d2d2d2" width="33"/>
+			<polyline color="#ffffff" width="26"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
+			<polyline color="#d2d2d2" width="69"/>
+			<polyline color="#ffffff" width="61"/>
+		</itemgra>
+		<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
+			<polyline color="#d2d2d2" width="132"/>
+			<polyline color="#ffffff" width="126"/>
+		</itemgra>
+		<!-- highway=tertiary -->
+		<itemgra item_types="street_2_city,street_2_land" order="7-8">
+			<polyline color="#c4c4c4" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="9">
+			<polyline color="#c4c4c4" width="4"/>
+			<polyline color="#f7f496" width="2"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="10">
+			<polyline color="#c4c4c4" width="6"/>
+			<polyline color="#f7f496" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="11">
+			<polyline color="#c4c4c4" width="8"/>
+			<polyline color="#f7f496" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="12">
+			<polyline color="#c4c4c4" width="12"/>
+			<polyline color="#f7f496" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="13">
+			<polyline color="#c4c4c4" width="15"/>
+			<polyline color="#f7f496" width="11"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="14">
+			<polyline color="#c4c4c4" width="18"/>
+			<polyline color="#f7f496" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="15">
+			<polyline color="#c4c4c4" width="21"/>
+			<polyline color="#f7f496" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="16">
+			<polyline color="#c4c4c4" width="35"/>
+			<polyline color="#f7f496" width="30"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="17">
+			<polyline color="#c4c4c4" width="73"/>
+			<polyline color="#f7f496" width="67"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land" order="18">
+			<polyline color="#c4c4c4" width="144"/>
+			<polyline color="#f7f496" width="138"/>
+		</itemgra>
+		<!-- highway=secondary -->
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="7">
+			<polyline color="#fdbf6f" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="8">
+			<polyline color="#000000" width="2"/>
+			<polyline color="#fdbf6f" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="9">
+			<polyline color="#000000" width="5"/>
+			<polyline color="#fdbf6f" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="10">
+			<polyline color="#000000" width="8"/>
+			<polyline color="#fdbf6f" width="6"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="11">
+			<polyline color="#000000" width="9"/>
+			<polyline color="#fdbf6f" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="12">
+			<polyline color="#000000" width="11"/>
+			<polyline color="#fdbf6f" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="13">
+			<polyline color="#000000" width="16"/>
+			<polyline color="#fdbf6f" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="14">
+			<polyline color="#000000" width="19"/>
+			<polyline color="#fdbf6f" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="15">
+			<polyline color="#000000" width="23"/>
+			<polyline color="#fdbf6f" width="21"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="16">
+			<polyline color="#000000" width="36"/>
+			<polyline color="#fdbf6f" width="34"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="17">
+			<polyline color="#000000" width="75"/>
+			<polyline color="#fdbf6f" width="73"/>
+		</itemgra>
+		<itemgra item_types="street_3_city,street_3_land,ramp" order="18">
+			<polyline color="#000000" width="152"/>
+			<polyline color="#fdbf6f" width="150"/>
+		</itemgra>
+		<!-- highway=primary -->
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
+			<polyline color="#e46d71" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
+			<polyline color="#e46d71" width="3"/>
+			<polyline color="#e46d71" width="1"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
+			<polyline color="#e46d71" width="5"/>
+			<polyline color="#e46d71" width="3"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
+			<polyline color="#e46d71" width="6"/>
+			<polyline color="#e46d71" width="4"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
+			<polyline color="#e46d71" width="9"/>
+			<polyline color="#e46d71" width="7"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
+			<polyline color="#e46d71" width="13"/>
+			<polyline color="#e46d71" width="9"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
+			<polyline color="#e46d71" width="18"/>
+			<polyline color="#e46d71" width="14"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
+			<polyline color="#e46d71" width="21"/>
+			<polyline color="#e46d71" width="17"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
+			<polyline color="#e46d71" width="24"/>
+			<polyline color="#e46d71" width="20"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
+			<polyline color="#e46d71" width="39"/>
+			<polyline color="#e46d71" width="33"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
+			<polyline color="#e46d71" width="78"/>
+			<polyline color="#e46d71" width="72"/>
+		</itemgra>
+		<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
+			<polyline color="#e46d71" width="156"/>
+			<polyline color="#e46d71" width="150"/>
+		</itemgra>
+		<!-- highway=motorway -->
+		<itemgra item_types="highway_city,highway_land" order="2">
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="3-5">
+			<polyline color="#87908a" width="3"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="6">
+			<polyline color="#87908a" width="4"/>
+			<polyline color="#809bc0" width="2"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="7-8">
+			<polyline color="#87908a" width="7"/>
+			<polyline color="#809bc0" width="5"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="9-10">
+			<polyline color="#87908a" width="9"/>
+			<polyline color="#809bc0" width="5"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="11">
+			<polyline color="#87908a" width="13"/>
+			<polyline color="#809bc0" width="9"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="12">
+			<polyline color="#87908a" width="15"/>
+			<polyline color="#809bc0" width="10"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="13">
+			<polyline color="#87908a" width="25"/>
+			<polyline color="#809bc0" width="17"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="14">
+			<polyline color="#87908a" width="31"/>
+			<polyline color="#809bc0" width="24"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="15">
+			<polyline color="#87908a" width="33"/>
+			<polyline color="#809bc0" width="27"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="16">
+			<polyline color="#87908a" width="65"/>
+			<polyline color="#809bc0" width="59"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="17">
+			<polyline color="#87908a" width="133"/>
+			<polyline color="#809bc0" width="127"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_city,highway_land" order="18">
+			<polyline color="#87908a" width="264"/>
+			<polyline color="#809bc0" width="258"/>
+			<polyline color="#809bc0" width="1"/>
+		</itemgra>
+		<itemgra item_types="highway_exit_label" order="10-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<!-- highway=primary (font)-->
+		<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
+			<text text_size="9"/>
+		</itemgra>
+		<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
+			<text text_size="9"/>
+		</itemgra>
+		<!-- place=suburb -->
+		<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="9-">
+			<circle color="#000000" radius="3" text_size="9"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="10-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
+			<circle color="#000000" radius="3" text_size="10"/>
+		</itemgra>
+		<!-- place=city -->
+		<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
+			<circle color="#000000" radius="3" text_size="15"/>
+		</itemgra>
+		<itemgra item_types="rg_point" order="0-">
+			<circle color="#FF089C" radius="10"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="2">
+			<circle color="#008080" radius="4" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="3-5">
+			<circle color="#008080" radius="8" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="6">
+			<circle color="#008080" radius="10" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="7-8">
+			<circle color="#008080" radius="16" width="2" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="9-10">
+			<circle color="#008080" radius="20" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="11">
+			<circle color="#008080" radius="28" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="12">
+			<circle color="#008080" radius="32" width="4" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="13">
+			<circle color="#008080" radius="52" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="14">
+			<circle color="#008080" radius="64" width="4" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="15">
+			<circle color="#008080" radius="68" width="6" text_size="24"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="16">
+			<circle color="#008080" radius="132" width="8" text_size="32"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="17">
+			<circle color="#008080" radius="268" width="8" text_size="48"/>
+		</itemgra>
+		<itemgra item_types="waypoint,route_end" order="18">
+			<circle color="#008080" radius="530" width="8" text_size="48"/>
+		</itemgra>
+		<!-- !!!!...POIs...!!!! -->
+		<!-- amenity=bank -->
+		<itemgra item_types="poi_bank" order="14-">
+			<icon src="bank.png"/>
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<itemgra item_types="poi_atm" order="12-">
+			<icon src="atm.png"/>
+		</itemgra>
+		<!-- amenity=fuel -->
+		<itemgra item_types="poi_fuel" order="14-">
+			<icon src="fuel.png"/>
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<!-- amenity=hospitalg -->
+		<itemgra item_types="poi_hospital" order="14-">
+			<icon src="hospital.png"/>
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<!-- amenity=parking -->
+		<itemgra item_types="poi_car_parking" order="14-">
+			<icon src="parking.png"/>
+		</itemgra>
+		<!-- amenity=police -->
+		<itemgra item_types="poi_police" order="14-">
+			<icon src="police.png"/>
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<!-- amenity=restaurant -->
+		<itemgra item_types="poi_restaurant" order="14-">
+			<icon src="restaurant.png"/>
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<!-- leisure=golf_curse -->
+		<itemgra item_types="poi_golf" order="14-">
+			<icon src="golf.png"/>
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+		<!-- tourism=hotel -->
+		<itemgra item_types="poi_hotel" order="14-">
+			<icon src="hotel.png"/>
+			<circle color="#000000" radius="3" text_size="7"/>
+		</itemgra>
+	</layer>
+	<layer name="Found items" ref="Found items"/>
+</layout>
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index ae2eedd37..9e87d2fba 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -27,27 +27,32 @@
 	<!-- timestamps 0/1 - prefix log messages with a timestamp -->
 	<debug name="timestamps" level="0"/>
 
-	<!-- center= defines which map location Navit will show after first start.
-		It will only be used for the first start; subsequent starts will remember the
-		last position (in center.txt).
-		Center coordinates format: "Long Lat" in decimal degrees (WGS 84).
-		For other formats see http://wiki.navit-project.org/index.php/Coordinate_format.
-		-->
-	<navit center="11.5666 48.1333" zoom="256" tracking="1" orientation="-1" recent_dest="250" drag_bitmap="0">
-		<!-- Use one of gtk_drawing_area, qt_qpainter or sdl.
-		     On windows systems, use win32 -->
+	<!--
+	center= defines which map location Navit will show after first start.
+	It will only be used for the first start; subsequent starts will remember the
+	last position (in center.txt).
+	Center coordinates format: "Long Lat" in decimal degrees (WGS 84).
+	For other formats see http://wiki.navit-project.org/index.php/Coordinate_format.
+	-->
+	<navit center="11.5666 48.1333" zoom="256" tracking="1" orientation="-1" recent_dest="250" drag_bitmap="0" default_layout="Car">
+		<!-- Use one of gtk_drawing_area, qt_qpainter or sdl. On windows systems, use win32 -->
 		<graphics type="gtk_drawing_area"/>
-		<!-- The following line let you select which graphical user interface you'd like to use.
+		<!--
+		The following line let you select which graphical user interface you'd like to use.
 		Options include internal (optimized for touch screen devices), gtk (useful for desktop computers).
-		If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag -->
+		If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag
+		-->
 		<gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/>
-	<!--
-			In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport.
-			Here's an example for a freerunner: -->
-		<!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> -->
-		<!-- The action that appears on map click is configurable with the attribute "on_map_click".
-		     To get the prvious behaviour of showing the map point menu use on_map_click='menu("#Map Point")'
-	        -->
+		<!--
+		In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport.
+		Here's an example for a freerunner:
+		<gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/>
+		-->
+
+		<!--
+		The action that appears on map click is configurable with the attribute "on_map_click".
+		To get the previous behaviour of showing the map point menu use on_map_click='menu("#Map Point")'
+		-->
 		<gui type="internal" enabled="yes"><![CDATA[
 			<html>
 				<a name='Main Menu'><text>Main menu</text>
@@ -359,7 +364,7 @@ Waypoint</text></img>
                         <roadprofile item_types="street_n_lanes" speed="80" route_weight="80"/>
                         <roadprofile item_types="highway_land" speed="80" route_weight="80"/>
                         <roadprofile item_types="ramp" speed="30" route_weight="30"/>
-			<!--roundabout does not apply to OSMaps -->
+                        <!--roundabout does not apply to OSMaps -->
                         <roadprofile item_types="roundabout" speed="5" route_weight="5"/>
                         <roadprofile item_types="ferry" speed="40" route_weight="40"/>
                 </vehicleprofile>
@@ -374,9 +379,11 @@ Waypoint</text></img>
 			<announce type="street_n_lanes,highway_land" level0="300" level1="1000" level2="2000" unit="m"/>
 		</navigation>
 
-		<!-- Navit provides speech output in text format.
-			If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
-			The default is text output to the shell -->
+		<!--
+		Navit provides speech output in text format.
+		If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
+		The default is text output to the shell
+		-->
 		<speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/>
 		<!--
 		Instead of using a speech synthesizer, navit can also play pre-recorded samples for each word.
@@ -385,7 +392,7 @@ Waypoint</text></img>
 		<speech type="cmdline" data="aplay -q %s"
 		sample_dir="/path/to/sampledir" sample_suffix=".wav" flags="1"
 		vocabulary_name="0" vocabulary_name_systematic="0" vocabulary_distances="0"/>
-                -->
+		-->
 
 		<!-- You can only have enabled only one mapset at time, but with as much maps enabled as you want -->
 
@@ -420,6896 +427,15 @@ Waypoint</text></img>
 			</itemgra>
 		</layer>
 
-		<layout name="Car" nightlayout="Car-dark" color="#ffefb7" font="Liberation Sans">
-
-			<cursor w="57" h="57">
-				<itemgra speed_range="-2">
-					<polyline color="#00BC00" radius="0" width="4">
-						<coord x="0" y="0" />
-					</polyline>
-					<circle color="#008500" radius="9" width="3">
-						<coord x="0" y="0" />
-					</circle>
-					<circle color="#00BC00" radius="13" width="3">
-						<coord x="0" y="0" />
-					</circle>
-					<circle color="#008500" radius="18" width="3">
-						<coord x="0" y="0" />
-					</circle>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polygon color="#008500">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="-21" y="-18" />
-					</polygon>
-					<polygon color="#00BC00">
-						<coord x="21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="21" y="-18" />
-					</polygon>
-					<polygon color="#009C00">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="-21" y="-18" />
-					</polygon>
-					<polygon color="#006500">
-						<coord x="21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="21" y="-18" />
-					</polygon>
-					<polyline color="#008500" width="1">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="-21" y="-18" />
-					</polyline>
-					<polyline color="#008500" width="1">
-						<coord x="21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="21" y="-18" />
-					</polyline>
-					<polyline color="#008500" width="1">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="-21" y="-18" />
-					</polyline>
-					<polyline color="#008500" width="1">
-						<coord x="21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="21" y="-18" />
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="polygons">
-				<itemgra item_types="image" order="0-">
-					<image/>
-				</itemgra>
-				<itemgra item_types="poly_nature_reserve" order="10-">
-					<polygon color="#cedec6"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_glacier" order="10-">
-					<polygon color="#ddecec"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#ffc895"/>
-					<polyline color="#ebb481"/>
-				</itemgra>
-				<itemgra item_types="poly_naval_base" order="10-">
-					<polygon color="#6a9993"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_airfield" order="10-">
-					<polygon color="#ecd3cf"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_university" order="8-">
-					<polygon color="#d68fb8"/>
-					<polyline color="#881155"/>
-				</itemgra>
-				<itemgra item_types="poly_college" order="10-">
-					<polygon color="#f4f4f4"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_attraction" order="10-">
-					<polygon color="#01a36c"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_theme_park" order="10-">
-					<polygon color="#01a36c"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_water_park" order="10-">
-					<polygon color="#8cc1c8"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_zoo" order="10-">
-					<polygon color="#ccbda5"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_depot" order="10-">
-					<polygon color="#c2b098"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_railway" order="10-">
-					<polygon color="#b3b9c5"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_port" order="10-">
-					<polygon color="#8188a0"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_marina" order="10-">
-					<polygon color="#aac4d2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_commercial" order="10-">
-					<polygon color="#eaeed3"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_retail" order="10-">
-					<polygon color="#d6b690"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_plaza" order="10-">
-					<polygon color="#cac4bc"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_battlefield" order="10-">
-					<polygon color="#373d1c"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_archaeological_site" order="10-">
-					<polygon color="#d9cfb6"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_ruins" order="10-">
-					<polygon color="#d9cfb6"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_camp_site" order="10-">
-					<polygon color="#339900"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_caravan_site" order="10-">
-					<polygon color="#8d9723"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_golf_course" order="10-">
-					<polygon color="#419a22"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_marsh" order="10-">
-					<polygon color="#553f23"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_fell" order="10-">
-					<polygon color="#bbb56b"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_greenfield" order="10-">
-					<polygon color="#f1eee8"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_brownfield" order="10-">
-					<polygon color="#b6b690"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_heath" order="10-">
-					<polygon color="#d6d99f"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_scree" order="10-">
-					<polygon color="#eee5dc"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_quarry" order="10-">
-					<polygon color="#e4caad"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_landfill" order="10-">
-					<polygon color="#999893"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_construction" order="10-">
-					<polygon color="#f47216"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_range" order="10-">
-					<polygon color="#6d6b63"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_danger_area" order="10-">
-					<polygon color="#f2ba1b"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_common" order="10-">
-					<polygon color="#7bab36"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_recreation_ground" order="10-">
-					<polygon color="#8fa400"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_playground" order="10-">
-					<polygon color="#b4c479"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_fishing" order="10-">
-					<polygon color="#713907"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_allotments" order="10-">
-					<polygon color="#eecfb3"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_garden" order="10-">
-					<polygon color="#cfeca8"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_village_green" order="10-">
-					<polygon color="#93ac47"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_picnic_site" order="10-">
-					<polygon color="#797548"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_wood" order="0-">
-					<polygon color="#8ec78d"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_greenhouse" order="10-">
-					<polygon color="#f9e8cb"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_orchard" order="10-">
-					<polygon color="#9edc90"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_plantnursery" order="10-">
-					<polygon color="#addea2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_farm" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_meadow" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-				</itemgra>
-				<itemgra item_types="poly_water_tiled" order="0-">
-					<polygon color="#82c8ea"/>
-				</itemgra>
-				<itemgra item_types="poly_land" order="0-">
-					<polygon color="#ffefb7"/>
-					<polyline color="#ffefb7"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="9-">
-					<polygon color="#a0a0a0"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#7cc334"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_beach" order="0-">
-					<polygon color="#fbed66"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_mud" order="0-">
-					<polygon color="#96ced4"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#a0a0a0"/>
-				</itemgra>
-				<itemgra item_types="poly_sport,poly_sports_pitch" order="0-">
-					<polygon color="#4af04f"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_place" order="0-">
-					<polygon color="#e6e6e6"/>
-				</itemgra>
-				<itemgra item_types="poly_service" order="8-18">
-					<polygon color="#fefefe"/>
-					<polyline color="#d2d2d2" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="8-13">
-					<polygon color="#ffffff"/>
-					<polyline color="#d2d2d2" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="14-16">
-					<polygon color="#ffffff"/>
-					<polyline color="#d2d2d2" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="17-18">
-					<polygon color="#ffffff"/>
-					<polyline color="#d2d2d2" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="7-12">
-					<polygon color="#ffff00"/>
-					<polyline color="#c0c0c0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="13-16">
-					<polygon color="#ffff00"/>
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="17-18">
-					<polygon color="#ffff00"/>
-					<polyline color="#c0c0c0" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="7-11">
-					<polygon color="#ffff00"/>
-					<polyline color="#a0a0a0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="12-15">
-					<polygon color="#ffff00"/>
-					<polyline color="#a0a0a0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="16-18">
-					<polygon color="#ffff00"/>
-					<polyline color="#a0a0a0" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_saltpond" order="10-">
-					<polygon color="#d7804a"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
-					<polygon color="#82c8ea"/>
-					<polyline color="#5096b8"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_line" order="0-">
-					<polyline color="#5096b8" width="1"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="4-5">
-					<polyline color="#82c8ea" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="6">
-					<polyline color="#82c8ea" width="2"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="7">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="8-9">
-					<polyline color="#82c8ea" width="4"/>
-					<text text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="10-">
-					<polyline color="#82c8ea" width="4"/>
-					<text text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="6">
-					<polyline color="#82c8ea" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="7">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="8-9">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="10-">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="8-9">
-					<polyline color="#82c8ea" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="10-">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_drain" order="10-">
-					<polyline color="#82c8ea" width="1"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_apron" order="0-">
-					<polygon color="#d0d0d0"/>
-				</itemgra>
-				<itemgra item_types="poly_terminal" order="7-">
-					<polygon color="#e3c6a6"/>
-				</itemgra>
-				<itemgra item_types="poly_cemetery" order="1-">
-					<polygon color="#bde3cb"/>
-				</itemgra>
-				<itemgra item_types="poly_car_parking" order="1-">
-					<polygon color="#e7cf87"/>
-				</itemgra>
-				<itemgra item_types="poly_artwork" order="10-">
-					<polygon color="#fefbc5"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_sports_stadium" order="10-">
-					<polygon color="#6eb85d"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_sports_track" order="10-">
-					<polygon color="#b6554e"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_barracks" order="10-">
-					<polygon color="#b6a6a6"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_garages" order="10-">
-					<polygon color="#deddcc"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_building" order="0-">
-					<polygon color="#b6a6a6"/>
-				</itemgra>
-				<itemgra item_types="rail" order="6-">
-					<polyline color="#696969" width="3"/>
-					<polyline color="#ffffff" width="1" dash="5,5"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#000000" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-">
-					<polyline color="#b8434e" width="1" dash="10,5,2,5"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="0-">
-					<polyline color="#808080" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="heightlines">
-				<itemgra item_types="height_line_1" order="7">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<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="12-">
-					<polyline color="#000000" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-			</layer>
-			<layer name="streets">
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#0000a0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#0000a0" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#0000a0" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#0000a0" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#0000a0" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#0000a0" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#0000a0" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#0000a0" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#0000a0" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#0000a0" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#0000a0" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#0000a0" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#0000a0" width="530"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="2">
-					<polyline color="#ba00b8" width="4"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="3-5">
-					<polyline color="#ba00b8" width="8"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="6">
-					<polyline color="#ba00b8" width="10"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="7-8">
-					<polyline color="#ba00b8" width="16"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="9-10">
-					<polyline color="#ba00b8" width="20"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="11">
-					<polyline color="#ba00b8" width="28"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="12">
-					<polyline color="#ba00b8" width="32"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="13">
-					<polyline color="#ba00b8" width="52"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="14">
-					<polyline color="#ba00b8" width="64"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="15">
-					<polyline color="#ba00b8" width="68"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="16">
-					<polyline color="#ba00b8" width="132"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="17">
-					<polyline color="#ba00b8" width="268"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="18">
-					<polyline color="#ba00b8" width="530"/>
-				</itemgra>
-				<itemgra item_types="forest_way_1" order="10-">
-					<polyline color="#0070c0" width="6"/>
-				</itemgra>
-				<itemgra item_types="forest_way_2" order="10-">
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="forest_way_3" order="10-">
-					<polyline color="#ff0000" width="1" dash="2,4"/>
-				</itemgra>
-				<itemgra item_types="forest_way_4" order="10-">
-					<polyline color="#119a2e" width="1" dash="4,10"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_paved" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="10-12">
-					<polyline color="#800000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="13-14">
-					<polyline color="#ffffff" width="4"/>
-					<polyline color="#800000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="15-16">
-					<polyline color="#ffffff" width="5"/>
-					<polyline color="#800000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="17-">
-					<polyline color="#ffffff" width="7"/>
-					<polyline color="#800000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="track_unpaved,track_ground,path,hiking,hiking_mountain,hiking_mountain_demanding,hiking_alpine,hiking_alpine_demanding,hiking_alpine_difficult" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="bridleway" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="cycleway" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="10-12">
-					<polyline color="#00A000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="13-14">
-					<polyline color="#00A000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="15-16">
-					<polyline color="#00A000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="17-">
-					<polyline color="#00A000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="10-12">
-					<polyline color="#0000ff" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="13-14">
-					<polyline color="#0000ff" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="15-16">
-					<polyline color="#0000ff" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="17-">
-					<polyline color="#0000ff" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="10-12">
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="13-14">
-					<polyline color="#ff0000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="15-16">
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="17-">
-					<polyline color="#ff0000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="10-12">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="13-14">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="15-16">
-					<polyline color="#000000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="17-">
-					<polyline color="#000000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="10-12">
-					<polyline color="#ffaa00" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="13-14">
-					<polyline color="#ffaa00" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="15-16">
-					<polyline color="#ffaa00" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="17-">
-					<polyline color="#ffaa00" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="10-12">
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="13-14">
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="15-16">
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="17-">
-					<polyline color="#ffff00" width="5"/>
-				</itemgra>
-				<itemgra item_types="lift_cable_car" order="6-">
-					<polyline color="#696969" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_chair" order="6-">
-					<polyline color="#696969" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_drag" order="6-">
-					<polyline color="#696969" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="10-12">
-					<polyline color="#0000ff" width="1" dash="3,6" offset="4"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="13-14">
-					<polyline color="#ffffff" width="4" offset="6"/>
-					<polyline color="#0000ff" width="1" dash="4,8" offset="6"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="15-16">
-					<polyline color="#ffffff" width="5" offset="7"/>
-					<polyline color="#0000ff" width="1" dash="5,10" offset="7"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="17-">
-					<polyline color="#ffffff" width="7" offset="10"/>
-					<polyline color="#0000ff" width="1" dash="7,15" offset="10"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="10-12">
-					<polyline color="#ff0000" width="1" dash="3,15"/>
-					<polyline color="#0000ff" width="1" dash="3,15" offset="9"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="13-14">
-					<polyline color="#ffffff" width="4"/>
-					<polyline color="#ff0000" width="2"/>
-					<polyline color="#0000ff" width="1" dash="4,20" offset="12"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="15-16">
-					<polyline color="#ffffff" width="5"/>
-					<polyline color="#ff0000" width="3"/>
-					<polyline color="#0000ff" width="1" dash="5,25" offset="15"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="17-">
-					<polyline color="#ffffff" width="7"/>
-					<polyline color="#ff0000" width="5"/>
-					<polyline color="#0000ff" width="1" dash="7,37" offset="22"/>
-				</itemgra>
-				<itemgra item_types="footway" order="10-12">
-					<polyline color="#ff0000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="footway" order="13-14">
-					<polyline color="#ffffff" width="4"/>
-					<polyline color="#ff0000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="footway" order="15-16">
-					<polyline color="#ffffff" width="5"/>
-					<polyline color="#ff0000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="footway" order="17-">
-					<polyline color="#ffffff" width="7"/>
-					<polyline color="#ff0000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="steps" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="11">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="12">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="13">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="14">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="15">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="16">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="17">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#fefefe" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="18">
-					<polyline color="#d2d2d2" width="11"/>
-					<polyline color="#fefefe" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="12">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="13">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="14">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="15">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="16">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="17">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="18">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#ffffff" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#ffffff" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#ffffff" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#d2d2d2" width="11"/>
-					<polyline color="#ffffff" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#d2d2d2" width="17"/>
-					<polyline color="#ffffff" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#ffffff" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#d2d2d2" width="30"/>
-					<polyline color="#ffffff" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#d2d2d2" width="67"/>
-					<polyline color="#ffffff" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#d2d2d2" width="132"/>
-					<polyline color="#ffffff" width="126"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="7-8">
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="9">
-					<polyline color="#c0c0c0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="10">
-					<polyline color="#c0c0c0" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="11">
-					<polyline color="#c0c0c0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="12">
-					<polyline color="#c0c0c0" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="13">
-					<polyline color="#c0c0c0" width="11"/>
-					<polyline color="#ffff00" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="14">
-					<polyline color="#c0c0c0" width="14"/>
-					<polyline color="#ffff00" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="15">
-					<polyline color="#c0c0c0" width="19"/>
-					<polyline color="#ffff00" width="15"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="16">
-					<polyline color="#c0c0c0" width="30"/>
-					<polyline color="#ffff00" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="17">
-					<polyline color="#c0c0c0" width="63"/>
-					<polyline color="#ffff00" width="57"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="18">
-					<polyline color="#c0c0c0" width="100"/>
-					<polyline color="#ffff00" width="90"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="7-8">
-					<polyline color="#a0a0a0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="9">
-					<polyline color="#a0a0a0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="10">
-					<polyline color="#a0a0a0" width="8"/>
-					<polyline color="#ffff00" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="11">
-					<polyline color="#a0a0a0" width="9"/>
-					<polyline color="#ffff00" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="12">
-					<polyline color="#a0a0a0" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="13">
-					<polyline color="#a0a0a0" width="18"/>
-					<polyline color="#ffff00" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="14">
-					<polyline color="#a0a0a0" width="21"/>
-					<polyline color="#ffff00" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="15">
-					<polyline color="#a0a0a0" width="25"/>
-					<polyline color="#ffff00" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="16">
-					<polyline color="#a0a0a0" width="40"/>
-					<polyline color="#ffff00" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="17">
-					<polyline color="#a0a0a0" width="79"/>
-					<polyline color="#ffff00" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="18">
-					<polyline color="#a0a0a0" width="156"/>
-					<polyline color="#ffff00" width="150"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#000000" width="5"/>
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#000000" width="6"/>
-					<polyline color="#ff0000" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#000000" width="9"/>
-					<polyline color="#ff0000" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#000000" width="13"/>
-					<polyline color="#ff0000" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#000000" width="18"/>
-					<polyline color="#ff0000" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#000000" width="21"/>
-					<polyline color="#ff0000" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#000000" width="24"/>
-					<polyline color="#ff0000" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#000000" width="39"/>
-					<polyline color="#ff0000" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#000000" width="78"/>
-					<polyline color="#ff0000" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#000000" width="156"/>
-					<polyline color="#ff0000" width="150"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#ff0000" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#ff0000" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#ff0000" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#ff0000" width="9"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#ff0000" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#ff0000" width="15"/>
-					<polyline color="#ffff00" width="10"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#ff0000" width="25"/>
-					<polyline color="#ffff00" width="17"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#ff0000" width="31"/>
-					<polyline color="#ffff00" width="24"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#ff0000" width="33"/>
-					<polyline color="#ffff00" width="27"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#ff0000" width="65"/>
-					<polyline color="#ffff00" width="59"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#ff0000" width="133"/>
-					<polyline color="#ffff00" width="127"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#ff0000" width="264"/>
-					<polyline color="#ffff00" width="258"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="tracking_0" order="0-">
-					<polyline color="#000000" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_10" order="0-">
-					<polyline color="#191919" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_20" order="0-">
-					<polyline color="#333333" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_30" order="0-">
-					<polyline color="#4c4c4c" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_40" order="0-">
-					<polyline color="#666666" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_50" order="0-">
-					<polyline color="#7f7f7f" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_60" order="0-">
-					<polyline color="#999999" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_70" order="0-">
-					<polyline color="#b2b2b2" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_80" order="0-">
-					<polyline color="#cccccc" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_90" order="0-">
-					<polyline color="#e5e5e5" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_100" order="0-">
-					<polyline color="#ffffff" width="3"/>
-				</itemgra>
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="2">
-					<polyline color="#ff9000" width="2"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="3-5">
-					<polyline color="#ff9000" width="4"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="6">
-					<polyline color="#ff9000" width="5"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="7-8">
-					<polyline color="#ff9000" width="8"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="9-10">
-					<polyline color="#ff9000" width="10"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="11">
-					<polyline color="#ff9000" width="14"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="12">
-					<polyline color="#ff9000" width="16"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="13">
-					<polyline color="#ff9000" width="26"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="14">
-					<polyline color="#ff9000" width="32"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="15">
-					<polyline color="#ff9000" width="34"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="16">
-					<polyline color="#ff9000" width="66"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="17">
-					<polyline color="#ff9000" width="134"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="18">
-					<polyline color="#ff9000" width="265"/>
-				</itemgra>
-			</layer>
-			<layer name="polylines">
-				<itemgra item_types="aeroway_taxiway" order="10">
-					<polyline color="#989994" width="4"/>
-					<polyline color="#d3dbbc" width="2"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="11">
-					<polyline color="#989994" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="12">
-					<polyline color="#989994" width="10"/>
-					<polyline color="#d3dbbc" width="8"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="13">
-					<polyline color="#989994" width="12"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="14">
-					<polyline color="#989994" width="15"/>
-					<polyline color="#d3dbbc" width="13"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="15">
-					<polyline color="#989994" width="17"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="16">
-					<polyline color="#989994" width="33"/>
-					<polyline color="#d3dbbc" width="26"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="17">
-					<polyline color="#989994" width="69"/>
-					<polyline color="#d3dbbc" width="61"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="18">
-					<polyline color="#989994" width="132"/>
-					<polyline color="#d3dbbc" width="126"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#d3dbbc" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="9">
-					<polyline color="#6b6f5f" width="5"/>
-					<polyline color="#d3dbbc" width="3"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="10">
-					<polyline color="#6b6f5f" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="11">
-					<polyline color="#6b6f5f" width="9"/>
-					<polyline color="#d3dbbc" width="7"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="12">
-					<polyline color="#6b6f5f" width="13"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="13">
-					<polyline color="#6b6f5f" width="18"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="14">
-					<polyline color="#6b6f5f" width="21"/>
-					<polyline color="#d3dbbc" width="17"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="15">
-					<polyline color="#6b6f5f" width="24"/>
-					<polyline color="#d3dbbc" width="20"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="16">
-					<polyline color="#6b6f5f" width="39"/>
-					<polyline color="#d3dbbc" width="33"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="17">
-					<polyline color="#6b6f5f" width="78"/>
-					<polyline color="#d3dbbc" width="72"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="18">
-					<polyline color="#6b6f5f" width="156"/>
-					<polyline color="#d3dbbc" width="150"/>
-				</itemgra>
-				<itemgra item_types="rail_tram" order="10-">
-					<polyline color="#606060" width="2"/>
-				</itemgra>
-			</layer>
-			<layer name="labels">
-						<itemgra item_types="house_number" order="15-">
-						<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="11-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,place_label" order="10-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e3" order="9-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4" order="9-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="8-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e3" order="8">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="7-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e3" order="7-8">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4" order="6-8">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e4,town_label_5e4" order="5-8">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="5-">
-					<circle color="#000000" radius="3" text_size="20"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="3-4">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="3-4">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-2">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="Internal">
-				<itemgra item_types="track" order="7-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_tracked" order="7-">
-					<polyline color="#3f3fff" width="3"/>
-				</itemgra>
-				<itemgra item_types="rg_segment" order="12-">
-					<polyline color="#FF089C" width="1"/>
-					<arrows color="#FF089C" width="1"/>
-					<text text_size="15"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="12-">
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="nav_left_1" order="0-">
-					<icon src="nav_left_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_2" order="0-">
-					<icon src="nav_left_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_3" order="0-">
-					<icon src="nav_left_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_1" order="0-">
-					<icon src="nav_right_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_2" order="0-">
-					<icon src="nav_right_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_3" order="0-">
-					<icon src="nav_right_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_straight" order="0-">
-					<icon src="nav_straight_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_left" order="0-">
-					<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_right" order="0-">
-					<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l1" order="0-">
-					<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r1" order="0-">
-					<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l2" order="0-">
-					<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r2" order="0-">
-					<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l3" order="0-">
-					<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r3" order="0-">
-					<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l4" order="0-">
-					<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r4" order="0-">
-					<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l5" order="0-">
-					<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r5" order="0-">
-					<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l6" order="0-">
-					<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r6" order="0-">
-					<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l7" order="0-">
-					<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r7" order="0-">
-					<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l8" order="0-">
-					<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r8" order="0-">
-					<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_left" order="0-">
-					<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_left" order="0-">
-					<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_right" order="0-">
-					<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_right" order="0-">
-					<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_left" order="0-">
-					<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_right" order="0-">
-					<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="route_end" order="0-">
-					<icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
-				</itemgra>
-				<itemgra item_types="nav_none" order="0-">
-					<icon src="unknown.svg"/>
-				</itemgra>
-				<itemgra item_types="announcement" order="7-">
-					<icon src="gui_sound_32_32.png"/>
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#008080" radius="4" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#008080" radius="8" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#008080" radius="10" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#008080" radius="16" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#008080" radius="20" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#008080" radius="28" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#008080" radius="32" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#008080" radius="52" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#008080" radius="64" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#008080" radius="68" width="6" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#008080" radius="132" width="8" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#008080" radius="268" width="8" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#008080" radius="530" width="8" text_size="48"/>
-				</itemgra>
-			</layer>
-			<layer name="Unknown" enabled="no">
-				<!-- This entry shows all unknow point elements as blue circles -->
-				<itemgra item_types="point_unkn" order="9-">
-					<circle color="#8080ff" radius="3"/>
-				</itemgra>
-				<!-- This entry shows all unknown linear elements as blue lines -->
-				<itemgra item_types="street_unkn" order="0-">
-					<polyline color="#8080ff" width="3"/>
-				</itemgra>
-			</layer>
-			<layer name="POI Symbols">
-				<itemgra item_types="mini_roundabout" order="12-">
-					<icon src="mini_roundabout.png"/>
-				</itemgra>
-				<itemgra item_types="turning_circle" order="12-">
-					<icon src="mini_roundabout.png"/>
-				</itemgra>
-				<itemgra item_types="poi_airport" order="5-">
-					<icon src="airport.png"/>
-				</itemgra>
-				<itemgra item_types="town_ghost" order="10-">
-					<icon src="ghost_town.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_hotel" order="12-">
-					<icon src="hotel.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_parking" order="11-">
-					<icon src="parking.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_dealer_parts" order="12-">
-					<icon src="car_dealer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_sharing" order="11-">
-					<icon src="car_sharing.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fuel" order="12-">
-					<icon src="fuel.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shopping" order="12-">
-					<icon src="shopping.png"/>
-				</itemgra>
-				<itemgra item_types="poi_attraction" order="11-">
-					<icon src="attraction.png"/>
-				</itemgra>
-				<itemgra item_types="poi_cafe" order="12-">
-					<icon src="cafe.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bar" order="12-">
-					<icon src="bar.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pub" order="12-">
-					<icon src="beer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bridge" order="12-">
-					<icon src="bridge.xpm"/>
-				</itemgra>
-				<itemgra item_types="highway_exit" order="11-">
-					<icon src="exit.png"/>
-				</itemgra>
-				<itemgra item_types="poi_camp_rv" order="12-">
-					<icon src="camping.png"/>
-				</itemgra>
-				<itemgra item_types="poi_museum_history" order="12-">
-					<icon src="museum.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hospital" order="12-">
-					<icon src="hospital.png"/>
-				</itemgra>
-				<itemgra item_types="poi_dining" order="12-">
-					<icon src="restaurant.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fastfood" order="12-">
-					<icon src="fastfood.png"/>
-				</itemgra>
-				<itemgra item_types="poi_police" order="12-">
-					<icon src="police.png"/>
-				</itemgra>
-				<itemgra item_types="poi_auto_club" order="12-">
-					<icon src="auto_club.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_autoservice" order="12-">
-					<icon src="car_dealer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bank" order="12-">
-					<icon src="bank.png"/>
-				</itemgra>
-				<itemgra item_types="poi_atm" order="12-">
-					<icon src="atm.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bay" order="12-">
-					<icon src="bay.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_bend" order="12-">
-					<icon src="bend.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_boat_ramp" order="12-">
-					<icon src="boat_ramp.png"/>
-				</itemgra>
-				<itemgra item_types="poi_border_station" order="12-">
-					<icon src="border_station.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_bowling" order="12-">
-					<icon src="bowling.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_station" order="11-">
-					<icon src="bus.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_stop" order="12-">
-					<icon src="bus_stop.png"/>
-				</itemgra>
-				<itemgra item_types="poi_business_service" order="12-">
-					<icon src="business_service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_car_rent" order="12-">
-					<icon src="car_rent.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_wash" order="12-">
-					<icon src="car_wash.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_casino" order="12-">
-					<icon src="casino.png"/>
-				</itemgra>
-				<itemgra item_types="poi_cemetery" order="12-">
-					<icon src="cemetery.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_church" order="11-">
-					<icon src="church.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bahai" order="11-">
-					<icon src="bahai.png"/>
-				</itemgra>
-				<itemgra item_types="poi_buddhist" order="11-">
-					<icon src="buddhist.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hindu" order="11-">
-					<icon src="hindu.png"/>
-				</itemgra>
-				<itemgra item_types="poi_islamic" order="11-">
-					<icon src="islamic.png"/>
-				</itemgra>
-				<itemgra item_types="poi_jain" order="11-">
-					<icon src="jain.png"/>
-				</itemgra>
-				<itemgra item_types="poi_jewish" order="11-">
-					<icon src="jewish.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pagan" order="11-">
-					<icon src="pagan.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pastafarian" order="11-">
-					<icon src="pastafarian.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shinto" order="11-">
-					<icon src="shinto.png"/>
-				</itemgra>
-				<itemgra item_types="poi_sikh" order="11-">
-					<icon src="sikh.png"/>
-				</itemgra>
-				<itemgra item_types="poi_taoist" order="11-">
-					<icon src="taoist.png"/>
-				</itemgra>
-				<itemgra item_types="poi_cinema" order="12-">
-					<icon src="cinema.png"/>
-				</itemgra>
-				<itemgra item_types="poi_communication" order="12-">
-					<icon src="communication.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_concert" order="12-">
-					<icon src="concert.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_cove" order="12-">
-					<icon src="cove.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_crossing" order="12-">
-					<icon src="crossing.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_dam" order="12-">
-					<icon src="dam.png"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_area" order="12-">
-					<icon src="danger_16_16.png"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_sea_wreck" order="12-">
-					<icon src="dangerous.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_daymark" order="12-">
-					<icon src="daymark.png"/>
-				</itemgra>
-				<itemgra item_types="poi_diving" order="12-">
-					<icon src="diving.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_drinking_water" order="13-">
-					<icon src="drinking_water.png"/>
-				</itemgra>
-				<itemgra item_types="poi_emergency" order="12-">
-					<icon src="emergency.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fair" order="12-">
-					<icon src="fair.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_firebrigade" order="12-">
-					<icon src="firebrigade.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fish" order="9-">
-					<icon src="fish.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_forbidden_area" order="12-">
-					<icon src="forbidden_area.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_bicycle" order="12-">
-				<icon src="bicycle_shop.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_gps" order="15-">
-					<icon src="garmin.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_golf" order="12-">
-					<icon src="golf.png"/>
-				</itemgra>
-				<itemgra item_types="poi_government_building" order="12-">
-					<icon src="government_building.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_height" order="12-">
-					<icon src="height.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_heliport" order="8-">
-					<icon src="heliport.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hotspring" order="12-">
-					<icon src="hotspring.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_icesport" order="12-">
-					<icon src="icesport.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_information" order="12-">
-					<icon src="information.png"/>
-				</itemgra>
-				<itemgra item_types="poi_justice" order="12-">
-					<icon src="justice.png"/>
-				</itemgra>
-				<itemgra item_types="poi_landmark" order="11-">
-					<icon src="landmark.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_levee" order="12-">
-					<icon src="levee.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_level_crossing" order="11-">
-					<icon src="level_crossing.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_library" order="12-">
-					<icon src="library.png"/>
-				</itemgra>
-				<itemgra item_types="poi_locale" order="12-">
-					<icon src="locale.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_loudspeaker" order="12-">
-					<icon src="loudspeaker.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_mall" order="12-">
-					<icon src="mall.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_manmade_feature" order="12-">
-					<icon src="manmade_feature.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_marine" order="12-">
-					<icon src="marine.png"/>
-				</itemgra>
-				<itemgra item_types="poi_marine_type" order="12-">
-					<icon src="marine_type.png"/>
-				</itemgra>
-				<itemgra item_types="poi_mark" order="12-">
-					<icon src="mark.png"/>
-				</itemgra>
-				<itemgra item_types="poi_military" order="11-">
-					<icon src="military.png"/>
-				</itemgra>
-				<itemgra item_types="poi_mine" order="12-">
-					<icon src="mine.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_nondangerous" order="12-">
-					<icon src="nondangerous.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_oil_field" order="12-">
-					<icon src="oil_field.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_peak" order="7-">
-					<icon src="peak.png"/>
-				</itemgra>
-				<itemgra item_types="poi_personal_service" order="12-">
-					<icon src="personal_service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_pharmacy" order="12-">
-					<icon src="pharmacy.png"/>
-				</itemgra>
-				<itemgra item_types="poi_post_office,poi_post_box" order="13-">
-					<icon src="post.png"/>
-				</itemgra>
-				<itemgra item_types="poi_public_office" order="12-">
-					<icon src="public_office.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_halt" order="11-">
-					<circle color="#ff0000" radius="3" width="3"/>
-					<circle color="#000000" radius="5" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_station" order="9-">
-					<circle color="#ff0000" radius="3" width="3"/>
-					<circle color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="10-11">
-					<circle color="#ff0000" radius="2" width="2"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="12-">
-					<circle color="#ff0000" radius="3" width="3"/>
-					<circle color="#606060" radius="5" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_repair_service" order="12-">
-					<icon src="repair_service.png"/>
-				</itemgra>
-				<itemgra item_types="poi_resort" order="12-">
-					<icon src="resort.png"/>
-				</itemgra>
-				<itemgra item_types="poi_restaurant" order="12-">
-					<icon src="restaurant.png"/>
-				</itemgra>
-				<itemgra item_types="poi_restricted_area" order="12-">
-					<icon src="restricted_area.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_restroom" order="13-">
-					<icon src="toilets.png"/>
-				</itemgra>
-				<itemgra item_types="poi_sailing" order="12-">
-					<icon src="sailing.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_scenic_area" order="12-">
-					<icon src="scenic_area.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_school" order="12-">
-					<icon src="school.png"/>
-				</itemgra>
-				<itemgra item_types="poi_service" order="12-">
-					<icon src="service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_apparel" order="12-">
-					<icon src="shop_apparel.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_computer" order="12-">
-					<icon src="shop_computer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_department" order="12-">
-					<icon src="shop_department.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_furniture" order="12-">
-					<icon src="shop_furnish.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_grocery" order="12-">
-					<icon src="shop_grocery.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_handg" order="12-">
-					<icon src="shop_handg.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_merchandise" order="12-">
-					<icon src="shop_merchandise.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_retail" order="12-">
-					<icon src="shop_retail.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shower" order="13-">
-					<icon src="shower.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_skiing" order="11-">
-					<icon src="skiing.png"/>
-				</itemgra>
-				<itemgra item_types="poi_social_service" order="12-">
-					<icon src="social_service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_sounding" order="12-">
-					<icon src="sounding.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_sport" order="12-">
-					<icon src="sport.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_stadium" order="11-">
-					<icon src="stadium.png"/>
-				</itemgra>
-				<itemgra item_types="poi_swimming" order="12-">
-					<icon src="swimming.png"/>
-				</itemgra>
-				<itemgra item_types="poi_telephone" order="13-">
-					<icon src="telephone.png"/>
-				</itemgra>
-				<itemgra item_types="poi_theater" order="12-">
-					<icon src="theater.png"/>
-				</itemgra>
-				<itemgra item_types="poi_tide" order="12-">
-					<icon src="tide.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_tower" order="13-">
-					<icon src="tower.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_townhall" order="12-">
-					<icon src="townhall.png"/>
-				</itemgra>
-				<itemgra item_types="poi_trail" order="12-">
-					<icon src="trail.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_truck_stop" order="12-">
-					<icon src="truck_stop.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_tunnel" order="12-">
-					<icon src="tunnel.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_wine" order="12-">
-					<icon src="wine.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_worship" order="8-">
-					<icon src="worship.png"/>
-				</itemgra>
-				<itemgra item_types="poi_wrecker" order="12-">
-					<icon src="wrecker.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_zoo" order="9-">
-					<icon src="zoo.png"/>
-				</itemgra>
-				<itemgra item_types="poi_picnic" order="12-">
-					<icon src="picnic.png"/>
-				</itemgra>
-				<itemgra item_types="poi_playground" order="12-">
-					<icon src="playground.png"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_multi" order="12-">
-					<icon src="gc_multi.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_tradi" order="12-">
-					<icon src="gc_tradi.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_event" order="12-">
-					<icon src="gc_event.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_mystery" order="12-">
-					<icon src="gc_mystery.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_question" order="12-">
-					<icon src="gc_question.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_stages" order="12-">
-					<icon src="gc_stages.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_reference" order="12-">
-					<icon src="gc_reference.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_webcam" order="12-">
-					<icon src="gc_webcam.xpm"/>
-				</itemgra>
-				<itemgra item_types="traffic_signals" order="13-">
-					<icon src="traffic_signals.png"/>
-				</itemgra>
-				<itemgra item_types="poi_wifi" order="13-">
-					<icon src="wifi.png"/>
-				</itemgra>
-				<itemgra item_types="poi_taxi" order="13-">
-					<icon src="taxi.png"/>
-				</itemgra>
-				<itemgra item_types="poi_image" order="12-">
-					<image/>
-				</itemgra>
-				<!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bicyle layout. -->
-				<itemgra item_types="poi_bench" order="13-">
-					<icon src="bench.png"/>
-				</itemgra>
-				<itemgra item_types="poi_biergarten" order="12-">
-					<icon src="beer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_boundary_stone" order="13-">
-					<icon src="boundary_stone.png"/>
-				</itemgra>
-				<itemgra item_types="poi_castle" order="11-">
-					<icon src="castle.png"/>
-				</itemgra>
-				<itemgra item_types="poi_ruins" order="11-">
-					<icon src="ruins.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hunting_stand" order="12-">
-					<icon src="hunting_stand.png"/>
-				</itemgra>
-				<itemgra item_types="poi_memorial" order="12-">
-					<icon src="memorial.png"/>
-				</itemgra>
-				<itemgra item_types="poi_monument" order="12-">
-					<icon src="memorial.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shelter" order="11-">
-					<icon src="shelter.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fountain" order="13-">
-					<icon src="fountain.png"/>
-				</itemgra>
-				<itemgra item_types="poi_potable_water" order="13-">
-					<icon src="drinking_water.png"/>
-				</itemgra>
-				<itemgra item_types="poi_toilets" order="12-">
-					<icon src="toilets.png"/>
-				</itemgra>
-				<itemgra item_types="poi_viewpoint" order="10-">
-					<icon src="viewpoint.png"/>
-				</itemgra>
-				<itemgra item_types="tec_common" order="11-">
-					<icon src="tec_common.png"/>
-				</itemgra>
-				<itemgra item_types="vehicle" order="0-">
-					<icon src="gui_vehicle_16_16.png" />
-				</itemgra>
-				<itemgra item_types="vehicle_pedestrian" order="0-">
-					<icon src="gui_vehicle_pedestrian_16_16.png" />
-				</itemgra>
-				<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="10-">
-					<icon src="%s" />
-				</itemgra>
-			</layer>
-			<layer name="POI Labels">
-				<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_bicycle,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-		<layout name="Car-dark" daylayout="Car" color="#011001">
-
-			<cursor w="57" h="57">
-				<itemgra speed_range="-2">
-					<polyline color="#0000BC" radius="0" width="4">
-						<coord x="0" y="0" />
-					</polyline>
-					<circle color="#000085" radius="9" width="3">
-						<coord x="0" y="0" />
-					</circle>
-					<circle color="#0000BC" radius="13" width="3">
-						<coord x="0" y="0" />
-					</circle>
-					<circle color="#000085" radius="18" width="3">
-						<coord x="0" y="0" />
-					</circle>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polygon color="#000085">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="-21" y="-18" />
-					</polygon>
-					<polygon color="#0000BC">
-						<coord x="21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="21" y="-18" />
-					</polygon>
-					<polygon color="#00009C">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="-21" y="-18" />
-					</polygon>
-					<polygon color="#000065">
-						<coord x="21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="21" y="-18" />
-					</polygon>
-					<polyline color="#000085" width="1">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="-21" y="-18" />
-					</polyline>
-					<polyline color="#000085" width="1">
-						<coord x="21" y="-18" />
-						<coord x="0" y="21" />
-						<coord x="0" y="-3" />
-						<coord x="21" y="-18" />
-					</polyline>
-					<polyline color="#000085" width="1">
-						<coord x="-21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="-21" y="-18" />
-					</polyline>
-					<polyline color="#000085" width="1">
-						<coord x="21" y="-18" />
-						<coord x="0" y="-3" />
-						<coord x="0" y="-9" />
-						<coord x="21" y="-18" />
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="polygons"><!-- Colors based on Car layout; R/34 G/8 B/9 -->
-				<itemgra item_types="image" order="0-">
-					<image/>
-				</itemgra>
-				<itemgra item_types="poly_nature_reserve" order="10-">
-					<polygon color="#061d15"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_glacier" order="10-">
-					<polygon color="#071e19"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#191711"/>
-				</itemgra>
-				<itemgra item_types="poly_naval_base" order="10-">
-					<polygon color="#03140f"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_airfield" order="10-">
-					<polygon color="#071b16"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_university" order="8-">
-					<polygon color="#140f14"/>
-				</itemgra>
-				<itemgra item_types="poly_college" order="10-">
-					<polygon color="#071f1a"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_attraction" order="10-">
-					<polygon color="#00150b"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_theme_park" order="10-">
-					<polygon color="#00150b"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_water_park" order="10-">
-					<polygon color="#041915"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_zoo" order="10-">
-					<polygon color="#061811"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_depot" order="10-">
-					<polygon color="#051610"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_railway" order="10-">
-					<polygon color="#051815"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_port" order="10-">
-					<polygon color="#031111"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_marina" order="10-">
-					<polygon color="#051916"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_commercial" order="10-">
-					<polygon color="#071f16"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_retail" order="10-">
-					<polygon color="#06170f"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_plaza" order="10-">
-					<polygon color="#061914"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_battlefield" order="10-">
-					<polygon color="#010703"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_archaeological_site" order="10-">
-					<polygon color="#061b13"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_ruins" order="10-">
-					<polygon color="#061b13"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_camp_site" order="10-">
-					<polygon color="#011400"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_caravan_site" order="10-">
-					<polygon color="#041303"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_golf_course" order="10-">
-					<polygon color="#021403"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_marsh" order="10-">
-					<polygon color="#020803"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_fell" order="10-">
-					<polygon color="#05170b"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_greenfield" order="10-">
-					<polygon color="#071f19"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_brownfield" order="10-">
-					<polygon color="#05170f"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_heath" order="10-">
-					<polygon color="#061c11"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_scree" order="10-">
-					<polygon color="#071d17"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_quarry" order="10-">
-					<polygon color="#071a12"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_landfill" order="10-">
-					<polygon color="#04130f"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_construction" order="10-">
-					<polygon color="#070e02"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_range" order="10-">
-					<polygon color="#030d0a"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_danger_area" order="10-">
-					<polygon color="#071802"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_common" order="10-">
-					<polygon color="#031605"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_recreation_ground" order="10-">
-					<polygon color="#041500"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_playground" order="10-">
-					<polygon color="#05190d"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_fishing" order="10-">
-					<polygon color="#030700"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_allotments" order="10-">
-					<polygon color="#071b13"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_garden" order="10-">
-					<polygon color="#061e12"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_village_green" order="10-">
-					<polygon color="#041607"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_picnic_site" order="10-">
-					<polygon color="#030f07"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_wood" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_greenhouse" order="10-">
-					<polygon color="#071d16"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_orchard" order="10-">
-					<polygon color="#041b10"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_plantnursery" order="10-">
-					<polygon color="#051b12"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_farm" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_meadow" order="0-">
-					<polygon color="#041a06"/>
-				</itemgra>
-				<itemgra item_types="poly_land" order="0-">
-					<polygon color="#011001"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_beach" order="0-">
-					<polygon color="#081f0b"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_mud" order="0-">
-					<polygon color="#02071d"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="10">
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="11">
-					<polyline color="#1e0728" width="3"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="12">
-					<polyline color="#1e0728" width="5"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="13">
-					<polyline color="#1e0728" width="6"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="14">
-					<polyline color="#1e0728" width="7"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="15">
-					<polyline color="#1e0728" width="9"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="16">
-					<polyline color="#1e0728" width="10"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="17">
-					<polyline color="#1e0728" width="12"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="18">
-					<polyline color="#1e0728" width="20"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#002e00"/>
-				</itemgra>
-				<itemgra item_types="poly_sport,poly_sports_pitch" order="0-">
-					<polygon color="#0c220c"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_place" order="0-">
-					<polygon color="#111111"/>
-				</itemgra>
-				<itemgra item_types="poly_service" order="8-18">
-					<polygon color="#1a1a1a"/>
-					<polyline color="#282828" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="8-13">
-					<polygon color="#24092f"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="14-16">
-					<polygon color="#24092f"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="17-18">
-					<polygon color="#24092f"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="7-12">
-					<polygon color="#c5c300"/>
-					<polyline color="#c0c0c0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="13-16">
-					<polygon color="#c5c300"/>
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="17-18">
-					<polygon color="#c5c300"/>
-					<polyline color="#c0c0c0" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="7-11">
-					<polygon color="#c5c300"/>
-					<polyline color="#a0a0a0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="12-15">
-					<polygon color="#c5c300"/>
-					<polyline color="#a0a0a0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="16-18">
-					<polygon color="#c5c300"/>
-					<polyline color="#a0a0a0" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_saltpond" order="10-">
-					<polygon color="#061008"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
-					<polygon color="#010321"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_line" order="0-">
-					<polyline color="#010321" width="1"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="4-5">
-					<polyline color="#010321" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="6">
-					<polyline color="#010321" width="2"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="7">
-					<polyline color="#010321" width="3"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="8-9">
-					<polyline color="#010321" width="4"/>
-					<text color="#55c4bd" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="10-">
-					<polyline color="#010321" width="4"/>
-					<text color="#55c4bd" background_color="#000000" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="6">
-					<polyline color="#010321" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="7">
-					<polyline color="#010321" width="2"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="8-9">
-					<polyline color="#010321" width="3"/>
-					<text color="#55c4bd" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="10-">
-					<polyline color="#010321" width="3"/>
-					<text color="#55c4bd" background_color="#000000" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="8-9">
-					<polyline color="#010321" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="10-">
-					<polyline color="#010321" width="2"/>
-					<text color="#55c4bd" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_drain" order="10-">
-					<polyline color="#010321" width="1"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_apron" order="0-">
-					<polygon color="#041a06"/>
-				</itemgra>
-				<itemgra item_types="poly_terminal" order="7-">
-					<polygon color="#282424"/>
-				</itemgra>
-				<itemgra item_types="poly_cemetery" order="8-">
-					<polygon color="#041a06"/>
-				</itemgra>
-				<itemgra item_types="poly_car_parking" order="8-">
-					<polygon color="#1a170f"/>
-				</itemgra>
-				<itemgra item_types="poly_artwork" order="10-">
-					<polygon color="#082015"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_sports_stadium" order="10-">
-					<polygon color="#03180a"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_sports_track" order="10-">
-					<polygon color="#050b08"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_barracks" order="10-">
-					<polygon color="#051511"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_garages" order="10-">
-					<polygon color="#061b16"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_building" order="8-">
-					<polygon color="#282424"/>
-				</itemgra>
-				<itemgra item_types="rail" order="6-8">
-					<polyline color="#282828" width="2"/>
-					<polyline color="#3d3d3d" dash="1,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="9-">
-					<polyline color="#282828" width="3"/>
-					<polyline color="#3d3d3d" dash="1,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#113111" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-">
-					<polyline color="#0d0b41" width="1" dash="10,5,2,5"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="0-">
-					<polyline color="#808080" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="heightlines">
-				<itemgra item_types="height_line_1" order="0-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="0-">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-			</layer>
-			<layer name="streets">
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#0000a0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#0000a0" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#0000a0" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#0000a0" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#0000a0" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#0000a0" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#0000a0" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#0000a0" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#0000a0" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#0000a0" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#0000a0" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#0000a0" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#0000a0" width="530"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_paved" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="10-12">
-					<polyline color="#800000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="13-14">
-					<polyline color="#3d3d3d" width="4"/>
-					<polyline color="#800000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="15-16">
-					<polyline color="#3d3d3d" width="5"/>
-					<polyline color="#800000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="17-">
-					<polyline color="#3d3d3d" width="7"/>
-					<polyline color="#800000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="track_unpaved" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="bridleway" order="10-">
-					<polyline color="#1e0728" width="1"/>
-				</itemgra>
-				<itemgra item_types="cycleway" order="10-">
-					<polyline color="#1e0728" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="10-12">
-					<polyline color="#00A000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="13-14">
-					<polyline color="#00A000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="15-16">
-					<polyline color="#00A000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="17-">
-					<polyline color="#00A000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="10-12">
-					<polyline color="#0000ff" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="13-14">
-					<polyline color="#0000ff" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="15-16">
-					<polyline color="#0000ff" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="17-">
-					<polyline color="#0000ff" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="10-12">
-					<polyline color="#900000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="13-14">
-					<polyline color="#900000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="15-16">
-					<polyline color="#900000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="17-">
-					<polyline color="#900000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="10-12">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="13-14">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="15-16">
-					<polyline color="#000000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="17-">
-					<polyline color="#000000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="10-12">
-					<polyline color="#ffaa00" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="13-14">
-					<polyline color="#ffaa00" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="15-16">
-					<polyline color="#ffaa00" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="17-">
-					<polyline color="#ffaa00" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="10-12">
-					<polyline color="#c5c300" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="13-14">
-					<polyline color="#c5c300" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="15-16">
-					<polyline color="#c5c300" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="17-">
-					<polyline color="#c5c300" width="5"/>
-				</itemgra>
-				<itemgra item_types="lift_cable_car" order="6-">
-					<polyline color="#3d3d3d" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_chair" order="6-">
-					<polyline color="#3d3d3d" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_drag" order="6-">
-					<polyline color="#3d3d3d" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="10-12">
-					<polyline color="#0000ff" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="13-14">
-					<polyline color="#0000ff" width="2"/>
-					<polyline color="#000000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="15-16">
-					<polyline color="#0000ff" width="3"/>
-					<polyline color="#000000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="17-">
-					<polyline color="#0000ff" width="5"/>
-					<polyline color="#000000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="footway" order="11-12">
-					<polyline color="#4e0000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="footway" order="13-14">
-					<polyline color="#4e0000" width="2"/>
-					<polyline color="#000000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="footway" order="15-16">
-					<polyline color="#4e0000" width="3"/>
-					<polyline color="#000000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="footway" order="17-">
-					<polyline color="#4e0000" width="5"/>
-					<polyline color="#000000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="steps" order="14-15">
-					<polyline color="#4d4e11" width="1"/>
-				</itemgra>
-				<itemgra item_types="steps" order="16">
-					<polyline color="#4d4e11" width="2"/>
-				</itemgra>
-				<itemgra item_types="steps" order="17-18">
-					<polyline color="#4d4e11" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#1e0728" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#1e0728" width="5"/>
-					<polyline color="#202020" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#1e0728" width="8"/>
-					<polyline color="#202020" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#1e0728" width="9"/>
-					<polyline color="#202020" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#1e0728" width="13"/>
-					<polyline color="#202020" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#1e0728" width="18"/>
-					<polyline color="#202020" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#1e0728" width="21"/>
-					<polyline color="#202020" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#1e0728" width="25"/>
-					<polyline color="#202020" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#1e0728" width="40"/>
-					<polyline color="#202020" width="30"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="10">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="11">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="12">
-					<polyline color="#2c2c2c" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="13">
-					<polyline color="#2c2c2c" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="14">
-					<polyline color="#2c2c2c" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="15">
-					<polyline color="#2c2c2c" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="16">
-					<polyline color="#2c2c2c" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="17">
-					<polyline color="#2c2c2c" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="18">
-					<polyline color="#2c2c2c" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="12">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="13">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="14">
-					<polyline color="#2c2c2c" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="15">
-					<polyline color="#2c2c2c" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="16">
-					<polyline color="#2c2c2c" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="17">
-					<polyline color="#2c2c2c" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="18">
-					<polyline color="#2c2c2c" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
-					<polyline color="#24092f" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#24092f" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#24092f" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#24092f" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#24092f" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#24092f" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#24092f" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#24092f" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#24092f" width="126"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="8">
-					<polyline color="#1d4c19" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9">
-					<polyline color="#1d4c19" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="10">
-					<polyline color="#1d4c19" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="11">
-					<polyline color="#1d4c19" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12">
-					<polyline color="#1d4c19" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="13">
-					<polyline color="#1d4c19" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="14">
-					<polyline color="#1d4c19" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="15">
-					<polyline color="#1d4c19" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="16">
-					<polyline color="#1d4c19" width="30"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="17">
-					<polyline color="#1d4c19" width="67"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="18">
-					<polyline color="#1d4c19" width="138"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="7-8">
-					<polyline color="#4d4e11" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="9">
-					<polyline color="#4d4e11" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="10">
-					<polyline color="#4d4e11" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="11">
-					<polyline color="#4d4e11" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="12">
-					<polyline color="#4d4e11" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="13">
-					<polyline color="#4d4e11" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="14">
-					<polyline color="#4d4e11" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="15">
-					<polyline color="#4d4e11" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="16">
-					<polyline color="#4d4e11" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="17">
-					<polyline color="#4d4e11" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="18">
-					<polyline color="#4d4e11" width="150"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-5">
-					<polyline color="#430000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-8">
-					<polyline color="#430000" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#430000" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#430000" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#430000" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#430000" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#430000" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#430000" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#430000" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#430000" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#430000" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#430000" width="150"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#760000" width="1"/>
-				</itemgra>
-				<!--1d4c19/0d740d-->
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#640000" width="3"/>
-					<polyline color="#0a5c0a" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#640000" width="4"/>
-					<polyline color="#0a5c0a" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#640000" width="6"/>
-					<polyline color="#005b00" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#640000" width="8"/>
-					<polyline color="#0a5c0a" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#640000" width="12"/>
-					<polyline color="#0a5c0a" width="3"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#640000" width="13"/>
-					<polyline color="#0a5c0a" width="3"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#640000" width="17"/>
-					<polyline color="#0a5c0a" width="4"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#640000" width="24"/>
-					<polyline color="#0a5c0a" width="4"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#640000" width="27"/>
-					<polyline color="#0a5c0a" width="5"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#640000" width="59"/>
-					<polyline color="#0a5c0a" width="6"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#640000" width="127"/>
-					<polyline color="#0a5c0a" width="7"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#640000" width="258"/>
-					<polyline color="#0a5c0a" width="8"/>
-				</itemgra>
-				<!-- This entry shows all unknown linear elements as blue lines -->
-				<!--
-				<itemgra item_types="street_unkn" order="0-">
-					<polyline color="#8080ff" width="3"/>
-				</itemgra>
-				-->
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="8" color="#55c4bd" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9" color="#55c4bd" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
-					<text text_size="9" color="#55c4bd" background_color="#000000"/>
-				</itemgra>
-			</layer>
-			<layer name="polylines">
-				<itemgra item_types="aeroway_taxiway" order="10">
-					<polyline color="#404040" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="11">
-					<polyline color="#404040" width="6"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="12">
-					<polyline color="#404040" width="10"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="13">
-					<polyline color="#404040" width="12"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="14">
-					<polyline color="#404040" width="15"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="15">
-					<polyline color="#404040" width="17"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="16">
-					<polyline color="#404040" width="33"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="17">
-					<polyline color="#404040" width="69"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="18">
-					<polyline color="#404040" width="132"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="7-8">
-					<polyline color="#404040" width="3"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="9">
-					<polyline color="#404040" width="5"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="10">
-					<polyline color="#404040" width="6"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="11">
-					<polyline color="#404040" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="12">
-					<polyline color="#404040" width="13"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="13">
-					<polyline color="#404040" width="18"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="14">
-					<polyline color="#404040" width="21"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="15">
-					<polyline color="#404040" width="24"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="16">
-					<polyline color="#404040" width="39"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="17">
-					<polyline color="#404040" width="78"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="18">
-					<polyline color="#404040" width="156"/>
-				</itemgra>
-				<itemgra item_types="rail_tram,bus_guideway" order="10-">
-					<polyline color="#3d3d3d" width="2"/>
-				</itemgra>
-			</layer>
-			<layer name="labels">
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="10-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-			</layer>
-			<layer name="Internal">
-				<itemgra item_types="track" order="3-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_tracked" order="7-">
-					<polyline color="#3f3fff" width="3"/>
-				</itemgra>
-				<itemgra item_types="rg_segment" order="0-">
-					<polyline color="#FF089C" width="1"/>
-					<arrows color="#FF089C" width="1"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="0-">
-					<circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="nav_left_1" order="0-">
-					<icon src="nav_left_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_2" order="0-">
-					<icon src="nav_left_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_3" order="0-">
-					<icon src="nav_left_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_1" order="0-">
-					<icon src="nav_right_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_2" order="0-">
-					<icon src="nav_right_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_3" order="0-">
-					<icon src="nav_right_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_straight" order="0-">
-					<icon src="nav_straight_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_left" order="0-">
-					<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_right" order="0-">
-					<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l1" order="0-">
-					<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r1" order="0-">
-					<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l2" order="0-">
-					<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r2" order="0-">
-					<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l3" order="0-">
-					<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r3" order="0-">
-					<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l4" order="0-">
-					<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r4" order="0-">
-					<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l5" order="0-">
-					<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r5" order="0-">
-					<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l6" order="0-">
-					<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r6" order="0-">
-					<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l7" order="0-">
-					<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r7" order="0-">
-					<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l8" order="0-">
-					<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r8" order="0-">
-					<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_left" order="0-">
-					<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_left" order="0-">
-					<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_right" order="0-">
-					<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_right" order="0-">
-					<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_left" order="0-">
-					<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_right" order="0-">
-					<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="route_end" order="0-">
-					<icon src="nav_destination_wh.svg" w="32" h="32" x="4" y="30"/>
-				</itemgra>
-				<itemgra item_types="nav_none" order="0-">
-					<icon src="unknown.svg"/>
-				</itemgra>
-				<itemgra item_types="announcement" order="7-">
-					<icon src="gui_sound_32_32.png"/>
-					<circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/>
-				</itemgra>
-
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#00a0a0" radius="4" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#00a0a0" radius="8" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#00a0a0" radius="10" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#00a0a0" radius="16" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#00a0a0" radius="20" width="4" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#00a0a0" radius="28" width="4" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#00a0a0" radius="32" width="4" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#00a0a0" radius="52" width="4" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#00a0a0" radius="64" width="4" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#00a0a0" radius="68" width="6" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#00a0a0" radius="132" width="8" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#00a0a0" radius="268" width="8" background_color="#000000" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#00a0a0" radius="530" width="8" background_color="#000000" text_size="48"/>
-				</itemgra>
-			</layer>
-			<layer name="POI Symbols">
-				<itemgra item_types="mini_roundabout" order="12-">
-					<icon src="mini_roundabout.png"/>
-				</itemgra>
-				<itemgra item_types="turning_circle" order="12-">
-					<icon src="mini_roundabout.png"/>
-				</itemgra>
-				<itemgra item_types="poi_airport" order="5-">
-					<icon src="airport.png"/>
-				</itemgra>
-				<itemgra item_types="town_ghost" order="0-">
-					<icon src="ghost_town.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_hotel" order="12-">
-					<icon src="hotel.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_parking" order="11-">
-					<icon src="parking.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_sharing" order="11-">
-					<icon src="car_sharing.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_dealer_parts" order="0-">
-					<icon src="car_dealer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fuel" order="10-">
-					<icon src="fuel.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shopping" order="10-">
-					<icon src="shopping.png"/>
-				</itemgra>
-				<itemgra item_types="poi_attraction" order="8-">
-					<icon src="attraction.png"/>
-				</itemgra>
-				<itemgra item_types="poi_cafe" order="12-">
-					<icon src="cafe.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bar" order="12-">
-					<icon src="bar.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pub" order="12-">
-					<icon src="beer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bridge" order="0-">
-					<icon src="bridge.xpm"/>
-				</itemgra>
-				<itemgra item_types="highway_exit" order="11-">
-					<icon src="exit.png"/>
-				</itemgra>
-				<itemgra item_types="poi_camp_rv" order="9-">
-					<icon src="camping.png"/>
-				</itemgra>
-				<itemgra item_types="poi_museum_history" order="12-">
-					<icon src="museum.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hospital" order="12-">
-					<icon src="hospital.png"/>
-				</itemgra>
-				<!-- not really usefull -->
-				<!--
-				<itemgra item_types="point_unkn" order="0-">
-						<circle color="#8080ff" radius="3"/>
-				</itemgra>
-				-->
-				<itemgra item_types="poi_dining" order="12-">
-					<icon src="restaurant.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fastfood" order="12-">
-					<icon src="fastfood.png"/>
-				</itemgra>
-				<itemgra item_types="poi_police" order="12-">
-					<icon src="police.png"/>
-				</itemgra>
-				<itemgra item_types="poi_auto_club" order="0-">
-					<icon src="auto_club.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_autoservice" order="0-">
-					<icon src="car_dealer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bank" order="12-">
-					<icon src="bank.png"/>
-				</itemgra>
-				<itemgra item_types="poi_atm" order="12-">
-					<icon src="atm.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bay" order="0-">
-					<icon src="bay.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_bend" order="0-">
-					<icon src="bend.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_boat_ramp" order="12-">
-					<icon src="boat_ramp.png"/>
-				</itemgra>
-				<itemgra item_types="poi_border_station" order="0-">
-					<icon src="border_station.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_bowling" order="0-">
-					<icon src="bowling.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_station" order="12-">
-					<icon src="bus.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_stop" order="12-">
-					<icon src="bus_stop.png"/>
-				</itemgra>
-				<itemgra item_types="poi_business_service" order="0-">
-					<icon src="business_service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_car_rent" order="11-">
-					<icon src="car_rent.png"/>
-				</itemgra>
-				<itemgra item_types="poi_car_wash" order="12-">
-					<icon src="car_wash.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_casino" order="11-">
-					<icon src="casino.png"/>
-				</itemgra>
-				<itemgra item_types="poi_cemetery" order="11-">
-					<icon src="cemetery.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_church" order="11-">
-					<icon src="church.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bahai" order="11-">
-					<icon src="bahai.png"/>
-				</itemgra>
-				<itemgra item_types="poi_buddhist" order="11-">
-					<icon src="buddhist.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hindu" order="11-">
-					<icon src="hindu.png"/>
-				</itemgra>
-				<itemgra item_types="poi_islamic" order="11-">
-					<icon src="islamic.png"/>
-				</itemgra>
-				<itemgra item_types="poi_jain" order="11-">
-					<icon src="jain.png"/>
-				</itemgra>
-				<itemgra item_types="poi_jewish" order="11-">
-					<icon src="jewish.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pagan" order="11-">
-					<icon src="pagan.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pastafarian" order="11-">
-					<icon src="pastafarian.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shinto" order="11-">
-					<icon src="shinto.png"/>
-				</itemgra>
-				<itemgra item_types="poi_sikh" order="11-">
-					<icon src="sikh.png"/>
-				</itemgra>
-				<itemgra item_types="poi_taoist" order="11-">
-					<icon src="taoist.png"/>
-				</itemgra>
-				<itemgra item_types="poi_cinema" order="12-">
-					<icon src="cinema.png"/>
-				</itemgra>
-				<itemgra item_types="poi_communication" order="0-">
-					<icon src="communication.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_concert" order="0-">
-					<icon src="concert.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_cove" order="0-">
-					<icon src="cove.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_crossing" order="0-">
-					<icon src="crossing.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_dam" order="0-">
-					<icon src="dam.png"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_area" order="12-">
-					<icon src="danger_16_16.png"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_sea_wreck" order="0-">
-					<icon src="dangerous.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_daymark" order="0-">
-					<icon src="daymark.png"/>
-				</itemgra>
-				<itemgra item_types="poi_diving" order="0-">
-					<icon src="diving.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_drinking_water" order="0-">
-					<icon src="drinking_water.png"/>
-				</itemgra>
-				<itemgra item_types="poi_emergency" order="0-">
-					<icon src="emergency.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fair" order="0-">
-					<icon src="fair.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_firebrigade" order="12-">
-					<icon src="firebrigade.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fish" order="0-">
-					<icon src="fish.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_forbidden_area" order="0-">
-					<icon src="forbidden_area.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_gps" order="0-">
-					<icon src="garmin.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_golf" order="12-">
-					<icon src="golf.png"/>
-				</itemgra>
-				<itemgra item_types="poi_government_building" order="0-">
-					<icon src="government_building.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_height" order="0-">
-					<icon src="height.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_heliport" order="7-">
-					<icon src="heliport.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hotspring" order="0-">
-					<icon src="hotspring.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_icesport" order="0-">
-					<icon src="icesport.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_information" order="12-">
-					<icon src="information.png"/>
-				</itemgra>
-				<itemgra item_types="poi_justice" order="10-">
-					<icon src="justice.png"/>
-				</itemgra>
-				<itemgra item_types="poi_landmark" order="0-">
-					<icon src="landmark.png"/>
-				</itemgra>
-				<itemgra item_types="poi_levee" order="0-">
-					<icon src="levee.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_level_crossing" order="11-">
-					<icon src="level_crossing.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_library" order="12-">
-					<icon src="library.png"/>
-				</itemgra>
-				<itemgra item_types="poi_locale" order="0-">
-					<icon src="locale.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_loudspeaker" order="0-">
-					<icon src="loudspeaker.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_mall" order="0-">
-					<icon src="mall.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_manmade_feature" order="0-">
-					<icon src="manmade_feature.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_marine" order="0-">
-					<icon src="marine.png"/>
-				</itemgra>
-				<itemgra item_types="poi_marine_type" order="0-">
-					<icon src="marine_type.png"/>
-				</itemgra>
-				<itemgra item_types="poi_mark" order="0-">
-					<icon src="mark.png"/>
-				</itemgra>
-				<itemgra item_types="poi_military" order="0-">
-					<icon src="military.png"/>
-				</itemgra>
-				<itemgra item_types="poi_mine" order="0-">
-					<icon src="mine.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_nondangerous" order="0-">
-					<icon src="nondangerous.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_oil_field" order="0-">
-					<icon src="oil_field.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_peak" order="6-">
-					<icon src="peak.png"/>
-				</itemgra>
-				<itemgra item_types="poi_personal_service" order="0-">
-					<icon src="personal_service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_pharmacy" order="12-">
-					<icon src="pharmacy.png"/>
-				</itemgra>
-				<itemgra item_types="poi_post_office,poi_post_box" order="13-">
-					<icon src="post.png"/>
-				</itemgra>
-				<itemgra item_types="poi_public_office" order="0-">
-					<icon src="public_office.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_halt" order="10-">
-					<circle color="#000000" radius="3" width="3"/>
-					<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_station" order="11-">
-					<circle color="#000000" radius="3" width="3"/>
-					<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="10-11">
-					<circle color="#3d3d3d" background_color="#000000" radius="2" width="2"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="12-">
-					<circle color="#000000" radius="3" width="3"/>
-					<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_repair_service" order="0-">
-					<icon src="repair_service.png"/>
-				</itemgra>
-				<itemgra item_types="poi_resort" order="0-">
-					<icon src="resort.png"/>
-				</itemgra>
-				<itemgra item_types="poi_restaurant" order="12-">
-					<icon src="restaurant.png"/>
-				</itemgra>
-				<itemgra item_types="poi_restricted_area" order="0-">
-					<icon src="restricted_area.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_restroom" order="13-">
-					<icon src="toilets.png"/>
-				</itemgra>
-				<itemgra item_types="poi_sailing" order="0-">
-					<icon src="sailing.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_scenic_area" order="0-">
-					<icon src="scenic_area.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_school" order="12-">
-					<icon src="school.png"/>
-				</itemgra>
-				<itemgra item_types="poi_service" order="0-">
-					<icon src="service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_apparel" order="0-">
-					<icon src="shop_apparel.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_computer" order="0-">
-					<icon src="shop_computer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_department" order="0-">
-					<icon src="shop_department.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_furniture" order="0-">
-					<icon src="shop_furnish.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_grocery" order="0-">
-					<icon src="shop_grocery.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_handg" order="0-">
-					<icon src="shop_handg.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_merchandise" order="0-">
-					<icon src="shop_merchandise.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_retail" order="0-">
-					<icon src="shop_retail.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_shower" order="0-">
-					<icon src="shower.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_skiing" order="12-">
-					<icon src="skiing.png"/>
-				</itemgra>
-				<itemgra item_types="poi_social_service" order="0-">
-					<icon src="social_service.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_sounding" order="0-">
-					<icon src="sounding.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_sport" order="12-">
-					<icon src="sport.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_stadium" order="0-">
-					<icon src="stadium.png"/>
-				</itemgra>
-				<itemgra item_types="poi_swimming" order="12-">
-					<icon src="swimming.png"/>
-				</itemgra>
-				<itemgra item_types="poi_taxi" order="13-">
-					<icon src="taxi.png"/>
-				</itemgra>
-				<itemgra item_types="poi_telephone" order="13-">
-					<icon src="telephone.png"/>
-				</itemgra>
-				<itemgra item_types="poi_theater" order="12-">
-					<icon src="theater.png"/>
-				</itemgra>
-				<itemgra item_types="poi_tide" order="0-">
-					<icon src="tide.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_tower" order="13-">
-					<icon src="tower.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_townhall" order="12-">
-					<icon src="townhall.png"/>
-				</itemgra>
-				<itemgra item_types="poi_trail" order="0-">
-					<icon src="trail.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_truck_stop" order="0-">
-					<icon src="truck_stop.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_tunnel" order="0-">
-					<icon src="tunnel.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_wifi" order="11-">
-					<icon src="wifi.png"/>
-				</itemgra>
-				<itemgra item_types="poi_wine" order="0-">
-					<icon src="wine.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_worship" order="0-">
-					<icon src="worship.png"/>
-				</itemgra>
-				<itemgra item_types="poi_wrecker" order="0-">
-					<icon src="wrecker.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_zoo" order="10-">
-					<icon src="zoo.png"/>
-				</itemgra>
-				<itemgra item_types="poi_picnic" order="11-">
-					<icon src="picnic.png"/>
-				</itemgra>
-				<itemgra item_types="poi_playground" order="12-">
-					<icon src="playground.png"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_multi" order="0-">
-					<icon src="gc_multi.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_tradi" order="0-">
-					<icon src="gc_tradi.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_event" order="0-">
-					<icon src="gc_event.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_mystery" order="0-">
-					<icon src="gc_mystery.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_question" order="0-">
-					<icon src="gc_question.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_stages" order="0-">
-					<icon src="gc_stages.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_reference" order="0-">
-					<icon src="gc_reference.xpm"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_webcam" order="0-">
-					<icon src="gc_webcam.xpm"/>
-				</itemgra>
-				<itemgra item_types="traffic_signals" order="13-">
-					<icon src="traffic_signals.png"/>
-				</itemgra>
-				<itemgra item_types="poi_image" order="0-">
-					<image/>
-				</itemgra>
-				<!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bike layout? -->
-				<itemgra item_types="poi_bench" order="13-">
-					<icon src="bench.png"/>
-				</itemgra>
-				<itemgra item_types="poi_biergarten" order="12-">
-					<icon src="beer.png"/>
-				</itemgra>
-				<itemgra item_types="poi_boundary_stone" order="13-">
-					<icon src="boundary_stone.png"/>
-				</itemgra>
-				<itemgra item_types="poi_castle" order="12-">
-					<icon src="castle.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hunting_stand" order="13-">
-					<icon src="hunting_stand.png"/>
-				</itemgra>
-				<itemgra item_types="poi_memorial" order="12-">
-					<icon src="memorial.png"/>
-				</itemgra>
-				<itemgra item_types="poi_monument" order="12-">
-					<icon src="memorial.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shelter" order="10-">
-					<icon src="shelter.png"/>
-				</itemgra>
-				<itemgra item_types="poi_fountain" order="12-">
-					<icon src="fountain.png"/>
-				</itemgra>
-				<itemgra item_types="poi_potable_water" order="12-">
-					<icon src="drinking_water.png"/>
-				</itemgra>
-				<itemgra item_types="poi_toilets" order="12-">
-					<icon src="toilets.png"/>
-				</itemgra>
-				<itemgra item_types="poi_viewpoint" order="12-">
-					<icon src="viewpoint.png"/>
-				</itemgra>
-				<itemgra item_types="tec_common" order="11-">
-					<icon src="tec_common.png"/>
-				</itemgra>
-				<itemgra item_types="vehicle" order="0-">
-					<icon src="gui_vehicle_16_16.png" />
-				</itemgra>
-				<itemgra item_types="vehicle_pedestrian" order="0-">
-					<icon src="gui_vehicle_pedestrian_16_16.png" />
-				</itemgra>
-			</layer>
-			<layer name="POI Labels">
-				<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_car_sharing,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
-					<circle color="#606060" background_color="#000000" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-    <layout name="Car-Android" color="#fef9ee" font="Liberation Sans">
-      <cursor w="57" h="57">
-        <itemgra speed_range="-2">
-          <polyline color="#00BC00" radius="0" width="4">
-            <coord x="0" y="0" />
-          </polyline>
-          <circle color="#008500" radius="9" width="3">
-            <coord x="0" y="0" />
-          </circle>
-          <circle color="#00BC00" radius="13" width="3">
-            <coord x="0" y="0" />
-          </circle>
-          <circle color="#008500" radius="18" width="3">
-            <coord x="0" y="0" />
-          </circle>
-        </itemgra>
-        <itemgra speed_range="3-">
-          <polygon color="#00000066">
-            <coord x="-21" y="-27" />
-            <coord x="0" y="12" />
-            <coord x="21" y="-27" />
-            <coord x="0" y="-12" />
-            <coord x="-21" y="-27" />
-          </polygon>
-          <polygon color="#008500">
-            <coord x="-21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="-21" y="-18" />
-          </polygon>
-          <polygon color="#00BC00">
-            <coord x="21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="21" y="-18" />
-          </polygon>
-          <polyline color="#008500" width="1">
-            <coord x="-21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="-21" y="-18" />
-          </polyline>
-          <polyline color="#008500" width="1">
-            <coord x="21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="21" y="-18" />
-          </polyline>
-        </itemgra>
-      </cursor>
-      <layer name="polygons">
-        <itemgra item_types="poly_wood" order="13-">
-          <polygon color="#8ec78d" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_water_tiled">
-          <polygon color="#82c8ea" />
-        </itemgra>
-        <itemgra item_types="poly_water" order="10-">
-          <polygon color="#82c8ea" />
-          <polyline color="#5096b8" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra"
-        order="14-">
-          <polygon color="#a0a0a0" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_park" order="14-">
-          <polygon color="#7cc334" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="14">
-          <polyline color="#d2d2d2" width="13" />
-          <polyline color="#dddddd" width="9" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="15">
-          <polyline color="#d2d2d2" width="18" />
-          <polyline color="#dddddd" width="14" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="16">
-          <polyline color="#d2d2d2" width="21" />
-          <polyline color="#dddddd" width="17" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="17">
-          <polyline color="#d2d2d2" width="25" />
-          <polyline color="#dddddd" width="21" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="18">
-          <polyline color="#d2d2d2" width="40" />
-          <polyline color="#dddddd" width="34" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_airport" order="5-">
-          <polygon color="#a0a0a0" />
-        </itemgra>
-        <itemgra item_types="water_river" order="6-7">
-          <polyline color="#82c8ea" width="3" />
-        </itemgra>
-        <itemgra item_types="water_river" order="8-9">
-          <polyline color="#82c8ea" width="4" />
-        </itemgra>
-        <itemgra item_types="water_river" order="10-">
-          <polyline color="#82c8ea" width="4" />
-          <text text_size="10" />
-        </itemgra>
-        <itemgra item_types="water_canal" order="13-">
-          <polyline color="#82c8ea" width="3" />
-          <text text_size="10" />
-        </itemgra>
-        <itemgra item_types="water_stream" order="13-">
-          <polyline color="#82c8ea" width="2" />
-          <text text_size="7" />
-        </itemgra>
-        <itemgra item_types="water_drain" order="14-">
-          <polyline color="#82c8ea" width="1" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_apron" order="13-">
-          <polygon color="#d0d0d0" />
-        </itemgra>
-        <itemgra item_types="poly_terminal" order="14-">
-          <polygon color="#e3c6a6" />
-        </itemgra>
-        <itemgra item_types="poly_car_parking" order="15-">
-          <polygon color="#e7cf87" />
-        </itemgra>
-        <itemgra item_types="poly_building" order="14-">
-          <polygon color="#b6a6a6" />
-        </itemgra>
-        <itemgra item_types="rail" order="13-">
-          <polyline color="#696969" width="3" />
-          <polyline color="#ffffff" width="1" dash="5,5" />
-        </itemgra>
-        <itemgra item_types="ferry" order="14-">
-          <polyline color="#000000" width="1" dash="10" />
-        </itemgra>
-        <itemgra item_types="border_country" order="0-">
-          <polyline color="#808080" width="1" dash="10,5,2,5"/>
-        </itemgra>
-        <itemgra item_types="border_state" order="0-">
-            <polyline color="#808080" width="4"/>
-        </itemgra>
-      </layer>
-      <layer name="streets">
-        <itemgra item_types="street_route" order="2">
-          <polyline color="#69e068" width="8" />
-        </itemgra>
-        <itemgra item_types="street_route" order="3-5">
-          <polyline color="#69e068" width="10" />
-        </itemgra>
-        <itemgra item_types="street_route" order="6">
-          <polyline color="#69e068" width="12" />
-        </itemgra>
-        <itemgra item_types="street_route" order="7-8">
-          <polyline color="#69e068" width="16" />
-        </itemgra>
-        <itemgra item_types="street_route" order="9-10">
-          <polyline color="#69e068" width="20" />
-        </itemgra>
-        <itemgra item_types="street_route" order="11">
-          <polyline color="#69e068" width="28" />
-        </itemgra>
-        <itemgra item_types="street_route" order="12">
-          <polyline color="#69e068" width="32" />
-        </itemgra>
-        <itemgra item_types="street_route" order="13">
-          <polyline color="#69e068" width="52" />
-        </itemgra>
-        <itemgra item_types="street_route" order="14">
-          <polyline color="#69e068" width="64" />
-        </itemgra>
-        <itemgra item_types="street_route" order="15">
-          <polyline color="#69e068" width="68" />
-        </itemgra>
-        <itemgra item_types="street_route" order="16">
-          <polyline color="#69e068" width="132" />
-        </itemgra>
-        <itemgra item_types="street_route" order="17">
-          <polyline color="#69e068" width="268" />
-        </itemgra>
-        <itemgra item_types="street_route" order="18">
-          <polyline color="#69e068" width="530" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="2">
-          <polyline color="#ba00b8" width="4" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="3-5">
-          <polyline color="#ba00b8" width="8" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="6">
-          <polyline color="#ba00b8" width="10" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="7-8">
-          <polyline color="#ba00b8" width="16" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="9-10">
-          <polyline color="#ba00b8" width="20" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="11">
-          <polyline color="#ba00b8" width="28" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="12">
-          <polyline color="#ba00b8" width="32" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="13">
-          <polyline color="#ba00b8" width="52" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="14">
-          <polyline color="#ba00b8" width="64" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="15">
-          <polyline color="#ba00b8" width="68" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="16">
-          <polyline color="#ba00b8" width="132" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="17">
-          <polyline color="#ba00b8" width="268" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="18">
-          <polyline color="#ba00b8" width="530" />
-        </itemgra>
-        <itemgra item_types="forest_way_1" order="14-">
-          <polyline color="#0070c0" width="6" />
-        </itemgra>
-        <itemgra item_types="forest_way_2" order="14-">
-          <polyline color="#ff0000" width="3" />
-        </itemgra>
-        <itemgra item_types="forest_way_3" order="14-">
-          <polyline color="#ff0000" width="1" dash="2,4" />
-        </itemgra>
-        <itemgra item_types="forest_way_4" order="14-">
-          <polyline color="#119a2e" width="1" dash="4,10" />
-        </itemgra>
-        <itemgra item_types="street_nopass" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="track_paved" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="track_gravelled" order="14">
-          <polyline color="#ffffff" width="4"/>
-          <polyline color="#800000" width="1" dash="4,8" />
-        </itemgra>
-        <itemgra item_types="track_gravelled" order="15-16">
-          <polyline color="#ffffff" width="5"/>
-          <polyline color="#800000" width="1" dash="5,10" />
-        </itemgra>
-        <itemgra item_types="track_gravelled" order="17-">
-          <polyline color="#ffffff" width="7"/>
-          <polyline color="#800000" width="1" dash="7,15" />
-        </itemgra>
-        <itemgra item_types="track_unpaved" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="bridleway" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="cycleway" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="lift_cable_car" order="15-">
-          <polyline color="#696969" width="1" dash="5" />
-        </itemgra>
-        <itemgra item_types="lift_chair" order="15-">
-          <polyline color="#696969" width="1" dash="5" />
-        </itemgra>
-        <itemgra item_types="lift_drag" order="15-">
-          <polyline color="#696969" width="1" dash="5" />
-        </itemgra>
-        <itemgra item_types="footway" order="15-16">
-          <polyline color="#ffffff" width="5"/>
-          <polyline color="#ff0000" width="1" dash="5,10" />
-        </itemgra>
-        <itemgra item_types="footway" order="17-">
-          <polyline color="#ffffff" width="7"/>
-          <polyline color="#ff0000" width="1" dash="7,15" />
-        </itemgra>
-        <itemgra item_types="steps" order="15-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="14">
-          <polyline color="#d2d2d2" width="13" />
-          <polyline color="#dddddd" width="9" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="15">
-          <polyline color="#d2d2d2" width="18" />
-          <polyline color="#dddddd" width="14" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="16">
-          <polyline color="#d2d2d2" width="21" />
-          <polyline color="#dddddd" width="17" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="17">
-          <polyline color="#d2d2d2" width="25" />
-          <polyline color="#dddddd" width="21" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="18">
-          <polyline color="#d2d2d2" width="40" />
-          <polyline color="#dddddd" width="34" />
-        </itemgra>
-        <itemgra item_types="street_service" order="14">
-          <polyline color="#d2d2d2" width="7" />
-          <polyline color="#fefefe" width="5" />
-        </itemgra>
-        <itemgra item_types="street_service" order="15">
-          <polyline color="#d2d2d2" width="8" />
-          <polyline color="#fefefe" width="6" />
-        </itemgra>
-        <itemgra item_types="street_service" order="16">
-          <polyline color="#d2d2d2" width="9" />
-          <polyline color="#fefefe" width="7" />
-        </itemgra>
-        <itemgra item_types="street_service" order="17">
-          <polyline color="#d2d2d2" width="10" />
-          <polyline color="#fefefe" width="8" />
-        </itemgra>
-        <itemgra item_types="street_service" order="18">
-          <polyline color="#d2d2d2" width="11" />
-          <polyline color="#fefefe" width="9" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="15">
-          <polyline color="#d2d2d2" width="6" />
-          <polyline color="#fefefe" width="4" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="16">
-          <polyline color="#d2d2d2" width="7" />
-          <polyline color="#fefefe" width="5" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="17">
-          <polyline color="#d2d2d2" width="8" />
-          <polyline color="#fefefe" width="6" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="18">
-          <polyline color="#d2d2d2" width="9" />
-          <polyline color="#fefefe" width="7" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="12">
-          <polyline color="#d2d2d2" width="1" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="13-14">
-          <polyline color="#d2d2d2" width="17" />
-          <polyline color="#ffffff" width="13" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="15">
-          <polyline color="#d2d2d2" width="18" />
-          <polyline color="#ffffff" width="14" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="16">
-          <polyline color="#d2d2d2" width="30" />
-          <polyline color="#ffffff" width="26" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="17">
-          <polyline color="#d2d2d2" width="67" />
-          <polyline color="#ffffff" width="61" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="18">
-          <polyline color="#d2d2d2" width="132" />
-          <polyline color="#ffffff" width="126" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="11-12">
-          <polyline color="#c0c0c0" width="9" />
-          <polyline color="#fefc8c" width="7" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="13-14">
-          <polyline color="#c0c0c0" width="13" />
-          <polyline color="#fefc8c" width="11" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="15">
-          <polyline color="#c0c0c0" width="19" />
-          <polyline color="#fefc8c" width="15" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="16">
-          <polyline color="#c0c0c0" width="30" />
-          <polyline color="#fefc8c" width="26" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="17">
-          <polyline color="#c0c0c0" width="63" />
-          <polyline color="#fefc8c" width="57" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="18">
-          <polyline color="#c0c0c0" width="100" />
-          <polyline color="#fefc8c" width="90" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="11-12">
-          <polyline color="#a0a0a0" width="9" />
-          <polyline color="#fefc8c" width="7" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="13-14">
-          <polyline color="#a0a0a0" width="21" />
-          <polyline color="#fefc8c" width="17" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="15">
-          <polyline color="#a0a0a0" width="25" />
-          <polyline color="#fefc8c" width="21" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="16">
-          <polyline color="#a0a0a0" width="40" />
-          <polyline color="#fefc8c" width="34" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="17">
-          <polyline color="#a0a0a0" width="79" />
-          <polyline color="#fefc8c" width="73" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="18">
-          <polyline color="#a0a0a0" width="156" />
-          <polyline color="#fefc8c" width="150" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="2-6">
-          <polyline color="#f8dc79" width="4" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="7-8">
-          <polyline color="#f8dc79" width="4" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="9">
-          <polyline color="#f8dc79" width="5" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="10">
-          <polyline color="#f8dc79" width="6" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="11">
-          <polyline color="#000000" width="9" />
-          <polyline color="#f8dc79" width="7" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="12">
-          <polyline color="#000000" width="13" />
-          <polyline color="#f8dc79" width="9" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="13">
-          <polyline color="#000000" width="18" />
-          <polyline color="#f8dc79" width="14" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="14">
-          <polyline color="#000000" width="21" />
-          <polyline color="#f8dc79" width="17" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="15">
-          <polyline color="#000000" width="24" />
-          <polyline color="#f8dc79" width="20" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="16">
-          <polyline color="#000000" width="39" />
-          <polyline color="#f8dc79" width="33" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="17">
-          <polyline color="#000000" width="78" />
-          <polyline color="#f8dc79" width="72" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="18">
-          <polyline color="#000000" width="156" />
-          <polyline color="#f8dc79" width="150" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land"
-        order="0-1">
-          <polyline color="#fc843b" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="2">
-          <polyline color="#fc843b" width="3" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land"
-        order="3-5">
-          <polyline color="#fc843b" width="6" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="6">
-          <polyline color="#fc843b" width="6" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land"
-        order="7-8">
-          <polyline color="#fc843b" width="6" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="9">
-          <polyline color="#fc843b" width="7" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="10">
-          <polyline color="#fc843b" width="9" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="11">
-          <polyline color="#a8aab3" width="13" />
-          <polyline color="#fc843b" width="9" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="12">
-          <polyline color="#a8aab3" width="15" />
-          <polyline color="#fc843b" width="10" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="13">
-          <polyline color="#a8aab3" width="25" />
-          <polyline color="#fc843b" width="17" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="14">
-          <polyline color="#a8aab3" width="31" />
-          <polyline color="#fc843b" width="24" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="15">
-          <polyline color="#a8aab3" width="33" />
-          <polyline color="#fc843b" width="27" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="16">
-          <polyline color="#a8aab3" width="65" />
-          <polyline color="#fc843b" width="59" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="17">
-          <polyline color="#a8aab3" width="133" />
-          <polyline color="#fc843b" width="127" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="18">
-          <polyline color="#a8aab3" width="264" />
-          <polyline color="#fc843b" width="258" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_exit_label" order="13-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street"
-        order="13-18">
-          <text text_size="8" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp"
-        order="13-18">
-          <text text_size="9" />
-        </itemgra>
-        <itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway"
-        order="13-18">
-          <text text_size="9" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="7-8">
-          <polyline color="#ff9000" width="8" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="9-10">
-          <polyline color="#ff9000" width="10" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="11">
-          <polyline color="#ff9000" width="14" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="12">
-          <polyline color="#ff9000" width="16" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="13">
-          <polyline color="#ff9000" width="26" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="14">
-          <polyline color="#ff9000" width="32" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="15">
-          <polyline color="#ff9000" width="34" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="16">
-          <polyline color="#ff9000" width="66" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="17">
-          <polyline color="#ff9000" width="134" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="18">
-          <polyline color="#ff9000" width="265" />
-        </itemgra>
-      </layer>
-      <layer name="polylines">
-        <itemgra item_types="rail_tram" order="13-">
-          <polyline color="#606060" width="2" />
-        </itemgra>
-      </layer>
-      <layer name="labels">
-        <itemgra item_types="house_number" order="15-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2"
-        order="13-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3"
-        order="12-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_1e3,place_label"
-        order="10-">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4"
-        order="11-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_2e3" order="11-">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4"
-        order="11-">
-          <circle color="#000000" radius="3" text_size="15" />
-        </itemgra>
-        <itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5"
-        order="10-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_2e3" order="10">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7"
-        order="9-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_5e3" order="9-10">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_1e4" order="8-9">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_2e4,town_label_5e4"
-        order="7-8">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5"
-        order="5-">
-          <circle color="#000000" radius="3" text_size="15" />
-        </itemgra>
-        <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7"
-        order="5-">
-          <circle color="#000000" radius="3" text_size="20" />
-        </itemgra>
-        <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5"
-        order="4">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7"
-        order="4">
-          <circle color="#000000" radius="3" text_size="15" />
-        </itemgra>
-        <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7"
-        order="0-3">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-      </layer>
-      <layer name="Internal">
-        <itemgra item_types="track" order="7-">
-          <polyline color="#3f3f3f" width="1" />
-        </itemgra>
-        <itemgra item_types="track_tracked" order="7-">
-          <polyline color="#3f3fff" width="3" />
-        </itemgra>
-        <itemgra item_types="rg_segment" order="12-">
-          <polyline color="#FF089C" width="1" />
-          <arrows color="#FF089C" width="1" />
-        </itemgra>
-        <itemgra item_types="rg_point" order="12-">
-          <circle color="#FF089C" radius="10" text_size="7" />
-        </itemgra>
-        <itemgra item_types="nav_left_1" order="0-">
-          <icon src="nav_left_1_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_left_2" order="0-">
-          <icon src="nav_left_2_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_left_3" order="0-">
-          <icon src="nav_left_3_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_right_1" order="0-">
-          <icon src="nav_right_1_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_right_2" order="0-">
-          <icon src="nav_right_2_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_right_3" order="0-">
-          <icon src="nav_right_3_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_straight" order="0-">
-          <icon src="nav_straight_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_turnaround_left" order="0-">
-          <icon src="nav_turnaround_left_bk.png" w="32" h="32" />
-        </itemgra>
-	 <itemgra item_types="nav_turnaround_right" order="0-">
-          <icon src="nav_turnaround_right_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l1" order="0-">
-          <icon src="nav_roundabout_l1_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r1" order="0-">
-          <icon src="nav_roundabout_r1_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l2" order="0-">
-          <icon src="nav_roundabout_l2_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r2" order="0-">
-          <icon src="nav_roundabout_r2_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l3" order="0-">
-          <icon src="nav_roundabout_l3_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r3" order="0-">
-          <icon src="nav_roundabout_r3_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l4" order="0-">
-          <icon src="nav_roundabout_l4_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r4" order="0-">
-          <icon src="nav_roundabout_r4_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l5" order="0-">
-          <icon src="nav_roundabout_l5_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r5" order="0-">
-          <icon src="nav_roundabout_r5_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l6" order="0-">
-          <icon src="nav_roundabout_l6_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r6" order="0-">
-          <icon src="nav_roundabout_r6_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l7" order="0-">
-          <icon src="nav_roundabout_l7_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r7" order="0-">
-          <icon src="nav_roundabout_r7_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l8" order="0-">
-          <icon src="nav_roundabout_l8_bk.png" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r8" order="0-">
-          <icon src="nav_roundabout_r8_bk.png" w="32" h="32" />
-        </itemgra>
-	<itemgra item_types="nav_keep_left" order="0-">
-	  <icon src="nav_keep_left_bk.png" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_merge_left" order="0-">
-	  <icon src="nav_merge_left_bk.png" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_keep_right" order="0-">
-	  <icon src="nav_keep_right_bk.png" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_merge_right" order="0-">
-	  <icon src="nav_merge_right_bk.png" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_exit_left" order="0-">
-	  <icon src="nav_exit_left_bk.png" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_exit_right" order="0-">
-	  <icon src="nav_exit_right_bk.png" w="32" h="32"/>
-	</itemgra>
-        <itemgra item_types="route_end" order="0-">
-          <icon src="nav_destination_bk.png" w="32" h="32" x="4" y="30"/>
-        </itemgra>
-
-        <itemgra item_types="waypoint,route_end" order="2">
-			<circle color="#000000" radius="4" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="3-5">
-			<circle color="#000000" radius="8" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="6">
-			<circle color="#000000" radius="10" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="7-8">
-			<circle color="#000000" radius="16" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="9-10">
-			<circle color="#000000" radius="20" width="4" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="11">
-			<circle color="#000000" radius="28" width="4" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="12">
-			<circle color="#000000" radius="32" width="4" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="13">
-			<circle color="#000000" radius="52" width="4" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="14">
-			<circle color="#000000" radius="64" width="4" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="15">
-			<circle color="#000000" radius="68" width="6" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="16">
-			<circle color="#000000" radius="132" width="8" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="17">
-			<circle color="#000000" radius="268" width="8" text_size="48"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="18">
-			<circle color="#000000" radius="530" width="8" text_size="48"/>
-		</itemgra>
-
-        <itemgra item_types="nav_none" order="0-">
-          <icon src="unknown.png" />
-        </itemgra>
-        <itemgra item_types="announcement" order="7-">
-          <icon src="gui_sound_32_32.png" />
-          <circle color="#FF089C" radius="10" text_size="7" />
-        </itemgra>
-      </layer>
-      <layer name="POI Symbols" active="1">
-        <itemgra item_types="mini_roundabout" order="12-">
-          <icon src="mini_roundabout.png" />
-        </itemgra>
-        <itemgra item_types="turning_circle" order="12-">
-          <icon src="mini_roundabout.png" />
-        </itemgra>
-        <itemgra item_types="poi_airport" order="6-">
-          <icon src="airport.png" />
-        </itemgra>
-        <itemgra item_types="poi_fuel" order="12-">
-          <icon src="fuel.png" />
-        </itemgra>
-        <itemgra item_types="poi_bridge" order="12-">
-          <icon src="bridge.png" />
-        </itemgra>
-        <itemgra item_types="highway_exit" order="12-">
-          <icon src="exit.png" />
-        </itemgra>
-        <itemgra item_types="poi_auto_club" order="13-">
-          <icon src="auto_club.png" />
-        </itemgra>
-        <itemgra item_types="poi_bank" order="13-">
-          <icon src="bank.png" />
-        </itemgra>
-	<itemgra item_types="poi_atm" order="13-">
-		<icon src="atm.png"/>
-	</itemgra>
-        <itemgra item_types="poi_danger_area" order="13-">
-          <icon src="danger_16_16.png" />
-        </itemgra>
-        <itemgra item_types="poi_forbidden_area" order="13-">
-          <icon src="forbidden_area.png" />
-        </itemgra>
-        <itemgra item_types="poi_tunnel" order="12-">
-          <icon src="tunnel.png" />
-        </itemgra>
-        <itemgra item_types="traffic_signals" order="14-">
-          <icon src="traffic_signals.png" />
-        </itemgra>
-      </layer>
-      <layer name="POI Labels" active="1">
-        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
-        order="15-">
-          <circle color="#606060" radius="0" width="0"
-          text_size="10" />
-        </itemgra>
-      </layer>
-      <layer name="Android-POI-Icons-full" active="0">
-        <itemgra item_types="mini_roundabout" order="12-">
-          <icon src="mini_roundabout.png" />
-        </itemgra>
-        <itemgra item_types="turning_circle" order="12-">
-          <icon src="mini_roundabout.png" />
-        </itemgra>
-        <itemgra item_types="poi_airport" order="5-">
-          <icon src="airport.png" />
-        </itemgra>
-        <itemgra item_types="town_ghost" order="10-">
-          <icon src="ghost_town.png" />
-        </itemgra>
-        <itemgra item_types="poi_hotel" order="12-">
-          <icon src="hotel.png" />
-        </itemgra>
-        <itemgra item_types="poi_car_parking" order="11-">
-          <icon src="parking.png" />
-        </itemgra>
-        <itemgra item_types="poi_car_dealer_parts" order="12-">
-          <icon src="car_dealer.png" />
-        </itemgra>
-        <itemgra item_types="poi_fuel" order="12-">
-          <icon src="fuel.png" />
-        </itemgra>
-        <itemgra item_types="poi_shopping" order="12-">
-          <icon src="shopping.png" />
-        </itemgra>
-        <itemgra item_types="poi_attraction" order="11-">
-          <icon src="attraction.png" />
-        </itemgra>
-        <itemgra item_types="poi_cafe" order="12-">
-          <icon src="cafe.png" />
-        </itemgra>
-        <itemgra item_types="poi_bar" order="12-">
-          <icon src="bar.png" />
-        </itemgra>
-        <itemgra item_types="poi_pub" order="12-">
-          <icon src="beer.png" />
-        </itemgra>
-        <itemgra item_types="poi_bridge" order="12-">
-          <icon src="bridge.png" />
-        </itemgra>
-        <itemgra item_types="highway_exit" order="11-">
-          <icon src="exit.png" />
-        </itemgra>
-        <itemgra item_types="poi_camp_rv" order="12-">
-          <icon src="camping.png" />
-        </itemgra>
-        <itemgra item_types="poi_museum_history" order="12-">
-          <icon src="museum.png" />
-        </itemgra>
-        <itemgra item_types="poi_hospital" order="12-">
-          <icon src="hospital.png" />
-        </itemgra>
-        <itemgra item_types="poi_dining" order="12-">
-          <icon src="restaurant.png"/>
-        </itemgra>
-        <itemgra item_types="poi_fastfood" order="12-">
-          <icon src="fastfood.png" />
-        </itemgra>
-        <itemgra item_types="poi_police" order="12-">
-          <icon src="police.png" />
-        </itemgra>
-        <itemgra item_types="poi_auto_club" order="12-">
-          <icon src="auto_club.png" />
-        </itemgra>
-        <itemgra item_types="poi_autoservice" order="12-">
-          <icon src="car_dealer.png" />
-        </itemgra>
-        <itemgra item_types="poi_bank" order="12-">
-          <icon src="bank.png" />
-        </itemgra>
-	<itemgra item_types="poi_atm" order="12-">
-	  <icon src="atm.png"/>
-	</itemgra>
-        <itemgra item_types="poi_bay" order="12-">
-          <icon src="bay.png" />
-        </itemgra>
-        <itemgra item_types="poi_bend" order="12-">
-          <icon src="bend.png" />
-        </itemgra>
-        <itemgra item_types="poi_boat_ramp" order="12-">
-          <icon src="boat_ramp.png" />
-        </itemgra>
-        <itemgra item_types="poi_border_station" order="12-">
-          <icon src="border_station.png" />
-        </itemgra>
-        <itemgra item_types="poi_bowling" order="12-">
-          <icon src="bowling.png" />
-        </itemgra>
-        <itemgra item_types="poi_bus_station" order="11-">
-          <icon src="bus.png" />
-        </itemgra>
-        <itemgra item_types="poi_bus_stop" order="12-">
-          <icon src="bus_stop.png" />
-        </itemgra>
-        <itemgra item_types="poi_business_service" order="12-">
-          <icon src="business_service.png" />
-        </itemgra>
-        <itemgra item_types="poi_car_rent" order="12-">
-          <icon src="car_rent.png" />
-        </itemgra>
-	<itemgra item_types="poi_car_sharing" order="11-">
-	  <icon src="car_sharing.png"/>
-	</itemgra>
-        <itemgra item_types="poi_car_wash" order="12-">
-          <icon src="car_wash.png" />
-        </itemgra>
-        <itemgra item_types="poi_casino" order="12-">
-          <icon src="casino.png" />
-        </itemgra>
-        <itemgra item_types="poi_cemetery" order="12-">
-          <icon src="cemetery.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_church" order="11-">
-          <icon src="church.png" />
-        </itemgra>
-				<itemgra item_types="poi_bahai" order="11-">
-					<icon src="bahai.png"/>
-				</itemgra>
-				<itemgra item_types="poi_buddhist" order="11-">
-					<icon src="buddhist.png"/>
-				</itemgra>
-				<itemgra item_types="poi_hindu" order="11-">
-					<icon src="hindu.png"/>
-				</itemgra>
-				<itemgra item_types="poi_islamic" order="11-">
-					<icon src="islamic.png"/>
-				</itemgra>
-				<itemgra item_types="poi_jain" order="11-">
-					<icon src="jain.png"/>
-				</itemgra>
-				<itemgra item_types="poi_jewish" order="11-">
-					<icon src="jewish.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pagan" order="11-">
-					<icon src="pagan.png"/>
-				</itemgra>
-				<itemgra item_types="poi_pastafarian" order="11-">
-					<icon src="pastafarian.png"/>
-				</itemgra>
-				<itemgra item_types="poi_shinto" order="11-">
-					<icon src="shinto.png"/>
-				</itemgra>
-				<itemgra item_types="poi_sikh" order="11-">
-					<icon src="sikh.png"/>
-				</itemgra>
-				<itemgra item_types="poi_taoist" order="11-">
-					<icon src="taoist.png"/>
-				</itemgra>
-        <itemgra item_types="poi_cinema" order="12-">
-          <icon src="cinema.png" />
-        </itemgra>
-        <itemgra item_types="poi_communication" order="12-">
-          <icon src="communication.png" />
-        </itemgra>
-        <itemgra item_types="poi_concert" order="12-">
-          <icon src="concert.png" />
-        </itemgra>
-        <itemgra item_types="poi_cove" order="12-">
-          <icon src="cove.png" />
-        </itemgra>
-        <itemgra item_types="poi_crossing" order="12-">
-          <icon src="crossing.png" />
-        </itemgra>
-        <itemgra item_types="poi_dam" order="12-">
-          <icon src="dam.png" />
-        </itemgra>
-        <itemgra item_types="poi_danger_area" order="12-">
-          <icon src="danger_16_16.png" />
-        </itemgra>
-        <itemgra item_types="poi_danger_sea_wreck" order="12-">
-          <icon src="dangerous.png" />
-        </itemgra>
-        <itemgra item_types="poi_daymark" order="12-">
-          <icon src="daymark.png" />
-        </itemgra>
-        <itemgra item_types="poi_diving" order="12-">
-          <icon src="diving.png" />
-        </itemgra>
-        <itemgra item_types="poi_drinking_water" order="13-">
-          <icon src="drinking_water.png" />
-        </itemgra>
-        <itemgra item_types="poi_emergency" order="12-">
-          <icon src="emergency.png" />
-        </itemgra>
-        <itemgra item_types="poi_fair" order="12-">
-          <icon src="fair.png" />
-        </itemgra>
-        <itemgra item_types="poi_firebrigade" order="12-">
-          <icon src="firebrigade.png" />
-        </itemgra>
-        <itemgra item_types="poi_fish" order="9-">
-          <icon src="fish.png" />
-        </itemgra>
-        <itemgra item_types="poi_forbidden_area" order="12-">
-          <icon src="forbidden_area.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_gps" order="15-">
-          <icon src="garmin.png" />
-        </itemgra>
-        <itemgra item_types="poi_golf" order="12-">
-          <icon src="golf.png" />
-        </itemgra>
-        <itemgra item_types="poi_government_building" order="12-">
-          <icon src="government_building.png" />
-        </itemgra>
-        <itemgra item_types="poi_height" order="12-">
-          <icon src="height.png" />
-        </itemgra>
-        <itemgra item_types="poi_heliport" order="8-">
-          <icon src="heliport.png" />
-        </itemgra>
-        <itemgra item_types="poi_hotspring" order="12-">
-          <icon src="hotspring.png" />
-        </itemgra>
-        <itemgra item_types="poi_icesport" order="12-">
-          <icon src="icesport.png" />
-        </itemgra>
-        <itemgra item_types="poi_information" order="12-">
-          <icon src="information.png" />
-        </itemgra>
-        <itemgra item_types="poi_justice" order="12-">
-          <icon src="justice.png" />
-        </itemgra>
-        <itemgra item_types="poi_landmark" order="11-">
-          <icon src="landmark.png" />
-        </itemgra>
-        <itemgra item_types="poi_levee" order="12-">
-          <icon src="levee.png" />
-        </itemgra>
-        <itemgra item_types="poi_level_crossing" order="11-">
-          <icon src="level_crossing.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_library" order="12-">
-          <icon src="library.png" />
-        </itemgra>
-        <itemgra item_types="poi_locale" order="12-">
-          <icon src="locale.png" />
-        </itemgra>
-        <itemgra item_types="poi_loudspeaker" order="12-">
-          <icon src="loudspeaker.png" />
-        </itemgra>
-        <itemgra item_types="poi_mall" order="12-">
-          <icon src="mall.png" />
-        </itemgra>
-        <itemgra item_types="poi_manmade_feature" order="12-">
-          <icon src="manmade_feature.png" />
-        </itemgra>
-        <itemgra item_types="poi_marine" order="12-">
-          <icon src="marine.png" />
-        </itemgra>
-        <itemgra item_types="poi_marine_type" order="12-">
-          <icon src="marine_type.png" />
-        </itemgra>
-        <itemgra item_types="poi_mark" order="12-">
-          <icon src="mark.png" />
-        </itemgra>
-        <itemgra item_types="poi_military" order="11-">
-          <icon src="military.png" />
-        </itemgra>
-        <itemgra item_types="poi_mine" order="12-">
-          <icon src="mine.png" />
-        </itemgra>
-        <itemgra item_types="poi_nondangerous" order="12-">
-          <icon src="nondangerous.png" />
-        </itemgra>
-        <itemgra item_types="poi_oil_field" order="12-">
-          <icon src="oil_field.png" />
-        </itemgra>
-        <itemgra item_types="poi_peak" order="7-">
-          <icon src="peak.png" />
-        </itemgra>
-        <itemgra item_types="poi_personal_service" order="12-">
-          <icon src="personal_service.png" />
-        </itemgra>
-        <itemgra item_types="poi_pharmacy" order="12-">
-          <icon src="pharmacy.png" />
-        </itemgra>
-        <itemgra item_types="poi_post_office,poi_post_box"
-        order="13-">
-          <icon src="post.png" />
-        </itemgra>
-        <itemgra item_types="poi_public_office" order="12-">
-          <icon src="public_office.png" />
-        </itemgra>
-        <itemgra item_types="poi_rail_halt" order="11-">
-          <circle color="#ff0000" radius="3" width="3" />
-          <circle color="#000000" radius="5" width="2"
-          text_size="8" />
-        </itemgra>
-        <itemgra item_types="poi_rail_station" order="9-">
-          <circle color="#ff0000" radius="3" width="3" />
-          <circle color="#000000" radius="6" width="2"
-          text_size="8" />
-        </itemgra>
-        <itemgra item_types="poi_rail_tram_stop" order="10-11">
-          <circle color="#ff0000" radius="2" width="2" />
-        </itemgra>
-        <itemgra item_types="poi_rail_tram_stop" order="12-">
-          <circle color="#ff0000" radius="3" width="3" />
-          <circle color="#606060" radius="5" width="2"
-          text_size="8" />
-        </itemgra>
-        <itemgra item_types="poi_repair_service" order="12-">
-          <icon src="repair_service.png" />
-        </itemgra>
-        <itemgra item_types="poi_resort" order="12-">
-          <icon src="resort.png" />
-        </itemgra>
-        <itemgra item_types="poi_restaurant" order="12-">
-          <icon src="restaurant.png" />
-        </itemgra>
-        <itemgra item_types="poi_restricted_area" order="12-">
-          <icon src="restricted_area.png" />
-        </itemgra>
-        <itemgra item_types="poi_restroom" order="13-">
-          <icon src="toilets.png"/>
-        </itemgra>
-        <itemgra item_types="poi_sailing" order="12-">
-          <icon src="sailing.png" />
-        </itemgra>
-        <itemgra item_types="poi_scenic_area" order="12-">
-          <icon src="scenic_area.png" />
-        </itemgra>
-        <itemgra item_types="poi_school" order="12-">
-          <icon src="school.png" />
-        </itemgra>
-        <itemgra item_types="poi_service" order="12-">
-          <icon src="service.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_apparel" order="12-">
-          <icon src="shop_apparel.png" />
-        </itemgra>
-	<itemgra item_types="poi_shop_bicycle" order="12-">
-	  <icon src="bicycle_shop.png" />
-	</itemgra>
-        <itemgra item_types="poi_shop_computer" order="12-">
-          <icon src="shop_computer.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_department" order="12-">
-          <icon src="shop_department.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_furniture" order="12-">
-          <icon src="shop_furnish.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_grocery" order="12-">
-          <icon src="shop_grocery.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_handg" order="12-">
-          <icon src="shop_handg.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_merchandise" order="12-">
-          <icon src="shop_merchandise.png" />
-        </itemgra>
-        <itemgra item_types="poi_shop_retail" order="12-">
-          <icon src="shop_retail.png" />
-        </itemgra>
-        <itemgra item_types="poi_shower" order="13-">
-          <icon src="shower.png" />
-        </itemgra>
-        <itemgra item_types="poi_skiing" order="11-">
-          <icon src="skiing.png" />
-        </itemgra>
-        <itemgra item_types="poi_social_service" order="12-">
-          <icon src="social_service.png" />
-        </itemgra>
-        <itemgra item_types="poi_sounding" order="12-">
-          <icon src="sounding.png" />
-        </itemgra>
-        <itemgra item_types="poi_sport" order="12-">
-          <icon src="sport.png" />
-        </itemgra>
-        <itemgra item_types="poi_stadium" order="11-">
-          <icon src="stadium.png" />
-        </itemgra>
-        <itemgra item_types="poi_swimming" order="12-">
-          <icon src="swimming.png" />
-        </itemgra>
-        <itemgra item_types="poi_telephone" order="13-">
-          <icon src="telephone.png" />
-        </itemgra>
-        <itemgra item_types="poi_theater" order="12-">
-          <icon src="theater.png" />
-        </itemgra>
-        <itemgra item_types="poi_tide" order="12-">
-          <icon src="tide.png" />
-        </itemgra>
-        <itemgra item_types="poi_tower" order="13-">
-          <icon src="tower.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_townhall" order="12-">
-          <icon src="townhall.png" />
-        </itemgra>
-        <itemgra item_types="poi_trail" order="12-">
-          <icon src="trail.png" />
-        </itemgra>
-        <itemgra item_types="poi_truck_stop" order="12-">
-          <icon src="truck_stop.png" />
-        </itemgra>
-        <itemgra item_types="poi_tunnel" order="12-">
-          <icon src="tunnel.png" />
-        </itemgra>
-        <itemgra item_types="poi_wine" order="12-">
-          <icon src="wine.png" />
-        </itemgra>
-        <itemgra item_types="poi_worship" order="8-">
-          <icon src="worship.png" />
-        </itemgra>
-        <itemgra item_types="poi_wrecker" order="12-">
-          <icon src="wrecker.png" />
-        </itemgra>
-        <itemgra item_types="poi_zoo" order="9-">
-          <icon src="zoo.png" />
-        </itemgra>
-        <itemgra item_types="poi_picnic" order="12-">
-          <icon src="picnic.png" />
-        </itemgra>
-        <itemgra item_types="poi_playground" order="12-">
-          <icon src="playground.png"/>
-        </itemgra>
-        <itemgra item_types="poi_gc_multi" order="12-">
-          <icon src="gc_multi.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_gc_tradi" order="12-">
-          <icon src="gc_tradi.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_gc_event" order="12-">
-          <icon src="gc_event.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_gc_mystery" order="12-">
-          <icon src="gc_mystery.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_gc_question" order="12-">
-          <icon src="gc_question.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_gc_stages" order="12-">
-          <icon src="gc_stages.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_gc_reference" order="12-">
-          <icon src="gc_reference.xpm" />
-        </itemgra>
-        <itemgra item_types="poi_gc_webcam" order="12-">
-          <icon src="gc_webcam.xpm" />
-        </itemgra>
-        <itemgra item_types="traffic_signals" order="13-">
-          <icon src="traffic_signals.png" />
-        </itemgra>
-        <itemgra item_types="poi_wifi" order="13-">
-          <icon src="wifi.png" />
-        </itemgra>
-        <itemgra item_types="poi_image" order="12-">
-          <image />
-        </itemgra>
-        <itemgra item_types="poi_bench" order="13-">
-          <icon src="bench.png" />
-        </itemgra>
-        <itemgra item_types="poi_biergarten" order="12-">
-          <icon src="biergarten.png" />
-        </itemgra>
-        <itemgra item_types="poi_boundary_stone" order="13-">
-          <icon src="boundary_stone.png" />
-        </itemgra>
-        <itemgra item_types="poi_castle" order="11-">
-          <icon src="castle.png" />
-        </itemgra>
-        <itemgra item_types="poi_ruins" order="11-">
-          <icon src="ruins.png" />
-        </itemgra>
-        <itemgra item_types="poi_hunting_stand" order="12-">
-          <icon src="hunting_stand.png" />
-        </itemgra>
-        <itemgra item_types="poi_memorial" order="12-">
-          <icon src="memorial.png" />
-        </itemgra>
-        <itemgra item_types="poi_monument" order="12-">
-          <icon src="memorial.png" />
-        </itemgra>
-        <itemgra item_types="poi_shelter" order="11-">
-          <icon src="shelter.png" />
-        </itemgra>
-        <itemgra item_types="poi_fountain" order="13-">
-          <icon src="fountain.png" />
-        </itemgra>
-        <itemgra item_types="poi_potable_water" order="13-">
-          <icon src="drinking_water.png"/>
-        </itemgra>
-        <itemgra item_types="poi_toilets" order="12-">
-          <icon src="toilets.png" />
-        </itemgra>
-        <itemgra item_types="poi_viewpoint" order="10-">
-          <icon src="viewpoint.png" />
-        </itemgra>
-        <itemgra item_types="tec_common" order="11-">
-          <icon src="tec_common.png"/>
-        </itemgra>
-        <itemgra item_types="vehicle" order="0-">
-          <icon src="gui_vehicle_16_16.png" />
-        </itemgra>
-        <itemgra item_types="vehicle_pedestrian" order="0-">
-          <icon src="gui_vehicle_pedestrian_16_16.png" />
-        </itemgra>
-        <itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf"
-        order="10-">
-          <icon src="%s" />
-        </itemgra>
-      </layer>
-      <layer name="Android-POI-Labels-full" active="0">
-        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_shop_bicycle,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
-         order="14-">
-          <circle color="#606060" radius="0" width="0"
-          text_size="10" />
-        </itemgra>
-        <itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf"
-        order="14-">
-          <circle color="#606060" radius="0" width="0"
-          text_size="10" />
-        </itemgra>
-      </layer>
-      <layer name="Found items" ref="Found items"/>
-    </layout>
-
-		<layout name="Car-simple" color="#839ea9">
-			<layer name="polygon">
-				  <itemgra item_types="poly_town" order="8-">
-				    <polygon color="#6b8091"/>
-				  </itemgra>
-			</layer>
-			<layer name="streets">
-				<itemgra item_types="water_line" order="11-">
-					<polyline width="3" color="#5e71a7" />
-				</itemgra>
-				<itemgra item_types="rail" order="9-">
-					<polyline width="4" color="#a4bac8" />
-					<polyline width="1" color="#e0e0e0" dash="4,6"/>
-				</itemgra>
-				<itemgra item_types="street_1_city,street_1_land" order="12-">
-					<polyline width="5" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12-">
-					<polyline width="7" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_1_city,street_1_land" order="11">
-					<polyline width="3" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9-11">
-					<polyline width="5" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="11-">
-					<polyline width="9" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="8-10">
-					<polyline width="7" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-">
-					<polyline width="9" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10">
-					<polyline width="7" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7">
-					<polyline width="3" color="#516170" />
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="4-">
-					<polyline width="9" color="#516170" />
-				</itemgra>
-
-				<itemgra item_types="street_route" >
-					<polyline width="11" color="#516170" />
-				</itemgra>
-
-				<itemgra item_types="street_1_city,street_1_land" order="12-">
-					<polyline width="3" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12-">
-					<polyline width="5" color="#90a3af" />
-				</itemgra>
-				<itemgra item_types="street_1_city,street_1_land" order="11">
-					<polyline width="1" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9-11">
-					<polyline width="3" color="#90a3af" />
-				</itemgra>
-
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="11-">
-					<polyline width="6" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="8-10">
-					<polyline width="4" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-">
-					<polyline width="6" color="#c7e1f2" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10">
-					<polyline width="4" color="#c7e1f2" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7">
-					<polyline width="1" color="#c7e1f2" />
-				</itemgra>
-
-				<itemgra item_types="highway_city,highway_land" order="4-">
-					<polyline width="3" color="#c0e1ff" />
-				</itemgra>
-
-				<itemgra item_types="street_route" >
-					<polyline width="9" color="#ffffff" />
-				</itemgra>
-
-				<itemgra item_types="waypoint,route_end" >
-					<circle color="#000000" radius="8" width="2" text_size="24"/>
-				</itemgra>
-			</layer>
-			<layer name="labels">
-				<itemgra item_types="water_line" order="11-">
-					<text text_size="16" color="#0000ff" />
-				</itemgra>
-				<itemgra item_types="street_1_city,street_2_city,street_3_city,street_4_city,highway_city,street_1_land,street_2_land,street_3_land,street_4_land,street_n_lanes,highway_land,living_street,footway">
-					<text text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="10-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,district_label_1e3,district_label_2e3" order="9-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e3,district_label_5e3" order="8-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,district_label_1e4" order="7-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e4,district_label_2e4" order="6-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e4,town_label_1e5,district_label_5e4,district_label_1e5" order="5-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e5,district_label_2e5" order="4-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e5,district_label_5e5" order="2-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7,district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-		<layout name="Bike" color="#ffefb7" font="Liberation Sans">
-
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#0000ff" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
-				<itemgra speed_range="-2">
-					<polyline color="#0000ff" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
-					</polyline>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polyline color="#0000ff" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="Landuse">
-				<itemgra item_types="image" order="0-">
-					<image/>
-				</itemgra>
-				<itemgra item_types="poly_wood" order="0-">
-					<polygon color="#8ec78d"/>
-				</itemgra>
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#ffc895"/>
-					<polyline color="#ebb481"/>
-				</itemgra>
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#7cc334"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_water" order="0-">
-					<polygon color="#82c8ea"/>
-					<polyline color="#5096b8"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_land" order="0-">
-					<polygon color="#ffefb7"/>
-					<polyline color="#ffefb7"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#a0a0a0"/>
-				</itemgra>
-				<itemgra item_types="poly_sport" order="0-">
-					<polygon color="#ff8c00"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_place,poly_railway" order="0-">
-					<polygon color="#e6e6e6"/>
-				</itemgra>
-				<itemgra item_types="poly_commercial" order="0-">
-					<polygon color="#fff8dc"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_building,poly_place,poly_brownfield,poly_greenfield,poly_construction,poly_railway" order="0-">
-					<polygon color="#ecd8ff"/>
-				</itemgra>
-				<itemgra item_types="poly_farm" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_meadow" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-				</itemgra>
-				<itemgra item_types="poly_scree,poly_scrub,poly_fell,poly_heath" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_marsh,poly_mud,poly_quarry" order="0-">
-					<polygon color="#DEB887"/>
-					<polyline color="#DEB887"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_allotments,poly_playground,poly_village_green,poly_recreation_ground,poly_common,poly_garden" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_ruins" order="0-">
-					<polygon color="#b6a6a6"/>
-				</itemgra>
-				<itemgra item_types="poly_apron" order="0-">
-					<polygon color="#d0d0d0"/>
-				</itemgra>
-				<itemgra item_types="poly_terminal" order="7-">
-					<polygon color="#e3c6a6"/>
-				</itemgra>
-				<itemgra item_types="poly_cemetery" order="1-">
-					<polygon color="#bde3cb"/>
-				</itemgra>
-				<itemgra item_types="poly_car_parking" order="1-">
-					<polygon color="#d2d2d2"/>
-				</itemgra>
-				<itemgra item_types="poly_building" order="0-">
-					<polygon color="#ff6347"/>
-				</itemgra>
-			</layer>
-			<layer name="Contour Lines">
-				<itemgra item_types="height_line_1" order="8">
-					<polyline color="#A9A9A9" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_1" order="9">
-					<polyline color="#A9A9A9" width="2"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="9">
-					<polyline color="#A9A9A9" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_1" order="10-">
-					<polyline color="#A9A9A9" width="3"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="10-">
-					<polyline color="#A9A9A9" width="2"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_3" order="10-">
-					<polyline color="#A9A9A9" width="1"/>
-				</itemgra>
-			</layer>
-			<!-- "Contour Lines" -->
-
-			<layer name="Barriers">
-				<itemgra item_types="ditch" order="8-">
-					<polyline color="#B8860B" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="hedge" order="8-">
-					<polyline color="#90EE90" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="fence" order="8-">
-					<polyline color="#808080" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="wall" order="8-">
-					<polyline color="#808080" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="retaining_wall" order="8-">
-					<polyline color="#808080" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="city_wall" order="8-">
-					<polyline color="#CD5C5C" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-			</layer>
-			<!-- "Barriers" -->
-
-			<layer name="Waterways">
-				<itemgra item_types="water_line" order="0-">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="0-">
-					<polyline color="#82c8ea" width="4"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="0-">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="0-">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_drain" order="0-">
-					<polyline color="#82c8ea" width="1"/>
-					<text text_size="5"/>
-				</itemgra>
-			</layer>
-			<layer name="Borders">
-				<itemgra item_types="border_state" order="0-5">
-					<polyline color="#778899" width="3"/>
-					<polyline color="#ffefb7" dash="3,2,1,3" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-5">
-					<polyline color="#778899" width="2"/>
-					<polyline color="#ffefb7" dash="3,2,1,3" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="6-11">
-					<polyline color="#778899" width="3"/>
-					<polyline color="#ffefb7" dash="6,6,1,6" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="6-11">
-					<polyline color="#778899" width="2"/>
-					<polyline color="#ffefb7" dash="6,6,1,6" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="12-20">
-					<polyline color="#778899" width="3"/>
-					<polyline color="#ffefb7" dash="10,10,2,10" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="12-20">
-					<polyline color="#778899" width="2"/>
-					<polyline color="#ffefb7" dash="10,10,2,10" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="Current Route">
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#FF00FF" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#FF00FF" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#FF00FF" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#FF00FF" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#FF00FF" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#FF00FF" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#FF00FF" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#FF00FF" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#FF00FF" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#FF00FF" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#FF00FF" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#FF00FF" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#FF00FF" width="530"/>
-				</itemgra>
-			</layer>
-			<layer name="Ways and Paths">
-				<itemgra item_types="powerline" order="12-">
-					<polyline color="#778899" width="1"/>
-					<polyline color="#778899" dash="1,80" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_paved" order="8-">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="9-">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="track_unpaved" order="10-">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#fefefe" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_ground" order="11-">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#fefefe" width="1" dash="6,6"/>
-				</itemgra>
-				<itemgra item_types="track_grass" order="12-">
-					<polyline color="#fefefe" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="6,6"/>
-				</itemgra>
-				<itemgra item_types="bridleway" order="10-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#f4a460" width="1"/>
-				</itemgra>
-				<itemgra item_types="cycleway" order="10-">
-					<polyline color="#006400" width="4"/>
-					<polyline color="#3cb371" width="2"/>
-				</itemgra>
-				<itemgra item_types="footway" order="12-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#CD853F" width="1"/>
-				</itemgra>
-				<itemgra item_types="steps" order="12-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#F4A460" width="1" dash="6,4"/>
-				</itemgra>
-				<itemgra item_types="path" order="11-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#ffefb7" width="1" dash="2,4"/>
-				</itemgra>
-				<itemgra item_types="hiking" order="11-">
-					<polyline color="#8b4513" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="4,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_mountain" order="11-">
-					<polyline color="#8b4513" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="6,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_mountain_demanding" order="13-">
-					<polyline color="#8b4513" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="8,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_alpine" order="13-">
-					<polyline color="#8b4513" width="1" dash="10,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_alpine_demanding" order="14-">
-					<polyline color="#8b4513" width="1" dash="12,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_alpine_difficult" order="14-">
-					<polyline color="#8b4513" width="1" dash="14,4"/>
-				</itemgra>
-			</layer>
-			<layer name="Streets">
-				<itemgra item_types="poly_pedestrian,poly_plaza" order="0-">
-					<polygon color="#d2d2d2"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="9">
-					<polyline color="#d2d2d2" width="2"/>
-					<polyline color="#fefefe" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="11">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="12">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="13">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="14">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="15">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="16">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="17">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#fefefe" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="18">
-					<polyline color="#d2d2d2" width="11"/>
-					<polyline color="#fefefe" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="12">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="13">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="14">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="15">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="16">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="17">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="18">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="8-10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#ffffff" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#ffffff" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#ffffff" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#d2d2d2" width="12"/>
-					<polyline color="#ffffff" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#d2d2d2" width="15"/>
-					<polyline color="#ffffff" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#d2d2d2" width="17"/>
-					<polyline color="#ffffff" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#d2d2d2" width="33"/>
-					<polyline color="#ffffff" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#d2d2d2" width="69"/>
-					<polyline color="#ffffff" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#d2d2d2" width="132"/>
-					<polyline color="#ffffff" width="126"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="7-8">
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="9">
-					<polyline color="#c0c0c0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="10">
-					<polyline color="#c0c0c0" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="11">
-					<polyline color="#c0c0c0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="12">
-					<polyline color="#c0c0c0" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="13">
-					<polyline color="#c0c0c0" width="11"/>
-					<polyline color="#ffff00" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="14">
-					<polyline color="#c0c0c0" width="14"/>
-					<polyline color="#ffff00" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="15">
-					<polyline color="#c0c0c0" width="19"/>
-					<polyline color="#ffff00" width="15"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="16">
-					<polyline color="#c0c0c0" width="30"/>
-					<polyline color="#ffff00" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="17">
-					<polyline color="#c0c0c0" width="63"/>
-					<polyline color="#ffff00" width="57"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="18">
-					<polyline color="#c0c0c0" width="100"/>
-					<polyline color="#ffff00" width="90"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="7-8">
-					<polyline color="#a0a0a0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="9">
-					<polyline color="#a0a0a0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="10">
-					<polyline color="#a0a0a0" width="8"/>
-					<polyline color="#ffff00" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="11">
-					<polyline color="#a0a0a0" width="9"/>
-					<polyline color="#ffff00" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="12">
-					<polyline color="#a0a0a0" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="13">
-					<polyline color="#a0a0a0" width="18"/>
-					<polyline color="#ffff00" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="14">
-					<polyline color="#a0a0a0" width="21"/>
-					<polyline color="#ffff00" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="15">
-					<polyline color="#a0a0a0" width="25"/>
-					<polyline color="#ffff00" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="16">
-					<polyline color="#a0a0a0" width="40"/>
-					<polyline color="#ffff00" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="17">
-					<polyline color="#a0a0a0" width="79"/>
-					<polyline color="#ffff00" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="18">
-					<polyline color="#a0a0a0" width="156"/>
-					<polyline color="#ffff00" width="150"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#000000" width="5"/>
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#000000" width="6"/>
-					<polyline color="#ff0000" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#000000" width="9"/>
-					<polyline color="#ff0000" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#000000" width="13"/>
-					<polyline color="#ff0000" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#000000" width="18"/>
-					<polyline color="#ff0000" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#000000" width="21"/>
-					<polyline color="#ff0000" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#000000" width="24"/>
-					<polyline color="#ff0000" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#000000" width="39"/>
-					<polyline color="#ff0000" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#000000" width="78"/>
-					<polyline color="#ff0000" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#000000" width="156"/>
-					<polyline color="#ff0000" width="150"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#ff0000" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#ff0000" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#ff0000" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#ff0000" width="9"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#ff0000" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#ff0000" width="15"/>
-					<polyline color="#ffff00" width="10"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#ff0000" width="25"/>
-					<polyline color="#ffff00" width="17"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#ff0000" width="31"/>
-					<polyline color="#ffff00" width="24"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#ff0000" width="33"/>
-					<polyline color="#ffff00" width="27"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#ff0000" width="65"/>
-					<polyline color="#ffff00" width="59"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#ff0000" width="133"/>
-					<polyline color="#ffff00" width="127"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#ff0000" width="264"/>
-					<polyline color="#ffff00" width="258"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="Aerialways">
-				<itemgra item_types="aeroway_taxiway" order="10">
-					<polyline color="#989994" width="4"/>
-					<polyline color="#d3dbbc" width="2"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="11">
-					<polyline color="#989994" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="12">
-					<polyline color="#989994" width="10"/>
-					<polyline color="#d3dbbc" width="8"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="13">
-					<polyline color="#989994" width="12"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="14">
-					<polyline color="#989994" width="15"/>
-					<polyline color="#d3dbbc" width="13"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="15">
-					<polyline color="#989994" width="17"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="16">
-					<polyline color="#989994" width="33"/>
-					<polyline color="#d3dbbc" width="26"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="17">
-					<polyline color="#989994" width="69"/>
-					<polyline color="#d3dbbc" width="61"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="18">
-					<polyline color="#989994" width="132"/>
-					<polyline color="#d3dbbc" width="126"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#d3dbbc" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="9">
-					<polyline color="#6b6f5f" width="5"/>
-					<polyline color="#d3dbbc" width="3"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="10">
-					<polyline color="#6b6f5f" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="11">
-					<polyline color="#6b6f5f" width="9"/>
-					<polyline color="#d3dbbc" width="7"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="12">
-					<polyline color="#6b6f5f" width="13"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="13">
-					<polyline color="#6b6f5f" width="18"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="14">
-					<polyline color="#6b6f5f" width="21"/>
-					<polyline color="#d3dbbc" width="17"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="15">
-					<polyline color="#6b6f5f" width="24"/>
-					<polyline color="#d3dbbc" width="20"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="16">
-					<polyline color="#6b6f5f" width="39"/>
-					<polyline color="#d3dbbc" width="33"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="17">
-					<polyline color="#6b6f5f" width="78"/>
-					<polyline color="#d3dbbc" width="72"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="18">
-					<polyline color="#6b6f5f" width="156"/>
-					<polyline color="#d3dbbc" width="150"/>
-				</itemgra>
-			</layer>
-			<layer name="Railways">
-				<itemgra item_types="rail" order="6-9">
-					<polyline color="#696969" width="4"/>
-					<polyline color="#FFFFFF" dash="2,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_narrow_gauge" order="6-9">
-					<polyline color="#696969" width="4"/>
-					<polyline color="#FFFFFF" dash="2,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="10-13">
-					<polyline color="#696969" width="6"/>
-					<polyline color="#FFFFFF" dash="3,8" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_narrow_gauge" order="10-13">
-					<polyline color="#696969" width="6"/>
-					<polyline color="#FFFFFF" dash="3,8" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="14-18">
-					<polyline color="#696969" width="8"/>
-					<polyline color="#FFFFFF" dash="4,12" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_narrow_gauge" order="14-18">
-					<polyline color="#696969" width="8"/>
-					<polyline color="#FFFFFF" dash="4,12" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_light" order="10-13">
-					<polyline color="#696969" width="4"/>
-					<polyline color="#FFFFFF" dash="2,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_light" order="14-18">
-					<polyline color="#696969" width="6"/>
-					<polyline color="#FFFFFF" dash="4,8" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_subway" order="8-">
-					<polyline color="#696969" width="2"/>
-					<polyline color="#FFFFFF" dash="5,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_mono" order="10-">
-					<polyline color="#696969" width="2"/>
-				</itemgra>
-				<itemgra item_types="rail_tram,bus_guideway" order="10-">
-					<polyline color="#696969" width="2"/>
-				</itemgra>
-				<itemgra item_types="rail_preserved" order="10-">
-					<polyline color="#696969" width="1" dash="7"/>
-				</itemgra>
-				<itemgra item_types="rail_disused" order="12-">
-					<polyline color="#d3d3d3" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="rail_abandoned" order="12-">
-					<polyline color="#f5f5f5" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="lift_cable_car" order="10-">
-					<polyline color="#778899" width="5"/>
-					<polyline color="#ffefb7" dash="1,40" width="1"/>
-				</itemgra>
-				<itemgra item_types="lift_chair" order="10-">
-					<polyline color="#778899" width="5"/>
-					<polyline color="#ffefb7" dash="1,40" width="1"/>
-				</itemgra>
-				<itemgra item_types="lift_drag" order="10-">
-					<polyline color="#778899" width="5"/>
-					<polyline color="#ffefb7" dash="1,40" width="1"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#000000" width="3"/>
-					<polyline color="#ffefb7"  width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="track" order="3-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="Internal">
-				<itemgra item_types="track" order="7-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_tracked" order="7-">
-					<polyline color="#3f3fff" width="3"/>
-				</itemgra>
-				<itemgra item_types="rg_segment" order="12-">
-					<polyline color="#FF089C" width="1"/>
-					<arrows color="#FF089C" width="1"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="12-">
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="nav_left_1" order="0-">
-					<icon src="nav_left_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_2" order="0-">
-					<icon src="nav_left_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_3" order="0-">
-					<icon src="nav_left_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_1" order="0-">
-					<icon src="nav_right_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_2" order="0-">
-					<icon src="nav_right_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_3" order="0-">
-					<icon src="nav_right_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_straight" order="0-">
-					<icon src="nav_straight_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_left" order="0-">
-					<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_right" order="0-">
-					<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l1" order="0-">
-					<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r1" order="0-">
-					<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l2" order="0-">
-					<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r2" order="0-">
-					<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l3" order="0-">
-					<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r3" order="0-">
-					<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l4" order="0-">
-					<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r4" order="0-">
-					<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l5" order="0-">
-					<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r5" order="0-">
-					<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l6" order="0-">
-					<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r6" order="0-">
-					<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l7" order="0-">
-					<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r7" order="0-">
-					<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l8" order="0-">
-					<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r8" order="0-">
-					<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_left" order="0-">
-					<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_left" order="0-">
-					<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_right" order="0-">
-					<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_right" order="0-">
-					<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_left" order="0-">
-					<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_right" order="0-">
-					<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="route_end" order="0-">
-					<icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
-				</itemgra>
-
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#000000" radius="4" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#000000" radius="8" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#000000" radius="10" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#000000" radius="16" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#000000" radius="20" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#000000" radius="28" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#000000" radius="32" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#000000" radius="52" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#000000" radius="64" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#000000" radius="68" width="6" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#000000" radius="132" width="8" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#000000" radius="268" width="8" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#000000" radius="530" width="8" text_size="48"/>
-				</itemgra>
-
-				<itemgra item_types="nav_none" order="0-">
-					<icon src="unknown.svg"/>
-				</itemgra>
-				<itemgra item_types="announcement" order="7-">
-					<icon src="gui_sound_32_32.png"/>
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-			</layer>
-			<layer name="Street Labels">
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="track,track_paved,track_gravelled,track_unpaved,track_ground,track_grass" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="bridleway,cycleway,footway,steps,path" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="hiking,hiking_mountain,hiking_mountain_demanding,hiking_alpine,hiking_alpine_demanding,hiking_alpine_difficult" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-			</layer>
-			<layer name="Unknown Elements">
-				<!-- This entry shows all unknown linear elements as blue lines -->
-				<!--
-				<itemgra item_types="street_unkn" order="0-">
-					<polyline color="#8080ff" width="3"/>
-				</itemgra>
-				-->
-			</layer>
-			<layer name="Place Labels">
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="9-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="9-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="7-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="7-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="5-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="3-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-			</layer>
-
-			<xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
-			<!--<xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
-
-			<!-- "Bicycle POIs" -->
-			<layer name="Bicycle POI Symbols">
-				<itemgra item_types="poi_bicycle_parking" order="12-">
-					<icon src="bicycle_parking.png"/>
-				</itemgra>
-				<itemgra item_types="poi_bicycle_rental" order="11-">
-					<icon src="bicycle_rental.png"/>
-				</itemgra>
-			</layer>
-			<layer name="Bicycle POI Labels">
-				<itemgra item_types="poi_bicycle_parking,poi_bicycle_rental" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-		<layout name="T@H" font="Liberation Sans">
-
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#0000ff" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
-				<itemgra speed_range="-2">
-					<polyline color="#0000ff" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
-					</polyline>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polyline color="#0000ff" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="sea" details="0">
-				<!-- landuse=forest -->
-				<itemgra item_types="poly_wood" order="0-">
-					<polygon color="#72bf81"/>
-				</itemgra>
-				<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
-					<polygon color="#a0a0a0"/>
-					<text text_size="5"/>
-				</itemgra>
-				<!-- landuse=residential -->
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#f2f2f2"/>
-				</itemgra>
-				<!-- natural=water -->
-				<itemgra item_types="poly_water" order="0-">
-					<polygon color="#b5d6f1"/>
-					<polyline color="#b5d6f1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poly_water_tiled">
-					<polygon color="#b5d6f1"/>
-				</itemgra>
-				<!-- leisure=park -->
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#a0a0a0"/>
-				</itemgra>
-				<itemgra item_types="poly_sport" order="0-">
-					<polygon color="#4af04f"/>
-				</itemgra>
-				<!-- landuse=industrial -->
-				<itemgra item_types="poly_industry,poly_building,poly_place" order="0-">
-					<polygon color="#ecd8ff"/>
-				</itemgra>
-				<!-- waterway=stream -->
-				<itemgra item_types="water_line" order="0-4">
-					<polyline color="#b5d6f1" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<!-- railway=subway -->
-				<itemgra item_types="rail" order="6">
-					<polyline color="#aaaaaa" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="7-8">
-					<polyline color="#aaaaaa" width="2"/>
-				</itemgra>
-				<itemgra item_types="rail" order="9-">
-					<polyline color="#aaaaaa" width="6"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-">
-					<polyline color="#b8434e" width="1"/>
-				</itemgra>
-				<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="1"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="0-">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-				<!-- routing -->
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#0000a0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#0000a0" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#0000a0" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#0000a0" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#0000a0" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#0000a0" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#0000a0" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#0000a0" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#0000a0" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#0000a0" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#0000a0" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#0000a0" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#0000a0" width="530"/>
-				</itemgra>
-				<!-- highway=service,footway, ,... -->
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10">
-					<polyline color="#efeaa0" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="11-12">
-					<polyline color="#efeaa0" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="13-">
-					<polyline color="#efeaa0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#ffffff" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#ffffff" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#ffffff" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#d2d2d2" width="12"/>
-					<polyline color="#ffffff" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#d2d2d2" width="15"/>
-					<polyline color="#ffffff" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#d2d2d2" width="17"/>
-					<polyline color="#ffffff" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#d2d2d2" width="33"/>
-					<polyline color="#ffffff" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#d2d2d2" width="69"/>
-					<polyline color="#ffffff" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#d2d2d2" width="132"/>
-					<polyline color="#ffffff" width="126"/>
-				</itemgra>
-				<!-- highway=tertiary -->
-				<itemgra item_types="street_2_city,street_2_land" order="7-8">
-					<polyline color="#c4c4c4" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9">
-					<polyline color="#c4c4c4" width="4"/>
-					<polyline color="#f7f496" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="10">
-					<polyline color="#c4c4c4" width="6"/>
-					<polyline color="#f7f496" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="11">
-					<polyline color="#c4c4c4" width="8"/>
-					<polyline color="#f7f496" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12">
-					<polyline color="#c4c4c4" width="12"/>
-					<polyline color="#f7f496" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="13">
-					<polyline color="#c4c4c4" width="15"/>
-					<polyline color="#f7f496" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="14">
-					<polyline color="#c4c4c4" width="18"/>
-					<polyline color="#f7f496" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="15">
-					<polyline color="#c4c4c4" width="21"/>
-					<polyline color="#f7f496" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="16">
-					<polyline color="#c4c4c4" width="35"/>
-					<polyline color="#f7f496" width="30"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="17">
-					<polyline color="#c4c4c4" width="73"/>
-					<polyline color="#f7f496" width="67"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="18">
-					<polyline color="#c4c4c4" width="144"/>
-					<polyline color="#f7f496" width="138"/>
-				</itemgra>
-				<!-- highway=secondary -->
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="7">
-					<polyline color="#fdbf6f" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="8">
-					<polyline color="#000000" width="2"/>
-					<polyline color="#fdbf6f" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="9">
-					<polyline color="#000000" width="5"/>
-					<polyline color="#fdbf6f" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="10">
-					<polyline color="#000000" width="8"/>
-					<polyline color="#fdbf6f" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="11">
-					<polyline color="#000000" width="9"/>
-					<polyline color="#fdbf6f" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="12">
-					<polyline color="#000000" width="11"/>
-					<polyline color="#fdbf6f" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="13">
-					<polyline color="#000000" width="16"/>
-					<polyline color="#fdbf6f" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="14">
-					<polyline color="#000000" width="19"/>
-					<polyline color="#fdbf6f" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="15">
-					<polyline color="#000000" width="23"/>
-					<polyline color="#fdbf6f" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="16">
-					<polyline color="#000000" width="36"/>
-					<polyline color="#fdbf6f" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="17">
-					<polyline color="#000000" width="75"/>
-					<polyline color="#fdbf6f" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="18">
-					<polyline color="#000000" width="152"/>
-					<polyline color="#fdbf6f" width="150"/>
-				</itemgra>
-				<!-- highway=primary -->
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
-					<polyline color="#e46d71" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
-					<polyline color="#e46d71" width="3"/>
-					<polyline color="#e46d71" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#e46d71" width="5"/>
-					<polyline color="#e46d71" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#e46d71" width="6"/>
-					<polyline color="#e46d71" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#e46d71" width="9"/>
-					<polyline color="#e46d71" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#e46d71" width="13"/>
-					<polyline color="#e46d71" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#e46d71" width="18"/>
-					<polyline color="#e46d71" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#e46d71" width="21"/>
-					<polyline color="#e46d71" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#e46d71" width="24"/>
-					<polyline color="#e46d71" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#e46d71" width="39"/>
-					<polyline color="#e46d71" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#e46d71" width="78"/>
-					<polyline color="#e46d71" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#e46d71" width="156"/>
-					<polyline color="#e46d71" width="150"/>
-				</itemgra>
-				<!-- highway=motorway -->
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#87908a" width="3"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#87908a" width="4"/>
-					<polyline color="#809bc0" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#87908a" width="7"/>
-					<polyline color="#809bc0" width="5"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#87908a" width="9"/>
-					<polyline color="#809bc0" width="5"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#87908a" width="13"/>
-					<polyline color="#809bc0" width="9"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#87908a" width="15"/>
-					<polyline color="#809bc0" width="10"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#87908a" width="25"/>
-					<polyline color="#809bc0" width="17"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#87908a" width="31"/>
-					<polyline color="#809bc0" width="24"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#87908a" width="33"/>
-					<polyline color="#809bc0" width="27"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#87908a" width="65"/>
-					<polyline color="#809bc0" width="59"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#87908a" width="133"/>
-					<polyline color="#809bc0" width="127"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#87908a" width="264"/>
-					<polyline color="#809bc0" width="258"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- highway=primary (font)-->
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<!-- place=suburb -->
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="9-">
-					<circle color="#000000" radius="3" text_size="9"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<!-- place=city -->
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="0-">
-					<circle color="#FF089C" radius="10"/>
-				</itemgra>
-
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#008080" radius="4" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#008080" radius="8" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#008080" radius="10" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#008080" radius="16" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#008080" radius="20" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#008080" radius="28" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#008080" radius="32" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#008080" radius="52" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#008080" radius="64" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#008080" radius="68" width="6" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#008080" radius="132" width="8" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#008080" radius="268" width="8" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#008080" radius="530" width="8" text_size="48"/>
-				</itemgra>
-
-				<!-- !!!!...POIs...!!!! -->
-				<!-- amenity=bank -->
-				<itemgra item_types="poi_bank" order="14-">
-					<icon src="bank.png"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="poi_atm" order="12-">
-					<icon src="atm.png"/>
-				</itemgra>
-				<!-- amenity=fuel -->
-				<itemgra item_types="poi_fuel" order="14-">
-					<icon src="fuel.png"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- amenity=hospitalg -->
-				<itemgra item_types="poi_hospital" order="14-">
-					<icon src="hospital.png"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- amenity=parking -->
-				<itemgra item_types="poi_car_parking" order="14-">
-					<icon src="parking.png"/>
-				</itemgra>
-				<!-- amenity=police -->
-				<itemgra item_types="poi_police" order="14-">
-					<icon src="police.png"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- amenity=restaurant -->
-				<itemgra item_types="poi_restaurant" order="14-">
-					<icon src="restaurant.png"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- leisure=golf_curse -->
-				<itemgra item_types="poi_golf" order="14-">
-					<icon src="golf.png"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- tourism=hotel -->
-				<itemgra item_types="poi_hotel" order="14-">
-					<icon src="hotel.png"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
+		<!--
+		Layouts are defined in their own specific XML files and are included below (one file per layout, all files matching the wildcard expression below will be used)
+		The layout files describe the appearance of maps on the screen (colors, width, text fonts and sizes for each type of element to draw)
+		One layout is a specifid theme. At runtime, the user can select only one layout at a time (by choosing the corresponding theme from its name tag defined in the layout XML file).
+		If two layouts with the same name are included, the first one takes precedence.
+		In the list below, we use the user-defined layouts first (in $NAVIT_USER_DATADIR), they take precedence. Being next in the list, the default layouts (in $NAVIT_SHAREDIR) will only be used if there is no user-defined layout that was already defined with the same name.
+		-->
+		<xi:include href="$NAVIT_USER_DATADIR/navit_layout_*.xml"/>
+		<xi:include href="$NAVIT_SHAREDIR/navit_layout_*.xml"/>
 		<layout name="Route">
 			<layer name="streets">
 				<itemgra item_types="street_route_occluded" order="0-">
diff --git a/navit/script/check_itemdef b/navit/script/check_itemdef
deleted file mode 100755
index 61ea1cb29..000000000
--- a/navit/script/check_itemdef
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-function check_item_def
-{
-	grep -q "[(,]$1)" ../item_def.h || echo "$1 missing"
-}
-
-function check_item_xml
-{
-	grep -q "^$1\$" check.$$ || echo "$1 will not be rendered"
-}
-
-
-awk '/<layout name="Car"/,/<\/layout/ { if (/<itemgra/) {print $0} }' < ../navit.xml | sed 's/.*item_types="\([^"]*\)".*/\1/' | tr "," "\012" | sort -u >check.$$
-echo item_def.h
-grep "^ITEM" ../item_def.h | sed -e "s/ITEM(\(.*\))/\1/" -e "s/ITEM2([^,]*,\(.*\))/\1/" |
-while read -r x
-do
-	check_item_xml "$x"
-done
-
-rm -f check.$$
-echo maptool.c
-egrep '^	"[nw]	+[^	]+	+[^	]+' ../maptool.c | sed "s/.*	//" | sort -u |
-while read -r x
-do
-	check_item_def "${x%%\\n\"}"
-done
-
-echo "navit.xml"
-grep '<itemgra item_types="' <../navit.xml | cut -d \" -f 2 | tr "," "\012" |
-while read -r x
-do
-	check_item_def "$x"
-done
-
-echo "garmintypes.txt"
-grep "^[0-9]" ../map/garmin/garmintypes.txt | sed -e 's/[A-Z][A-Z]*, //' -e 's/.*= \([^,]*\),.*/\1/' | sort -u |
-while read -r x
-do
-	check_item_def "$x"
-done
-
diff --git a/navit/script/itemgra.pl b/navit/script/itemgra.pl
index bbe02b000..54a08225c 100755
--- a/navit/script/itemgra.pl
+++ b/navit/script/itemgra.pl
@@ -1,25 +1,69 @@
 #! /usr/bin/perl
+
+# This script parses the XML config file and checks if known itemgra elements are defined or not in each layout
+# Run ./itemgra.pl 2>/dev/null to get only the result without parsing information messages
 my $layout;
 my $type,$types;
+my $garmintypes;
 my $order,$orders,@orders;
 my @layouts;
-open(IN,"../navit.xml");
-while (<IN>) {
-	if (/<layout name="([^"]*)"/) {
-		$layout=$1;
-		push(@layouts,$layout);
-	}
-	if (/<itemgra item_types="([^"]*)"/) {
-		$types=$1;
-		if (/order="([^"]*)"/) {
-			$order=$1;
-			foreach $type (split(",",$types)) {
-				$result->{$type}->{$layout}->{$order}=1;
+my $input_stream;
+my @input_stream_stack;
+my $current_filename = "../navit_shipped.xml";
+if (!open($input_stream,$current_filename)) {
+	print(STDERR "Failed to open \"" . $current_filename . "\"\n");
+	exit(1);
+}
+while(defined($input_stream)) {
+	#printf("%d input streams in file recursion stack. Current input stream is " . $input_stream . "\n", $#input_stream_stack+1);
+	while (<$input_stream>) {
+		#print($_);
+		if (/<layout name="([^"]*)"/) {
+			$layout=$1;
+			push(@layouts,$layout);
+		}
+		if (/<xi:include href="([^"]*)"/) {
+			my $xml_include_file;
+			$xml_include_file=$1;
+			if ($xml_include_file =~ /^[\/\$]/) {	# PATH is absolute or starts with a variable... do not modify PATH
+			}
+			$xml_include_file =~ s@^@../@;	# Make PATH relative to ../ (navit XML config is in parent
+			if ($xml_include_file =~ /.*maps\/\*\.xml$/) {	# Skip mapsets that use wildcards
+			}
+			else {
+				push(@input_stream_stack, $input_stream);
+				$input_stream = undef;
+				print(STDERR "Opening included file \"" . $xml_include_file . "\"\n");
+				if (!open($input_stream, $xml_include_file)) {
+					$xml_include_file =~ s/\.xml$/_shipped.xml/;	# If file does not exist, try suffixing the filename with _shipped
+					print(SDTERR "Opening included file \"" . $xml_include_file . "\"\n");
+					if (!open($input_stream, $xml_include_file)) {
+						print(STDERR "Failed to open \"" . $xml_include_file . "\"\n");
+						exit(1);
+					}
+				}
+				$current_filename = $xml_include_file;
+				#printf("%d input streams in file recursion stack. Current input stream is " . $input_stream . "\n", $#input_stream_stack+1);
+				next;
+			}
+		}
+		if (/<itemgra item_types="([^"]*)"/) {
+			$types=$1;
+			if (/order="([^"]*)"/) {
+				$order=$1;
+				print(STDERR "Order $order found in \"" . $current_filename . "\"\n");
+				foreach $type (split(",",$types)) {
+					$result->{$type}->{$layout}->{$order}=1;
+				}
 			}
 		}
 	}
+	close($input_stream);
+	$input_stream = pop(@input_stream_stack);
+	#print("Popped input stream " . $input_stream . "\n");
 }
-close(IN);
+print(STDERR "Finished parsing navit XML config\n");
+print(STDERR "Parsing item_def.h\n");
 open(IN,"../item_def.h");
 while (<IN>) {
 	if (/^ITEM2\([^,]*,(.*)\)/) {
@@ -32,13 +76,26 @@ while (<IN>) {
 	}
 }
 close(IN);
+print(STDERR "Parsing ../map/garmin/garmintypes.txt\n");
+open(IN,"../map/garmin/garmintypes.txt");
+while (<IN>) {
+	if (/^[0-9][^=]*=\s*([^,]*),.*$/) {
+		$type=$1;
+		print("Garmintype: " . $type . "\n");
+		$garmintypes->{$type}->{"none"}=1;
+	}
+}
+close(IN);
+
+print(STDERR "Outputting results\n");
 my $typefmt="%-30s";
 my $layoutfmt="%10s";
 printf($typefmt,"");
 foreach $layout (@layouts) {
 	printf($layoutfmt,$layout);
 }
-printf("\n");
+print("\n");
+# Check which map items defined in ../item_def.h are actually handled by each layout
 foreach $type (sort keys %$result) {
 	$marker="";
 	if (!$result->{$type}->{"none"}) {
@@ -55,3 +112,10 @@ foreach $type (sort keys %$result) {
 	}
 	printf("\n");
 }
+
+print("Analysis on ../map/garmin/garmintypes.txt:\n");
+foreach $type (sort keys %$garmintypes) {
+	if (!$result->{$type}->{"none"}) {
+		print($type . " exists in garmintypes.txt and missing in itemdef.h\n");
+	}
+}
\ No newline at end of file
diff --git a/navit/start_real.c b/navit/start_real.c
index c3f8b5622..b7a0db48c 100644
--- a/navit/start_real.c
+++ b/navit/start_real.c
@@ -191,7 +191,7 @@ int main_real(int argc, char * const* argv) {
         li = g_list_next(li);
     }
 
-    dbg(lvl_debug,"Loading %s",config_file);
+    dbg(lvl_debug,"Loading config from '%s'",config_file);
     if (!config_load(config_file, &error)) {
         dbg(lvl_error, _("Error parsing config file '%s': %s"), config_file, error ? error->message : "");
     } else {
@@ -209,6 +209,7 @@ int main_real(int argc, char * const* argv) {
         dbg(lvl_error, "%s", _("Internal initialization failed, exiting. Check previous error messages."));
         exit(5);
     }
+    main_update_default_layout(navit.u.navit);
     conf.type=attr_config;
     conf.u.config=config;
     if (startup_file) {
diff --git a/navit/support/gettext_intl/dcigettext.c b/navit/support/gettext_intl/dcigettext.c
index 9d4e3542e..1b66fba37 100644
--- a/navit/support/gettext_intl/dcigettext.c
+++ b/navit/support/gettext_intl/dcigettext.c
@@ -133,6 +133,11 @@ extern int errno;
 # define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
 #endif
 
+#if defined(__MINGW32__) && !defined(__MINGW32CE__)
+# define HAVE_MEMPCPY   1
+#endif
+
+
 /* @@ end of prolog @@ */
 
 #ifdef _LIBC
@@ -158,7 +163,7 @@ char *getcwd ();
 # ifndef HAVE_STPCPY
 static char *stpcpy (char *dest, const char *src);
 # endif
-# ifndef HAVE_MEMPCPY
+# if !defined(HAVE_MEMPCPY) 
 static void *mempcpy (void *dest, const void *src, size_t n);
 # endif
 #endif
diff --git a/navit/support/gettext_intl/localealias.c b/navit/support/gettext_intl/localealias.c
index ee27649af..9078994d4 100644
--- a/navit/support/gettext_intl/localealias.c
+++ b/navit/support/gettext_intl/localealias.c
@@ -88,6 +88,10 @@ char *alloca ();
 __libc_lock_define_initialized (static, lock);
 #endif
 
+#if defined(__MINGW32__) && !defined(__MINGW32CE__)
+# define HAVE_MEMPCPY   1
+#endif
+
 #ifndef internal_function
 # define internal_function
 #endif
diff --git a/navit/support/glib/gutils.c b/navit/support/glib/gutils.c
index 6d3fda447..9a9477f19 100644
--- a/navit/support/glib/gutils.c
+++ b/navit/support/glib/gutils.c
@@ -756,7 +756,6 @@ g_path_get_basename (const gchar   *file_name)
   return retval;
 }
 
-#if NOT_NEEDED_FOR_NAVIT
 /**
  * g_path_is_absolute:
  * @file_name: a file name.
@@ -785,6 +784,7 @@ g_path_is_absolute (const gchar *file_name)
   return FALSE;
 }
 
+#if NOT_NEEDED_FOR_NAVIT
 /**
  * g_path_skip_root:
  * @file_name: a file name.
@@ -851,6 +851,7 @@ g_path_skip_root (const gchar *file_name)
 
   return NULL;
 }
+#endif
 
 /**
  * g_path_get_dirname:
@@ -952,6 +953,7 @@ g_path_get_dirname (const gchar	   *file_name)
   return base;
 }
 
+#if NOT_NEEDED_FOR_NAVIT
 /**
  * g_get_current_dir:
  *
diff --git a/navit/vehicle/webos/bluetooth.c b/navit/vehicle/webos/bluetooth.c
index 9bb94364c..d51ec450b 100644
--- a/navit/vehicle/webos/bluetooth.c
+++ b/navit/vehicle/webos/bluetooth.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include <PDL.h>
-#include <SDL.h>
+#include "SDL.h"
 #include "debug.h"
 #include "callback.h"
 #include "event.h"
@@ -583,4 +583,3 @@ void vehicle_webos_bt_close(struct vehicle_priv *priv) {
     //		g_free(priv->nmea_data_buf);
     //		priv->nmea_data_buf = NULL;
 }
-
diff --git a/navit/vehicle/webos/vehicle_webos.c b/navit/vehicle/webos/vehicle_webos.c
index 04dc90ae2..c81b6342b 100644
--- a/navit/vehicle/webos/vehicle_webos.c
+++ b/navit/vehicle/webos/vehicle_webos.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include <PDL.h>
-#include <SDL.h>
+#include "SDL.h"
 #include "debug.h"
 #include "callback.h"
 #include "plugin.h"
@@ -366,4 +366,3 @@ void plugin_init(void) {
     dbg(lvl_debug, "enter");
     plugin_register_category_vehicle("webos", vehicle_webos_new);
 }
-
diff --git a/navit/xmlconfig.c b/navit/xmlconfig.c
index 451a308e2..476997c2d 100644
--- a/navit/xmlconfig.c
+++ b/navit/xmlconfig.c
@@ -705,6 +705,15 @@ static void end_element (xml_context *context,
 
 static gboolean parse_file(struct xmldocument *document, xmlerror **error);
 
+/**
+ * @brief Handle xi:include XML tags
+ *
+ * @param context The XML context in which we are parsing
+ * @param[in] attribute_names An array of strings containing all XML attributes of the xi:include tag
+ * @param[in] attribute_values An array of strings containing all XML values (one per entry in @p attribute_names)
+ * @param doc_old The current document being parsed (before moving to the one referenced in this xi:include
+ * @param[out] error A description of the error encountered if any
+ */
 static void xinclude(xml_context *context, const gchar **attribute_names, const gchar **attribute_values,
                      struct xmldocument *doc_old, xmlerror **error) {
     struct xmldocument doc_new;
@@ -712,11 +721,15 @@ static void xinclude(xml_context *context, const gchar **attribute_names, const
     int i,count;
     const char *href=NULL;
     char **we_files;
+    char *included_filename=NULL;
+    char *doc_base=NULL;
+    char *tmp=NULL;
 
     if (doc_old->level >= 16) {
         g_set_error(error,G_MARKUP_ERROR,G_MARKUP_ERROR_INVALID_CONTENT, "xi:include recursion too deep");
         return;
     }
+    dbg(lvl_debug, "At level %d, processing xi:include in document href=\"%s\"", doc_old->level, doc_old->href);
     memset(&doc_new, 0, sizeof(doc_new));
     i=0;
     while (attribute_names[i]) {
@@ -746,8 +759,8 @@ static void xinclude(xml_context *context, const gchar **attribute_names, const
     }
     doc_new.level=doc_old->level+1;
     doc_new.user_data=doc_old->user_data;
-    if (! href) {
-        dbg(lvl_debug,"no href, using '%s'", doc_old->href);
+    if (!href) {
+        dbg(lvl_debug,"no href%s, using own ref '%s'", doc_new.xpointer?" (but xpointer provided)":"", doc_old->href);
         doc_new.href=doc_old->href;
         if (file_exists(doc_new.href)) {
             parse_file(&doc_new, error);
@@ -757,23 +770,36 @@ static void xinclude(xml_context *context, const gchar **attribute_names, const
     } else {
         dbg(lvl_debug,"expanding '%s'", href);
         we=file_wordexp_new(href);
-        we_files=file_wordexp_get_array(we);
+        we_files=file_wordexp_get_array(we);	/* Expand wildcards (if any) into a list of files */
         count=file_wordexp_get_count(we);
         dbg(lvl_debug,"%d results", count);
-        if (file_exists(we_files[0])) {
-            for (i = 0 ; i < count ; i++) {
-                dbg(lvl_debug,"result[%d]='%s'", i, we_files[i]);
-                doc_new.href=we_files[i];
-                parse_file(&doc_new, error);
+        for (i = 0 ; i < count ; i++) {
+            included_filename = g_strdup(we_files[i]);
+            if (*included_filename != '\0') { /* Non empty href */
+                if (!g_path_is_absolute(included_filename)) {	/* The filename's path is relative */
+                    doc_base = g_path_get_dirname(doc_old->href);	/* Get our own absolute path */
+                    if (*doc_base && file_is_dir(doc_base)) {
+                        tmp = included_filename;
+                        included_filename = g_strconcat(doc_base, G_DIR_SEPARATOR_S, tmp, NULL);
+                        g_free(tmp); /* Free initial included_filename buffer (saved in tmp) */
+                    }
+                    g_free(doc_base);
+                    dbg(lvl_debug,"converted relative filename='%s' to absolute filename='%s'", we_files[i], included_filename);
+                }
+                dbg(lvl_debug,"result[%d]='%s'", i, included_filename);
+                if (file_exists(included_filename)) {
+                    doc_new.href=included_filename;
+                    parse_file(&doc_new, error);	/* Now run the parser on the included XML file */
+                } else {
+                    dbg(lvl_error,"Unable to include '%s'",included_filename);
+                }
             }
-        } else {
-            dbg(lvl_error,"Unable to include %s",we_files[0]);
+            g_free(included_filename);
         }
         file_wordexp_destroy(we);
-
     }
-
 }
+
 static int strncmp_len(const char *s1, int s1len, const char *s2) {
     int ret;
     ret=strncmp(s1, s2, s1len);
diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt
index 9ef181a88..412735273 100644
--- a/navit/xslt/android.xslt
+++ b/navit/xslt/android.xslt
@@ -68,7 +68,7 @@
          <xsl:apply-templates/>
       </xsl:copy>
    </xsl:template>
-   <xsl:template match="/config/navit/layout/layer/itemgra/child::*|/config/navit/layer/itemgra/child::*">
+   <xsl:template match="/config/navit/layout/layer/itemgra/child::*|/config/navit/layer/itemgra/child::*|layout/layer/itemgra/child::*">
       <xsl:copy>
          <xsl:copy-of select="@*[not(name()='text_size') and not(name()='width') and not(name()='radius') and not(name()='w') and not(name()='h') and not(name()='x') and not(name()='y') and not(name()='dash')]"/>
          <xsl:if test="@text_size">
@@ -110,7 +110,7 @@
 	 </xsl:if>
       </xsl:copy>
    </xsl:template>
-   <xsl:template match="/config/navit/layout">
+   <xsl:template match="/config/navit/layout|/layout">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:if test="@name='Car'">
diff --git a/navit/xslt/speech_win32.xslt b/navit/xslt/speech_win32.xslt
new file mode 100644
index 000000000..12459fbf7
--- /dev/null
+++ b/navit/xslt/speech_win32.xslt
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude">
+        <xsl:template match="/config/navit/speech">
+                <speech type="cmdline" data="PowerShell -Command &quot;Add-Type –AssemblyName System.Speech; (New-Object System.Speech.Synthesis.SpeechSynthesizer).Speak(%s);&quot;"/>
+        </xsl:template>
+</xsl:transform>
diff --git a/navit/xslt/windows.xslt b/navit/xslt/windows.xslt
index 989566c83..862d82ba5 100644
--- a/navit/xslt/windows.xslt
+++ b/navit/xslt/windows.xslt
@@ -3,7 +3,7 @@
         <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/>
         <xsl:include href="samplemap.xslt"/>
         <xsl:include href="osd_enable_zoom.xslt"/>
-        <xsl:include href="speech_espeak.xslt"/>
+        <xsl:include href="speech_win32.xslt"/>
         <xsl:template match="/config/navit/graphics">
                 <graphics type="win32" />
         </xsl:template>
diff --git a/navit/zipfile.h b/navit/zipfile.h
index 8002e48d9..9edccf2ef 100644
--- a/navit/zipfile.h
+++ b/navit/zipfile.h
@@ -167,10 +167,6 @@ struct zip64_eocl {
 	int zip74lnum;
 } ATTRIBUTE_PACKED;
 
-struct zip_alignment_check {
-	int x[sizeof(struct zip_cd) == 46 ? 1:-1];
-};
-
 #ifdef HAVE_PRAGMA_PACK
 #pragma pack(pop)
 #endif
diff --git a/po/af.po.in b/po/af.po.in
index f966374b3..fbfdf7413 100644
--- a/po/af.po.in
+++ b/po/af.po.in
@@ -1,5 +1,5 @@
 # Afrikaans translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2018 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
@@ -12,7 +12,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Michael von Glasow <Unknown>\n"
@@ -156,7 +156,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr ""
 
@@ -369,7 +368,6 @@ msgstr "dan het jy jou bestemming bereik."
 msgid "You have reached your destination %s"
 msgstr "Jy het jou bestemming bereik %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr ""
 
@@ -386,9 +384,15 @@ msgstr "Bevel"
 msgid "Length"
 msgstr "Lengte"
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr "kilometer"
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr "meter"
 
@@ -449,6 +453,7 @@ msgid "Anguilla"
 msgstr "Anguilla"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Albanië"
 
@@ -461,6 +466,7 @@ msgid "Netherlands Antilles"
 msgstr "Nederland Antille"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Angola"
 
@@ -469,6 +475,7 @@ msgid "Antarctica"
 msgstr "Antarktika"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Argentinië"
 
@@ -477,10 +484,12 @@ msgid "American Samoa"
 msgstr "Amerikaanse Samoa"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Oostenryk"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Australië"
 
@@ -493,10 +502,12 @@ msgid "Aland Islands"
 msgstr "Aland Eiland"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Azerbaidjan"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnië en Herzegowina"
 
@@ -509,6 +520,7 @@ msgid "Bangladesh"
 msgstr "Bangladesj"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "België"
 
@@ -517,6 +529,7 @@ msgid "Burkina Faso"
 msgstr "Boerkina Fasso"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "Bulgarye"
 
@@ -525,6 +538,7 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Boeroendi"
 
@@ -545,6 +559,7 @@ msgid "Brunei Darussalam"
 msgstr "Broenei"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Bolivië"
 
@@ -553,6 +568,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Brasilië"
 
@@ -569,10 +585,12 @@ msgid "Bouvet Island"
 msgstr "Bouveteiland"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Botswana"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Wit-Rusland"
 
@@ -581,6 +599,7 @@ msgid "Belize"
 msgstr "Belize"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Kanada"
 
@@ -589,6 +608,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Cocos- (Keeling) eilande"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "Kongo, Demokratiese Republiek van die"
 
@@ -601,10 +621,12 @@ msgid "Congo"
 msgstr "Kongo"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Switserland"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Ivoorkus"
 
@@ -613,6 +635,7 @@ msgid "Cook Islands"
 msgstr "Cookeilande"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Chili"
 
@@ -621,10 +644,12 @@ msgid "Cameroon"
 msgstr "Kameroen"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "Sjina"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Kolombië"
 
@@ -633,6 +658,7 @@ msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Kuba"
 
@@ -649,14 +675,17 @@ msgid "Christmas Island"
 msgstr "Kerseiland"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Siprus"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "Tjeggiese Republiek"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Duitsland"
 
@@ -665,6 +694,7 @@ msgid "Djibouti"
 msgstr "Djiboeti"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Denemarke"
 
@@ -673,6 +703,7 @@ msgid "Dominica"
 msgstr "Dominika"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "Dominikaanse Republiek"
 
@@ -681,10 +712,12 @@ msgid "Algeria"
 msgstr "Algerië"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Ecuador"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Esland"
 
@@ -701,14 +734,17 @@ msgid "Eritrea"
 msgstr "Eritrea"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "Spanje"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Etiopië"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Finland"
 
@@ -725,10 +761,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Mikronesia, Federale state van"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Faroëreilande"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "Frankryk"
 
@@ -737,6 +775,7 @@ msgid "Gabon"
 msgstr "Gaboen"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "Verenigde Koninkryk"
 
@@ -773,6 +812,7 @@ msgid "Gambia"
 msgstr "Gambië"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Guinië"
 
@@ -785,6 +825,7 @@ msgid "Equatorial Guinea"
 msgstr "Ekwatoriaal-Guinee"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Griekeland"
 
@@ -805,6 +846,7 @@ msgid "Guinea-Bissau"
 msgstr "Guinee-Bissau"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Guyana"
 
@@ -821,26 +863,32 @@ msgid "Honduras"
 msgstr "Honduras"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Kroasië"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Haïti"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Hongarye"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Indonesië"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Ierland"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Israel"
 
@@ -849,6 +897,7 @@ msgid "Isle of Man"
 msgstr "Man eiland"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "Indië"
 
@@ -857,18 +906,22 @@ msgid "British Indian Ocean Territory"
 msgstr "Brits Indiese oseaan gebiede"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Irak"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Iran"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Ysland"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Italië"
 
@@ -877,6 +930,7 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Jamaika"
 
@@ -885,14 +939,17 @@ msgid "Jordan"
 msgstr "Jordanië"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Japan"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Kenia"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
@@ -929,6 +986,7 @@ msgid "Cayman Islands"
 msgstr "Kaaimanseilande"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
@@ -953,26 +1011,32 @@ msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Liberië"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Lesotho"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Litoue"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Luxenburg"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Letland"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr ""
 
@@ -997,6 +1061,7 @@ msgid "Saint Martin (French part)"
 msgstr "St. Martin"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Madagaskar"
 
@@ -1017,6 +1082,7 @@ msgid "Myanmar"
 msgstr "Mianmar"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Mongolië"
 
@@ -1057,10 +1123,12 @@ msgid "Malawi"
 msgstr "Malawi"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "Meksiko"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Maleisië"
 
@@ -1069,10 +1137,12 @@ msgid "Mozambique"
 msgstr "Mosambiek"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Namibië"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "Nieu-Kaledonië"
 
@@ -1093,6 +1163,7 @@ msgid "Nicaragua"
 msgstr "Nikaragua"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Nederland"
 
@@ -1101,6 +1172,7 @@ msgid "Norway"
 msgstr "Noorweë"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Nepal"
 
@@ -1113,6 +1185,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "Nieu-Seeland"
 
@@ -1125,6 +1198,7 @@ msgid "Panama"
 msgstr "Panama"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Peru"
 
@@ -1137,14 +1211,17 @@ msgid "Papua New Guinea"
 msgstr "Papoea Nieu-Guinee"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Filippyne"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Pakistan"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Pole"
 
@@ -1165,6 +1242,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Palestynse Gebied, Besette"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Portugal"
 
@@ -1173,6 +1251,7 @@ msgid "Palau"
 msgstr "Palau"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Paraguaai"
 
@@ -1181,10 +1260,12 @@ msgid "Qatar"
 msgstr "Katar"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Réunion"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Roemenië"
 
@@ -1193,14 +1274,17 @@ msgid "Serbia"
 msgstr "Serwië"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Rusland"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Rwanda"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Saoedi-Arabië"
 
@@ -1221,6 +1305,7 @@ msgid "Sweden"
 msgstr "Swede"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Singapoer"
 
@@ -1237,6 +1322,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard en Jan Mayen"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Slowakye"
 
@@ -1257,6 +1343,7 @@ msgid "Somalia"
 msgstr "Somalië"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -1301,6 +1388,7 @@ msgid "Togo"
 msgstr "Togo"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Thailand"
 
@@ -1317,6 +1405,7 @@ msgid "Timor-Leste"
 msgstr "Oos-Timor"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
@@ -1329,6 +1418,7 @@ msgid "Tonga"
 msgstr "Tonga"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Turkye"
 
@@ -1345,14 +1435,17 @@ msgid "Taiwan, Province of China"
 msgstr "Taiwan"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Tanzanië"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Oekraïne"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Oeganda"
 
@@ -1365,6 +1458,7 @@ msgid "United States"
 msgstr "Vereenigde State"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -1381,6 +1475,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "St. Vincent en die Grenadine"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Venezuela"
 
@@ -1417,6 +1512,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "Suid-Afrika"
 
@@ -1444,23 +1540,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1601,6 +1697,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr "Koppel aan Pad"
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1670,7 +1769,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1678,15 +1782,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1695,9 +1799,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1710,7 +1811,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1757,8 +1858,8 @@ msgid "OT"
 msgstr "OT"
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Roete %4.0fkm %02d:%02d aankomstyd"
+msgid "Route %4.1f%s    %02d:%02d ETA"
+msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Roete 0000km  0+00:00 aankomstyd"
@@ -1980,6 +2081,9 @@ msgstr "Roete Beskrywing"
 msgid "Show Locale"
 msgstr "Toon Lokalisering"
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr "Voorige bestemmings"
 
@@ -2018,737 +2122,873 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
-msgstr ""
+msgid "Vehicle Position"
+msgstr "Voertuig posisie"
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
+msgid "Main menu"
+msgstr "Hoofkieslys"
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Wys\n"
+"Kaart"
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgid "Settings"
+msgstr "Instellings"
+
+msgid "Tools"
+msgstr "Gereedskap"
+
+msgid "Route"
+msgstr "Roete"
+
+msgid "About"
+msgstr "Rakende"
+
+msgid "Quit"
+msgstr "Verlaat"
+
+msgid "Actions"
+msgstr "Aksies"
 
 msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Coordinates"
 msgstr ""
 
 msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+"Stop\n"
+"Navigation"
 msgstr ""
+"Stop\n"
+"Navigasie"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
+msgid "Display"
+msgstr "Skerm"
 
-msgid "Cancel"
-msgstr ""
+msgid "Fullscreen"
+msgstr "Volskerm"
 
-msgid "filenamePath"
-msgstr ""
+msgid "Window Mode"
+msgstr "Venster Modus"
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Whole Planet"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "Africa"
+msgid "Layers"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Asia"
-msgstr ""
+msgid "Description"
+msgstr "Beskrywing"
 
-msgid "Korea"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "Taiwan"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "UAE+Other"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Oceania"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Tasmania"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Victoria"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "New South Wales"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Europe"
-msgstr ""
+msgid "horse"
+msgstr "perd"
 
-msgid "Western Europe"
+msgid "Truck"
 msgstr ""
 
-msgid "Azores"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "BeNeLux"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Alsace"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Aquitaine"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Auvergne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Voertuig posisie"
-
-msgid "Main menu"
-msgstr "Hoofkieslys"
-
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
 msgstr ""
-"Wys\n"
-"Kaart"
-
-msgid "Settings"
-msgstr "Instellings"
-
-msgid "Tools"
-msgstr "Gereedskap"
-
-msgid "Route"
-msgstr "Roete"
 
-msgid "About"
-msgstr "Rakende"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
+msgstr ""
 
-msgid "Quit"
-msgstr "Verlaat"
+#. Android resource: @strings/saarland
+msgid "Saarland"
+msgstr ""
 
-msgid "Actions"
-msgstr "Aksies"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
-"Stop\n"
-"Navigasie"
 
-msgid "Display"
-msgstr "Skerm"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
+msgstr ""
 
-msgid "Fullscreen"
-msgstr "Volskerm"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr ""
 
-msgid "Window Mode"
-msgstr "Venster Modus"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
+msgstr ""
 
-msgid "Layers"
+#. Android resource: @strings/england
+msgid "England"
 msgstr ""
 
-msgid "Description"
-msgstr "Beskrywing"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
-msgstr "perd"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
+msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""
 
 #, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Roete %4.0fkm %02d:%02d aankomstyd"
+
+#, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "verlaat dan die sirkel by die %1$s %2$s"
diff --git a/po/ar.po.in b/po/ar.po.in
index 3a8af7491..0fc2f2957 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -11,7 +11,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-02-05 13:00+0000\n"
 "Last-Translator: abed alkareem alnatsheh <Unknown>\n"
@@ -172,7 +172,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "على الطريق السريع المنحدر"
 
@@ -385,7 +384,6 @@ msgstr "و بعدها تكون قد وصلت إلى هدفك"
 msgid "You have reached your destination %s"
 msgstr "لقد وصلت إلى هدفك %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr ""
 
@@ -471,6 +469,7 @@ msgid "Anguilla"
 msgstr "أنغويلا"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "ألبانيا"
 
@@ -483,6 +482,7 @@ msgid "Netherlands Antilles"
 msgstr "الأنتيل الهولندية"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "أنغولا"
 
@@ -491,6 +491,7 @@ msgid "Antarctica"
 msgstr "أنتاركتيكا"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "الأرجنتين"
 
@@ -499,10 +500,12 @@ msgid "American Samoa"
 msgstr "ساموا الأميركية"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "النمسا"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "أستراليا"
 
@@ -515,10 +518,12 @@ msgid "Aland Islands"
 msgstr "جزر أولان"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "أذربيجان"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "البوسنة والهرسك"
 
@@ -531,6 +536,7 @@ msgid "Bangladesh"
 msgstr "بنغلادش"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "بلجيكا"
 
@@ -539,6 +545,7 @@ msgid "Burkina Faso"
 msgstr "بوركينا فاسو"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "بلغاريا"
 
@@ -547,6 +554,7 @@ msgid "Bahrain"
 msgstr "البحرين"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "بوروندي"
 
@@ -567,6 +575,7 @@ msgid "Brunei Darussalam"
 msgstr "بروناي دار السّلام"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "بوليفيا"
 
@@ -575,6 +584,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "البرازيل"
 
@@ -591,10 +601,12 @@ msgid "Bouvet Island"
 msgstr "جزيرة بوفيت"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "بوتسوانا"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "روسيا البيضاء \\ بيلاروس"
 
@@ -603,6 +615,7 @@ msgid "Belize"
 msgstr "بيليز"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "كندا"
 
@@ -611,6 +624,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "جزر الكوكوس (كيلنك)"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "جمهورية الكونغو الديمقراطيه"
 
@@ -623,10 +637,12 @@ msgid "Congo"
 msgstr "الكونغو"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "سويسرا"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "ساحل العاج"
 
@@ -635,6 +651,7 @@ msgid "Cook Islands"
 msgstr "جزر كوك"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "تشيلي"
 
@@ -643,10 +660,12 @@ msgid "Cameroon"
 msgstr "الكامرون"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "الصين"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "كولومبيا"
 
@@ -655,6 +674,7 @@ msgid "Costa Rica"
 msgstr "كوستاريكا"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "كوبا"
 
@@ -671,14 +691,17 @@ msgid "Christmas Island"
 msgstr "جزر الكريسماس"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "قبرص"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "جمهورية التشيك"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "ألمانيا"
 
@@ -687,6 +710,7 @@ msgid "Djibouti"
 msgstr "جيبوتي"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "الدنمارك"
 
@@ -695,6 +719,7 @@ msgid "Dominica"
 msgstr "الدّومينيكا"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "جمهورية الدومينيكان"
 
@@ -703,10 +728,12 @@ msgid "Algeria"
 msgstr "الجزائر"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "الإكوادور"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "أستونيا"
 
@@ -723,14 +750,17 @@ msgid "Eritrea"
 msgstr "أريتريا"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "إسبانيا"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "الحبشة"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "فنلندا"
 
@@ -747,10 +777,12 @@ msgid "Micronesia, Federated States of"
 msgstr "ميكرونيزيا، ولايات ميكرونيزيا الفدرالية"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "جزر الفارو"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "فرنسا"
 
@@ -759,6 +791,7 @@ msgid "Gabon"
 msgstr "الغابون"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "المملكة المتّحدة"
 
@@ -795,6 +828,7 @@ msgid "Gambia"
 msgstr "غامبيا"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "غينيا"
 
@@ -807,6 +841,7 @@ msgid "Equatorial Guinea"
 msgstr "غينيا الاستوائيه"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "اليونان"
 
@@ -827,6 +862,7 @@ msgid "Guinea-Bissau"
 msgstr "غينيا بيساو"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "غيانا"
 
@@ -843,26 +879,32 @@ msgid "Honduras"
 msgstr "الهوندوراس"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "كرواتيا"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "هايتي"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "المجر (هنغاريا)"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "إندونيسيا"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "إيرلندا"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "فلسطين المحتلة"
 
@@ -871,6 +913,7 @@ msgid "Isle of Man"
 msgstr "جزيرة مان"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "الهند"
 
@@ -879,18 +922,22 @@ msgid "British Indian Ocean Territory"
 msgstr "مقاطعة المحيط الهندي البريطانيّة"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "العراق"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "إيران، الجمهوريّة الإسلاميّة الإيرانيّة"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "آيسلندا"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "إيطاليا"
 
@@ -899,6 +946,7 @@ msgid "Jersey"
 msgstr "جيرسي"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "جامايكا"
 
@@ -907,14 +955,17 @@ msgid "Jordan"
 msgstr "الأردن"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "اليابان"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "كينيا"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "قرغيزستان"
 
@@ -951,6 +1002,7 @@ msgid "Cayman Islands"
 msgstr "جزر الكايمان"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "كازاخستان"
 
@@ -975,26 +1027,32 @@ msgid "Sri Lanka"
 msgstr "سريلانكا"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "ليبريا"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "ليسوتو"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "ليثوانيا"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "اللكسمبورغ"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "لاتفيا"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr "ليبيا"
 
@@ -1019,6 +1077,7 @@ msgid "Saint Martin (French part)"
 msgstr "سانت مارتين (القطاع الفرنسي)"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "مدغشقر"
 
@@ -1039,6 +1098,7 @@ msgid "Myanmar"
 msgstr "مينامار"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "منغوليا"
 
@@ -1079,10 +1139,12 @@ msgid "Malawi"
 msgstr "مالاوي"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "المكسيك"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "ماليزيا"
 
@@ -1091,10 +1153,12 @@ msgid "Mozambique"
 msgstr "الموزمبيق"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "ناميبيا"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "قلدونيا الجديدة"
 
@@ -1115,6 +1179,7 @@ msgid "Nicaragua"
 msgstr "نيكاراغوا"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "هولندا"
 
@@ -1123,6 +1188,7 @@ msgid "Norway"
 msgstr "النروج"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "نيبال"
 
@@ -1135,6 +1201,7 @@ msgid "Niue"
 msgstr "نيوي"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "نيوزيلاندا"
 
@@ -1147,6 +1214,7 @@ msgid "Panama"
 msgstr "باناما"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "البيرو"
 
@@ -1159,14 +1227,17 @@ msgid "Papua New Guinea"
 msgstr "بابوا غينيا الجديدة"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "الفلبّين"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "باكستان"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "بولونيا"
 
@@ -1187,6 +1258,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "فلسطين المحتلّة، الأراضي الفلسطينيّة المحتلّة"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "البرتغال"
 
@@ -1195,6 +1267,7 @@ msgid "Palau"
 msgstr "بالاو"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "الباراغواي"
 
@@ -1203,10 +1276,12 @@ msgid "Qatar"
 msgstr "قطر"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "ريونيون"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "رومانيا"
 
@@ -1215,14 +1290,17 @@ msgid "Serbia"
 msgstr "صربيا"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "الإتّحاد الروسي"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "رواندا"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "المملكة العربيّة السّعوديّة"
 
@@ -1243,6 +1321,7 @@ msgid "Sweden"
 msgstr "السّويد"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "سنغفورة"
 
@@ -1259,6 +1338,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "سفالبارد وجان مايان"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "سلوفاكيا"
 
@@ -1279,6 +1359,7 @@ msgid "Somalia"
 msgstr "الصّومال"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "سورينام"
 
@@ -1323,6 +1404,7 @@ msgid "Togo"
 msgstr "توغو"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "تايلندا"
 
@@ -1339,6 +1421,7 @@ msgid "Timor-Leste"
 msgstr "تيمور الشرقية"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "تركمانستان"
 
@@ -1351,6 +1434,7 @@ msgid "Tonga"
 msgstr "تونجا"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "تركيا"
 
@@ -1367,14 +1451,17 @@ msgid "Taiwan, Province of China"
 msgstr "تايوان، محافظة صينية"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "تنزانيا، جمهوريّة تنزانيا المتّحدة"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "أوكرانيا"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "اوغندا"
 
@@ -1387,6 +1474,7 @@ msgid "United States"
 msgstr "الولايات المتّحدة الأمريكية"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "الأوروغواي"
 
@@ -1403,6 +1491,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "سانت فنسنت والجرينادينز"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "فنزويلا"
 
@@ -1439,6 +1528,7 @@ msgid "Mayotte"
 msgstr "مايوت"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "جنوب إفريقيا"
 
@@ -1466,23 +1556,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1695,7 +1785,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1703,15 +1798,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1720,9 +1815,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1735,7 +1827,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -2046,9 +2138,6 @@ msgstr "إنتبه ! آلة تصوير"
 msgid "Please decrease your speed"
 msgstr "ألرجاء خفض سرعتك"
 
-msgid "filenamePath"
-msgstr ""
-
 msgid "Vehicle Position"
 msgstr "موقع وسيلة التنقل"
 
@@ -2120,12 +2209,12 @@ msgid "Description"
 msgstr "الوصف"
 
 msgid ""
-"Drop last \n"
+"Drop last\n"
 "Waypoint"
 msgstr ""
 
 msgid ""
-"Drop next \n"
+"Drop next\n"
 "Waypoint"
 msgstr ""
 
@@ -2155,6 +2244,10 @@ msgstr ""
 msgid "Yes"
 msgstr "نعم"
 
+#. Android resource: @strings/cancel
+msgid "Cancel"
+msgstr "إلغاء"
+
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
 msgstr "نافيت بدء التشغيل"
@@ -2251,6 +2344,12 @@ msgstr "تم إجهاض عملية تنزيل الخريطة"
 msgid "Not enough free space"
 msgstr "لا يوجد مجال فارغ كافي"
 
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+
 #. Android resource: @strings/map_no_fix
 msgid "No location. Reopen after location fix."
 msgstr ""
@@ -2259,6 +2358,34 @@ msgstr ""
 msgid "Maps containing current location"
 msgstr "الخرائط المحتوية على الموقع الحالي"
 
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
+msgstr ""
+
+#. Android resource: @strings/map_downloading
+msgid "downloading"
+msgstr "يُنزّل"
+
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
+msgstr ""
+
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
+msgstr "خطأ عند كتابة الخريطة!"
+
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
+msgstr ""
+
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
+msgstr ""
+
 #. Android resource: @strings/address_search_title
 msgid "Address search"
 msgstr "البحث عن عنوان"
@@ -2390,342 +2517,508 @@ msgstr ""
 msgid "One or more ungranted permissions"
 msgstr ""
 
-#, c-format
-#~ msgid "Route %4.0fkm    %02d:%02d ETA"
-#~ msgstr "Route %4.0fكلم    %02d:%02d ETA"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
+msgstr "كامل القرة الأرضية"
 
-#~ msgid "Downloaded maps"
-#~ msgstr "الخرائط المنزلة"
+#. Android resource: @strings/africa
+msgid "Africa"
+msgstr "إفريقيا"
 
-#~ msgid "partial match"
-#~ msgstr "تطابق جزئي"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
+msgstr "جزر الكناري"
+
+#. Android resource: @strings/asia
+msgid "Asia"
+msgstr "آسيا"
+
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
+msgstr "تايوان"
+
+#. Android resource: @strings/korea
+msgid "Korea"
+msgstr "كوريا"
+
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
+msgstr "الإمارت العرية المتحدة و أخرى"
+
+#. Android resource: @strings/oceania
+msgid "Oceania"
+msgstr "أوقيانيا"
+
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
+msgstr "تسمانيا"
+
+#. Android resource: @strings/victoria
+msgid "Victoria"
+msgstr "فيكتوريا"
+
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
+msgstr "نيو ساوث ويلز"
+
+#. Android resource: @strings/europe
+msgid "Europe"
+msgstr "أوروبا"
+
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
+msgstr "أوروبا الغربية"
+
+#. Android resource: @strings/azores
+msgid "Azores"
+msgstr "جزر الأزور"
 
-#~ msgid "Taiwan"
-#~ msgstr "تايوان"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
+msgstr "بلجيكا هولاندة اللكسمبرغ"
 
-#~ msgid "Asia"
-#~ msgstr "آسيا"
+#. Android resource: @strings/alsace
+msgid "Alsace"
+msgstr "الألزاس"
 
-#~ msgid "Canary Islands"
-#~ msgstr "جزر الكناري"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
+msgstr ""
 
-#~ msgid "Africa"
-#~ msgstr "إفريقيا"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
+msgstr ""
 
-#~ msgid "Korea"
-#~ msgstr "كوريا"
+#. Android resource: @strings/centre
+msgid "Centre"
+msgstr "الوسط"
 
-#~ msgid "BeNeLux"
-#~ msgstr "بلجيكا هولاندة اللكسمبرغ"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
+msgstr ""
 
-#~ msgid "Alsace"
-#~ msgstr "الألزاس"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
+msgstr ""
 
-#~ msgid "Tasmania"
-#~ msgstr "تسمانيا"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
+msgstr ""
 
-#~ msgid "Victoria"
-#~ msgstr "فيكتوريا"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
+msgstr ""
 
-#~ msgid "UAE+Other"
-#~ msgstr "الإمارت العرية المتحدة و أخرى"
+#. Android resource: @strings/corse
+msgid "Corse"
+msgstr "كورسيكا"
 
-#~ msgid "Oceania"
-#~ msgstr "أوقيانيا"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
+msgstr ""
 
-#~ msgid "Western Europe"
-#~ msgstr "أوروبا الغربية"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
+msgstr ""
 
-#~ msgid "New South Wales"
-#~ msgstr "نيو ساوث ويلز"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
+msgstr "عاصمة فرنسا و ضواحيها"
 
-#~ msgid "Europe"
-#~ msgstr "أوروبا"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
+msgstr ""
 
-#~ msgid "Corse"
-#~ msgstr "كورسيكا"
+#. Android resource: @strings/limousin
+msgid "Limousin"
+msgstr ""
 
-#~ msgid "Ile-de-France"
-#~ msgstr "عاصمة فرنسا و ضواحيها"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
+msgstr ""
 
-#~ msgid "Bayern"
-#~ msgstr "بافاريا"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
+msgstr ""
 
-#~ msgid "Oberbayern"
-#~ msgstr "بافاريا العليا"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
+msgstr ""
 
-#~ msgid "Niederbayern"
-#~ msgstr "بافاريا السفلى"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
+msgstr ""
 
-#~ msgid "Bremen"
-#~ msgstr "بريمن"
+#. Android resource: @strings/picardie
+msgid "Picardie"
+msgstr "بيكاردي"
 
-#~ msgid "Hamburg"
-#~ msgstr "هامبرغ"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
+msgstr "بواتو شارانت"
 
-#~ msgid "Berlin"
-#~ msgstr "برلين"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr ""
 
-#~ msgid "Sachsen"
-#~ msgstr "ساكسونيا"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
+msgstr "رون-جبال الألب"
 
-#~ msgid "England"
-#~ msgstr "بريطانيا"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
+msgstr "بادن فورتمبيرغ"
 
-#~ msgid "Scandinavia"
-#~ msgstr "سكندينافيا"
+#. Android resource: @strings/bayern
+msgid "Bayern"
+msgstr "بافاريا"
 
-#~ msgid "Oxfordshire"
-#~ msgstr "أوكسفوردشاير"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
+msgstr "فرانكن الوسطى"
 
-#~ msgid "Norfolk"
-#~ msgstr "نورفولك"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
+msgstr "بافاريا السفلى"
 
-#~ msgid "Crete"
-#~ msgstr "كريتا"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
+msgstr "بافاريا العليا"
 
-#~ msgid "North America"
-#~ msgstr "أمريكا الشمالية"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
+msgstr "فرانكن العليا"
 
-#~ msgid "South yorkshire"
-#~ msgstr "يوركشاير الجنوبية"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
+msgstr "بفالز العليا"
 
-#~ msgid "Suffolk"
-#~ msgstr "سوفولك"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
+msgstr "شفابن"
 
-#~ msgid "Shropshire"
-#~ msgstr "شروبشاير"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
+msgstr "فرانكن السفلى"
 
-#~ msgid "Somerset"
-#~ msgstr "سومرست"
+#. Android resource: @strings/berlin
+msgid "Berlin"
+msgstr "برلين"
 
-#~ msgid "Ohio"
-#~ msgstr "أوهايو"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
+msgstr "براندنبورغ"
 
-#~ msgid " (except Alaska and Hawaii)"
-#~ msgstr " (بدون ألاسكا و هاواي)"
+#. Android resource: @strings/bremen
+msgid "Bremen"
+msgstr "بريمن"
 
-#~ msgid "USA"
-#~ msgstr "الوﻻيات المتحدة الامريكية"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
+msgstr "هامبرغ"
 
-#~ msgid "Hawaii"
-#~ msgstr "هاواي"
+#. Android resource: @strings/hessen
+msgid "Hessen"
+msgstr "هسن"
 
-#~ msgid "Alaska"
-#~ msgstr "ألاسكا"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
+msgstr "مكليمبورغ-فوربومرن"
 
-#~ msgid "Northeast"
-#~ msgstr "الشمال الشرقي"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
+msgstr "نيدرزاكسن"
 
-#~ msgid "Michigan"
-#~ msgstr "ميشيغان"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
+msgstr "نوردراين-فيستفالن"
 
-#~ msgid "Midwest"
-#~ msgstr "وسط الغرب"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
+msgstr "راينلاند-بفالز"
 
-#~ msgid "Vermont"
-#~ msgstr "فيرمونت"
+#. Android resource: @strings/saarland
+msgid "Saarland"
+msgstr "زارلاند"
 
-#~ msgid "Massachusetts"
-#~ msgstr "ماساتشوستس"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr "زاكسن-أنهلت"
 
-#~ msgid "Pacific"
-#~ msgstr "المحيط الهادئ"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
+msgstr "ساكسونيا"
 
-#~ msgid "South"
-#~ msgstr "الجنوب"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
+msgstr "شليسفيغ - هولشتاين"
 
-#~ msgid "Arkansas"
-#~ msgstr "أركنساس"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
+msgstr "تورينغن"
 
-#~ msgid "District of Columbia"
-#~ msgstr "مقاطعة كولومبيا"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
+msgstr "مايوركا"
 
-#~ msgid "Florida"
-#~ msgstr "فلوريدا"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr "غاليسيا"
 
-#~ msgid "Maryland"
-#~ msgstr "ميريلاند"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
+msgstr "سكندينافيا"
 
-#~ msgid "Oklahoma"
-#~ msgstr "أوكلاهوما"
+#. Android resource: @strings/england
+msgid "England"
+msgstr "بريطانيا"
 
-#~ msgid "Louisiana"
-#~ msgstr "لويزيانا"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr "باكينجهامشير"
 
-#~ msgid "Mississippi"
-#~ msgstr "ميسيسيبي"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
+msgstr "كامبريدجشاير"
 
-#~ msgid "Texas"
-#~ msgstr "تكساس"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
+msgstr "كمبريا"
 
-#~ msgid "Nevada"
-#~ msgstr "نيفادا"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
+msgstr ""
 
-#~ msgid "New Mexico"
-#~ msgstr "نيو مكسيكو"
+#. Android resource: @strings/essex
+msgid "Essex"
+msgstr ""
 
-#~ msgid "West Virginia"
-#~ msgstr "غرب فيرجينيا"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
+msgstr "هيريفوردشاير"
 
-#~ msgid "Virginia"
-#~ msgstr "فرجينيا"
+#. Android resource: @strings/kent
+msgid "Kent"
+msgstr "كنت"
 
-#~ msgid "Arizona"
-#~ msgstr "أريزونا"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
+msgstr "لانكشاير"
 
-#~ msgid "West"
-#~ msgstr "الغرب"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
+msgstr "لايسسترشاير"
 
-#~ msgid "California"
-#~ msgstr "كاليفورنيا"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
+msgstr "نورفولك"
 
-#~ msgid "Montana"
-#~ msgstr "مونتانا"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
+msgstr "نوتينغمشاير"
 
-#~ msgid "Idaho"
-#~ msgstr "إداهو"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
+msgstr "أوكسفوردشاير"
 
-#~ msgid "Colorado"
-#~ msgstr "كولورادو"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
+msgstr "شروبشاير"
 
-#~ msgid "Error downloading map!"
-#~ msgstr "خطأ أثناء تنزيل الخريطة!"
+#. Android resource: @strings/somerset
+msgid "Somerset"
+msgstr "سومرست"
 
-#~ msgid "downloading"
-#~ msgstr "يُنزّل"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
+msgstr "يوركشاير الجنوبية"
 
-#~ msgid "Washington State"
-#~ msgstr "ولاية واشنطن"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
+msgstr "سوفولك"
 
-#~ msgid "South+Middle America"
-#~ msgstr "جنوب و وسط امريكا"
+#. Android resource: @strings/surrey
+msgid "Surrey"
+msgstr "سورّي"
 
-#~ msgid "Oregon"
-#~ msgstr "أوريغون"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
+msgstr "ويلتشايرر"
 
-#~ msgid "Utah"
-#~ msgstr "يوتاه"
+#. Android resource: @strings/scotland
+msgid "Scotland"
+msgstr "أسكتلندا"
 
-#~ msgid "Error writing map!"
-#~ msgstr "خطأ عند كتابة الخريطة!"
+#. Android resource: @strings/wales
+msgid "Wales"
+msgstr "ويلز"
 
-#~ msgid "Map download aborted!"
-#~ msgstr "تم إجهاض عملية التنزيل للخريطة !"
+#. Android resource: @strings/crete
+msgid "Crete"
+msgstr "كريتا"
+
+#. Android resource: @strings/north_america
+msgid "North America"
+msgstr "أمريكا الشمالية"
+
+#. Android resource: @strings/alaska
+msgid "Alaska"
+msgstr "ألاسكا"
+
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
+msgstr "هاواي"
 
-#~ msgid "Whole Planet"
-#~ msgstr "كامل القرة الأرضية"
+#. Android resource: @strings/usa
+msgid "USA"
+msgstr "الوﻻيات المتحدة الامريكية"
 
-#~ msgid "Azores"
-#~ msgstr "جزر الأزور"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
+msgstr ""
+
+#. Android resource: @strings/midwest
+msgid "Midwest"
+msgstr "وسط الغرب"
 
-#~ msgid "Cancel"
-#~ msgstr "إلغاء"
+#. Android resource: @strings/michigan
+msgid "Michigan"
+msgstr "ميشيغان"
 
-#~ msgid "Centre"
-#~ msgstr "الوسط"
+#. Android resource: @strings/ohio
+msgid "Ohio"
+msgstr "أوهايو"
 
-#~ msgid "Mittelfranken"
-#~ msgstr "فرانكن الوسطى"
+#. Android resource: @strings/northeast
+msgid "Northeast"
+msgstr "الشمال الشرقي"
 
-#~ msgid "Baden-Wuerttemberg"
-#~ msgstr "بادن فورتمبيرغ"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
+msgstr "ماساتشوستس"
 
-#~ msgid "Rhone-Alpes"
-#~ msgstr "رون-جبال الألب"
+#. Android resource: @strings/vermont
+msgid "Vermont"
+msgstr "فيرمونت"
 
-#~ msgid "Oberpfalz"
-#~ msgstr "بفالز العليا"
+#. Android resource: @strings/pacific
+msgid "Pacific"
+msgstr "المحيط الهادئ"
 
-#~ msgid "Oberfranken"
-#~ msgstr "فرانكن العليا"
+#. Android resource: @strings/south
+msgid "South"
+msgstr "الجنوب"
 
-#~ msgid "Picardie"
-#~ msgstr "بيكاردي"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
+msgstr "أركنساس"
 
-#~ msgid "Poitou-Charentes"
-#~ msgstr "بواتو شارانت"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
+msgstr "مقاطعة كولومبيا"
 
-#~ msgid "Unterfranken"
-#~ msgstr "فرانكن السفلى"
+#. Android resource: @strings/florida
+msgid "Florida"
+msgstr "فلوريدا"
 
-#~ msgid "Schwaben"
-#~ msgstr "شفابن"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
+msgstr "لويزيانا"
 
-#~ msgid "Niedersachsen"
-#~ msgstr "نيدرزاكسن"
+#. Android resource: @strings/maryland
+msgid "Maryland"
+msgstr "ميريلاند"
 
-#~ msgid "Nordrhein-westfalen"
-#~ msgstr "نوردراين-فيستفالن"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
+msgstr "ميسيسيبي"
 
-#~ msgid "Hessen"
-#~ msgstr "هسن"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
+msgstr "أوكلاهوما"
 
-#~ msgid "Mecklenburg-Vorpommern"
-#~ msgstr "مكليمبورغ-فوربومرن"
+#. Android resource: @strings/texas
+msgid "Texas"
+msgstr "تكساس"
 
-#~ msgid "Brandenburg"
-#~ msgstr "براندنبورغ"
+#. Android resource: @strings/virginia
+msgid "Virginia"
+msgstr "فرجينيا"
 
-#~ msgid "Rheinland-Pfalz"
-#~ msgstr "راينلاند-بفالز"
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
+msgstr "غرب فيرجينيا"
 
-#~ msgid "Saarland"
-#~ msgstr "زارلاند"
+#. Android resource: @strings/west
+msgid "West"
+msgstr "الغرب"
 
-#~ msgid "Sachsen-Anhalt"
-#~ msgstr "زاكسن-أنهلت"
+#. Android resource: @strings/arizona
+msgid "Arizona"
+msgstr "أريزونا"
 
-#~ msgid "Cumbria"
-#~ msgstr "كمبريا"
+#. Android resource: @strings/california
+msgid "California"
+msgstr "كاليفورنيا"
 
-#~ msgid "Herefordshire"
-#~ msgstr "هيريفوردشاير"
+#. Android resource: @strings/colorado
+msgid "Colorado"
+msgstr "كولورادو"
 
-#~ msgid "Thueringen"
-#~ msgstr "تورينغن"
+#. Android resource: @strings/idaho
+msgid "Idaho"
+msgstr "إداهو"
 
-#~ msgid "Schleswig-Holstein"
-#~ msgstr "شليسفيغ - هولشتاين"
+#. Android resource: @strings/montana
+msgid "Montana"
+msgstr "مونتانا"
 
-#~ msgid "Galicia"
-#~ msgstr "غاليسيا"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
+msgstr "نيو مكسيكو"
 
-#~ msgid "Mallorca"
-#~ msgstr "مايوركا"
+#. Android resource: @strings/nevada
+msgid "Nevada"
+msgstr "نيفادا"
 
-#~ msgid "Cambridgeshire"
-#~ msgstr "كامبريدجشاير"
+#. Android resource: @strings/oregon
+msgid "Oregon"
+msgstr "أوريغون"
 
-#~ msgid "Buckinghamshire"
-#~ msgstr "باكينجهامشير"
+#. Android resource: @strings/utah
+msgid "Utah"
+msgstr "يوتاه"
 
-#~ msgid "Guyane Francaise"
-#~ msgstr "غويانا الفرنسية"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
+msgstr "ولاية واشنطن"
 
-#~ msgid "Nottinghamshire"
-#~ msgstr "نوتينغمشاير"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
+msgstr "جنوب و وسط امريكا"
 
-#~ msgid "Lancashire"
-#~ msgstr "لانكشاير"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
+msgstr "غويانا الفرنسية"
 
-#~ msgid "Kent"
-#~ msgstr "كنت"
+#, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Route %4.0fكلم    %02d:%02d ETA"
 
-#~ msgid "Leicestershire"
-#~ msgstr "لايسسترشاير"
+#~ msgid "Downloaded maps"
+#~ msgstr "الخرائط المنزلة"
 
-#~ msgid "Scotland"
-#~ msgstr "أسكتلندا"
+#~ msgid "partial match"
+#~ msgstr "تطابق جزئي"
 
-#~ msgid "Wales"
-#~ msgstr "ويلز"
+#~ msgid " (except Alaska and Hawaii)"
+#~ msgstr " (بدون ألاسكا و هاواي)"
 
-#~ msgid "Surrey"
-#~ msgstr "سورّي"
+#~ msgid "Error downloading map!"
+#~ msgstr "خطأ أثناء تنزيل الخريطة!"
 
-#~ msgid "Wiltshire"
-#~ msgstr "ويلتشايرر"
+#~ msgid "Map download aborted!"
+#~ msgstr "تم إجهاض عملية التنزيل للخريطة !"
 
 #, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
diff --git a/po/ast.po.in b/po/ast.po.in
index 57704bb4b..30c8fbcc1 100644
--- a/po/ast.po.in
+++ b/po/ast.po.in
@@ -1,12 +1,12 @@
 # Asturian translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2018 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
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
@@ -150,7 +150,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "pal enllaz"
 
@@ -363,7 +362,6 @@ msgstr "entós llegará al destín."
 msgid "You have reached your destination %s"
 msgstr "Llegó al destín %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr ""
 
@@ -380,9 +378,15 @@ msgstr "Comandu"
 msgid "Length"
 msgstr "Llonxitú"
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr "km"
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr "m"
 
@@ -443,6 +447,7 @@ msgid "Anguilla"
 msgstr "Anguila"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Albania"
 
@@ -455,6 +460,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilles Holandeses"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Angola"
 
@@ -463,6 +469,7 @@ msgid "Antarctica"
 msgstr "Antártida"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Argentina"
 
@@ -471,10 +478,12 @@ msgid "American Samoa"
 msgstr "Samoa Americana"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Austria"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Australia"
 
@@ -487,10 +496,12 @@ msgid "Aland Islands"
 msgstr "Islles Aland"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia Herzegovina"
 
@@ -503,6 +514,7 @@ msgid "Bangladesh"
 msgstr "Bangladesh"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "Bélgica"
 
@@ -511,6 +523,7 @@ msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
@@ -519,6 +532,7 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Burundi"
 
@@ -539,6 +553,7 @@ msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Bolivia"
 
@@ -547,6 +562,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Brasil"
 
@@ -563,10 +579,12 @@ msgid "Bouvet Island"
 msgstr "Islla Bouvet"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Botswana"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Bielorrusia"
 
@@ -575,6 +593,7 @@ msgid "Belize"
 msgstr "Belice"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Canadá"
 
@@ -583,6 +602,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Islles Cocos (Keeling)"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "Congo, República Democrática del"
 
@@ -595,10 +615,12 @@ msgid "Congo"
 msgstr "Congo"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Suiza"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
@@ -607,6 +629,7 @@ msgid "Cook Islands"
 msgstr "Islles Cook"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Chile"
 
@@ -615,10 +638,12 @@ msgid "Cameroon"
 msgstr "Camerún"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "China"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Colombia"
 
@@ -627,6 +652,7 @@ msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Cuba"
 
@@ -643,14 +669,17 @@ msgid "Christmas Island"
 msgstr "Islla Christmas"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Chipre"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "República Checa"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Alemania"
 
@@ -659,6 +688,7 @@ msgid "Djibouti"
 msgstr "Djibouti"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Dinamarca"
 
@@ -667,6 +697,7 @@ msgid "Dominica"
 msgstr "Dominica"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
@@ -675,10 +706,12 @@ msgid "Algeria"
 msgstr "Argelia"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Ecuador"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Estonia"
 
@@ -695,14 +728,17 @@ msgid "Eritrea"
 msgstr "Eritrea"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "España"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Etiopía"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Finlandia"
 
@@ -719,10 +755,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Micronesia, Estaos Federaos de"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Islles Feroe"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "Francia"
 
@@ -731,6 +769,7 @@ msgid "Gabon"
 msgstr "Gabón"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "Reinu Xuníu"
 
@@ -767,6 +806,7 @@ msgid "Gambia"
 msgstr "Gambia"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Guinea"
 
@@ -779,6 +819,7 @@ msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Grecia"
 
@@ -799,6 +840,7 @@ msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Guyana"
 
@@ -815,26 +857,32 @@ msgid "Honduras"
 msgstr "Honduras"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Croacia"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Haití"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Hungría"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Indonesia"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Irlanda"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Israel"
 
@@ -843,6 +891,7 @@ msgid "Isle of Man"
 msgstr "Islla de Man"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "India"
 
@@ -851,18 +900,22 @@ msgid "British Indian Ocean Territory"
 msgstr "Territoriu Oceánicu de la India Británica"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Iraq"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Irán, República Islámica de"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Islandia"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Italia"
 
@@ -871,6 +924,7 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Jamaica"
 
@@ -879,14 +933,17 @@ msgid "Jordan"
 msgstr "Xordania"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Xapón"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Kenia"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Kirguistán"
 
@@ -923,6 +980,7 @@ msgid "Cayman Islands"
 msgstr "Islles Caimán"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Kazakhstán"
 
@@ -947,26 +1005,32 @@ msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Liberia"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Lesotho"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Lituania"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Letonia"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr ""
 
@@ -991,6 +1055,7 @@ msgid "Saint Martin (French part)"
 msgstr "Saint Martin (Parte Francesa)"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Madagascar"
 
@@ -1011,6 +1076,7 @@ msgid "Myanmar"
 msgstr "Myanmar"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Mongolia"
 
@@ -1051,10 +1117,12 @@ msgid "Malawi"
 msgstr "Malawi"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "México"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Malasia"
 
@@ -1063,10 +1131,12 @@ msgid "Mozambique"
 msgstr "Mozambique"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Namibia"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "Nueva Caledonia"
 
@@ -1087,6 +1157,7 @@ msgid "Nicaragua"
 msgstr "Nicaragua"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Holanda"
 
@@ -1095,6 +1166,7 @@ msgid "Norway"
 msgstr "Noruega"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Nepal"
 
@@ -1107,6 +1179,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "Nueva Zelanda"
 
@@ -1119,6 +1192,7 @@ msgid "Panama"
 msgstr "Panamá"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Perú"
 
@@ -1131,14 +1205,17 @@ msgid "Papua New Guinea"
 msgstr "Papúa Nueva Guinea"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Filipines"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Paquistán"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Polonia"
 
@@ -1159,6 +1236,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Palestina, Territoriu Ocupáu"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Portugal"
 
@@ -1167,6 +1245,7 @@ msgid "Palau"
 msgstr "Palau"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Paraguay"
 
@@ -1175,10 +1254,12 @@ msgid "Qatar"
 msgstr "Qatar"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Reunión"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Rumanía"
 
@@ -1187,14 +1268,17 @@ msgid "Serbia"
 msgstr "Serbia"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Federación Rusa"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Ruanda"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
@@ -1215,6 +1299,7 @@ msgid "Sweden"
 msgstr "Suecia"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Singapur"
 
@@ -1231,6 +1316,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard y Jan Mayen"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
@@ -1251,6 +1337,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -1295,6 +1382,7 @@ msgid "Togo"
 msgstr "Togo"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Tailandia"
 
@@ -1311,6 +1399,7 @@ msgid "Timor-Leste"
 msgstr "Timor Oriental"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
@@ -1323,6 +1412,7 @@ msgid "Tonga"
 msgstr "Tonga"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Turquía"
 
@@ -1339,14 +1429,17 @@ msgid "Taiwan, Province of China"
 msgstr "Taiwan, Provincia de China"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Tanzania, República Xunía de"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Ucrania"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Uganda"
 
@@ -1359,6 +1452,7 @@ msgid "United States"
 msgstr "Estaos Xuníos"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -1375,6 +1469,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "San Vicente y les Granadines"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Venezuela"
 
@@ -1411,6 +1506,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "Sudáfrica"
 
@@ -1438,23 +1534,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1595,6 +1691,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr "Arcoxar carretera"
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1664,7 +1763,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1672,15 +1776,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1689,9 +1793,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1704,7 +1805,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1751,8 +1852,8 @@ msgid "OT"
 msgstr "OT"
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Ruta %4.0fkm    %02d:%02d TED"
+msgid "Route %4.1f%s    %02d:%02d ETA"
+msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Ruta 0000km  0+00:00 TED"
@@ -1974,6 +2075,9 @@ msgstr "Descripción de ruta"
 msgid "Show Locale"
 msgstr "Amosar local"
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr "Destinos anteriores"
 
@@ -2012,737 +2116,873 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
-msgstr ""
+msgid "Vehicle Position"
+msgstr "Posición del vehículu"
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
+msgid "Main menu"
+msgstr "Menú principal"
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Ver\n"
+"Mapa"
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgid "Settings"
+msgstr "Axustes"
+
+msgid "Tools"
+msgstr "Ferramientes"
+
+msgid "Route"
+msgstr "Ruta"
+
+msgid "About"
+msgstr "Tocante a"
+
+msgid "Quit"
+msgstr "Colar"
+
+msgid "Actions"
+msgstr "Aiciones"
 
 msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Coordinates"
 msgstr ""
 
 msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+"Stop\n"
+"Navigation"
 msgstr ""
+"Parar\n"
+"Navegación"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
+msgid "Display"
+msgstr "Amosar"
 
-msgid "Cancel"
-msgstr ""
+msgid "Fullscreen"
+msgstr "Pantalla completa"
 
-msgid "filenamePath"
-msgstr ""
+msgid "Window Mode"
+msgstr "Mou ventana"
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Whole Planet"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "Africa"
+msgid "Layers"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Asia"
-msgstr ""
+msgid "Description"
+msgstr "Descripción"
 
-msgid "Korea"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "Taiwan"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "UAE+Other"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Oceania"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Tasmania"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Victoria"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "New South Wales"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Europe"
-msgstr ""
+msgid "horse"
+msgstr "caballu"
 
-msgid "Western Europe"
+msgid "Truck"
 msgstr ""
 
-msgid "Azores"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "BeNeLux"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Alsace"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Aquitaine"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Auvergne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Posición del vehículu"
-
-msgid "Main menu"
-msgstr "Menú principal"
-
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
 msgstr ""
-"Ver\n"
-"Mapa"
-
-msgid "Settings"
-msgstr "Axustes"
-
-msgid "Tools"
-msgstr "Ferramientes"
-
-msgid "Route"
-msgstr "Ruta"
 
-msgid "About"
-msgstr "Tocante a"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
+msgstr ""
 
-msgid "Quit"
-msgstr "Colar"
+#. Android resource: @strings/saarland
+msgid "Saarland"
+msgstr ""
 
-msgid "Actions"
-msgstr "Aiciones"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
-"Parar\n"
-"Navegación"
 
-msgid "Display"
-msgstr "Amosar"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
+msgstr ""
 
-msgid "Fullscreen"
-msgstr "Pantalla completa"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr ""
 
-msgid "Window Mode"
-msgstr "Mou ventana"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
+msgstr ""
 
-msgid "Layers"
+#. Android resource: @strings/england
+msgid "England"
 msgstr ""
 
-msgid "Description"
-msgstr "Descripción"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
-msgstr "caballu"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
+msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""
 
 #, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Ruta %4.0fkm    %02d:%02d TED"
+
+#, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "llueu dexe la rotonda pola %1$s %2$s"
diff --git a/po/be.po.in b/po/be.po.in
index d8b680519..43365f0a2 100644
--- a/po/be.po.in
+++ b/po/be.po.in
@@ -1,5 +1,5 @@
 # Belarusian translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2018 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
@@ -8,7 +8,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Michael von Glasow <Unknown>\n"
@@ -153,7 +153,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr ""
 
@@ -366,7 +365,6 @@ msgstr ""
 msgid "You have reached your destination %s"
 msgstr ""
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr ""
 
@@ -383,9 +381,15 @@ msgstr ""
 msgid "Length"
 msgstr "Працягласць"
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr "км"
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr "м"
 
@@ -446,6 +450,7 @@ msgid "Anguilla"
 msgstr "Ангілья"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Албанія"
 
@@ -458,6 +463,7 @@ msgid "Netherlands Antilles"
 msgstr "Нідэрландскія Антыльскія астравы"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Ангола"
 
@@ -466,6 +472,7 @@ msgid "Antarctica"
 msgstr "Антарктыда"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Аргенціна"
 
@@ -474,10 +481,12 @@ msgid "American Samoa"
 msgstr "Усходняе Самоа"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Аўстрыя"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Аўстралія"
 
@@ -490,10 +499,12 @@ msgid "Aland Islands"
 msgstr "Аландскія астравы"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Азербайджан"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Боснія і Герцагавіна"
 
@@ -506,6 +517,7 @@ msgid "Bangladesh"
 msgstr "Бангладэш"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "Бельгія"
 
@@ -514,6 +526,7 @@ msgid "Burkina Faso"
 msgstr "Буркіна Фасо"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "Балгарыя"
 
@@ -522,6 +535,7 @@ msgid "Bahrain"
 msgstr "Бахрэйн"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Бурундзі"
 
@@ -542,6 +556,7 @@ msgid "Brunei Darussalam"
 msgstr "Брунэй Даруссалам"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Балівія"
 
@@ -550,6 +565,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Бразілія"
 
@@ -566,10 +582,12 @@ msgid "Bouvet Island"
 msgstr "Востраў Буве"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Батсвана"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Беларусь"
 
@@ -578,6 +596,7 @@ msgid "Belize"
 msgstr "Бэліз"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Канада"
 
@@ -586,6 +605,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Какосавыя (Кілінг) астравы"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "Дэмакратычная Рэспубліка Конга"
 
@@ -598,10 +618,12 @@ msgid "Congo"
 msgstr "Конга"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Швейцарыя"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Кот д'Івуар"
 
@@ -610,6 +632,7 @@ msgid "Cook Islands"
 msgstr "Астравы Кука"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Чылі"
 
@@ -618,10 +641,12 @@ msgid "Cameroon"
 msgstr "Камерун"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "Кітай"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Калумбія"
 
@@ -630,6 +655,7 @@ msgid "Costa Rica"
 msgstr "Коста Рыка"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Куба"
 
@@ -646,14 +672,17 @@ msgid "Christmas Island"
 msgstr "Востраў Раства"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Кіпр"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "Чэшская рэспубліка"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Германія"
 
@@ -662,6 +691,7 @@ msgid "Djibouti"
 msgstr "Джыбуці"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Данія"
 
@@ -670,6 +700,7 @@ msgid "Dominica"
 msgstr "Дамініка"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "Дамініканская Рэспубліка"
 
@@ -678,10 +709,12 @@ msgid "Algeria"
 msgstr "Алжыр"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Эквадор"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Эстонія"
 
@@ -698,14 +731,17 @@ msgid "Eritrea"
 msgstr "Эрытрэя"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "Іспанія"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Эфіопія"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Фінляндыя"
 
@@ -722,10 +758,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Фэдэратыўныя Штаты Мікранэзіі"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Фарэрскія астравы"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "Францыя"
 
@@ -734,6 +772,7 @@ msgid "Gabon"
 msgstr "Габон"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "Вялікабрытанія"
 
@@ -770,6 +809,7 @@ msgid "Gambia"
 msgstr "Гамбія"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Гвінея"
 
@@ -782,6 +822,7 @@ msgid "Equatorial Guinea"
 msgstr "Экватарыяльная Гвінея"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Грэцыя"
 
@@ -802,6 +843,7 @@ msgid "Guinea-Bissau"
 msgstr "Гвінея-Бісаў"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Гаяна"
 
@@ -818,26 +860,32 @@ msgid "Honduras"
 msgstr "Гандурас"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Харватыя"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Гаіці"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Венгрыя"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Інданэзія"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Ірландыя"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Ізраіль"
 
@@ -846,6 +894,7 @@ msgid "Isle of Man"
 msgstr "Востраў Мэн"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "Індыя"
 
@@ -854,18 +903,22 @@ msgid "British Indian Ocean Territory"
 msgstr "Брытанская тэрыторыя ў Індыйскім акіяне"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Ірак"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Ісламская Рэспубліка Іран"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Ісландыя"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Італія"
 
@@ -874,6 +927,7 @@ msgid "Jersey"
 msgstr "Джэрсі"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Ямайка"
 
@@ -882,14 +936,17 @@ msgid "Jordan"
 msgstr "Іарданія"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Японія"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Кенія"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Кыргыстан"
 
@@ -926,6 +983,7 @@ msgid "Cayman Islands"
 msgstr "Кайманавы астравы"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
@@ -950,26 +1008,32 @@ msgid "Sri Lanka"
 msgstr "Шры-Ланка"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Ліберыя"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Лесота"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Літва"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Люксембург"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Латвія"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr ""
 
@@ -994,6 +1058,7 @@ msgid "Saint Martin (French part)"
 msgstr "Сэнт-Марцін (французская частка)"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
@@ -1014,6 +1079,7 @@ msgid "Myanmar"
 msgstr "М'янма"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Манголія"
 
@@ -1054,10 +1120,12 @@ msgid "Malawi"
 msgstr "Малаві"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "Мексіка"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Малайзія"
 
@@ -1066,10 +1134,12 @@ msgid "Mozambique"
 msgstr "Мазамбік"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Намібія"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "Новая Каледонія"
 
@@ -1090,6 +1160,7 @@ msgid "Nicaragua"
 msgstr "Нікарагуа"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Нідэрланды"
 
@@ -1098,6 +1169,7 @@ msgid "Norway"
 msgstr "Нарвегія"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Нэпал"
 
@@ -1110,6 +1182,7 @@ msgid "Niue"
 msgstr "Ніуе"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "Новая Зеландыя"
 
@@ -1122,6 +1195,7 @@ msgid "Panama"
 msgstr "Панама"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Перу"
 
@@ -1134,14 +1208,17 @@ msgid "Papua New Guinea"
 msgstr "Папуа–Новая Гвінэя"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Філіпіны"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Пакістан"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Польшча"
 
@@ -1162,6 +1239,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Палестынская тэрыторыя, акупаваная"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Партугалія"
 
@@ -1170,6 +1248,7 @@ msgid "Palau"
 msgstr "Палау"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Парагвай"
 
@@ -1178,10 +1257,12 @@ msgid "Qatar"
 msgstr "Катар"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Рэюньён"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Румынія"
 
@@ -1190,14 +1271,17 @@ msgid "Serbia"
 msgstr "Сербія"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Расійская Федэрацыя"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Руанда"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Саудаўская Аравія"
 
@@ -1218,6 +1302,7 @@ msgid "Sweden"
 msgstr "Швецыя"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Сінгапур"
 
@@ -1234,6 +1319,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Шпіцбэрген і Ян-Майен"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Славакія"
 
@@ -1254,6 +1340,7 @@ msgid "Somalia"
 msgstr "Самалі"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Сурынам"
 
@@ -1298,6 +1385,7 @@ msgid "Togo"
 msgstr "Тога"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Тайланд"
 
@@ -1314,6 +1402,7 @@ msgid "Timor-Leste"
 msgstr "Тымор-Лестэ"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Туркменістан"
 
@@ -1326,6 +1415,7 @@ msgid "Tonga"
 msgstr "Тонга"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Турцыя"
 
@@ -1342,14 +1432,17 @@ msgid "Taiwan, Province of China"
 msgstr "Кітайская правінцыя Тайвань"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Злучаная Рэспубліка Танзанія"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Украіна"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Уганда"
 
@@ -1362,6 +1455,7 @@ msgid "United States"
 msgstr "Злучаныя Штаты Амерыкі"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Уругвай"
 
@@ -1378,6 +1472,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "Сэнт-Вінсэнт і Грэнадзіны"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Венесуэла"
 
@@ -1414,6 +1509,7 @@ msgid "Mayotte"
 msgstr "Маёта"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "Паўднёва-Афрыканская Рэспубліка"
 
@@ -1441,23 +1537,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1598,6 +1694,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr ""
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1667,7 +1766,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1675,15 +1779,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1692,9 +1796,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1707,7 +1808,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1754,7 +1855,7 @@ msgid "OT"
 msgstr ""
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
+msgid "Route %4.1f%s    %02d:%02d ETA"
 msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
@@ -1977,6 +2078,9 @@ msgstr ""
 msgid "Show Locale"
 msgstr ""
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr ""
 
@@ -2015,729 +2119,861 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
+msgid "Vehicle Position"
 msgstr ""
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
+msgid "Main menu"
 msgstr ""
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgid "Settings"
+msgstr "Налады"
+
+msgid "Tools"
+msgstr "Інструменты"
+
+msgid "Route"
+msgstr "Шлях"
+
+msgid "About"
+msgstr "Аб праграме"
+
+msgid "Quit"
+msgstr "Выйсці"
+
+msgid "Actions"
+msgstr "Дзеянні"
 
 msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Coordinates"
 msgstr ""
 
 msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+"Stop\n"
+"Navigation"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
+msgid "Display"
 msgstr ""
 
-msgid "Cancel"
-msgstr ""
+msgid "Fullscreen"
+msgstr "Поўнаэкранны рэжым"
 
-msgid "filenamePath"
+msgid "Window Mode"
 msgstr ""
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Whole Planet"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "Africa"
+msgid "Layers"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Asia"
-msgstr ""
+msgid "Description"
+msgstr "Апісанне"
 
-msgid "Korea"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "Taiwan"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "UAE+Other"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Oceania"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Tasmania"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Victoria"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "New South Wales"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Europe"
+msgid "horse"
 msgstr ""
 
-msgid "Western Europe"
+msgid "Truck"
 msgstr ""
 
-msgid "Azores"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "BeNeLux"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Alsace"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Aquitaine"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Auvergne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
 
-msgid "Vehicle Position"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
 msgstr ""
 
-msgid "Main menu"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
 msgstr ""
 
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/saarland
+msgid "Saarland"
 msgstr ""
 
-msgid "Settings"
-msgstr "Налады"
-
-msgid "Tools"
-msgstr "Інструменты"
-
-msgid "Route"
-msgstr "Шлях"
-
-msgid "About"
-msgstr "Аб праграме"
-
-msgid "Quit"
-msgstr "Выйсці"
-
-msgid "Actions"
-msgstr "Дзеянні"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
 
-msgid "Display"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
 msgstr ""
 
-msgid "Fullscreen"
-msgstr "Поўнаэкранны рэжым"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr ""
 
-msgid "Window Mode"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
 msgstr ""
 
-msgid "Layers"
+#. Android resource: @strings/england
+msgid "England"
 msgstr ""
 
-msgid "Description"
-msgstr "Апісанне"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
 msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""
diff --git a/po/bg.po.in b/po/bg.po.in
index 8cba7b8d2..6dbfe0ea8 100644
--- a/po/bg.po.in
+++ b/po/bg.po.in
@@ -1,5 +1,5 @@
 # Bulgarian translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2018 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Alex Stanev https://launchpad.net/~realender
@@ -7,13 +7,14 @@
 # Anton Todorov https://launchpad.net/~antod
 # Lyudmil Bonev https://launchpad.net/~bonev-j
 # MalamiR https://launchpad.net/~mamut-killer
+# Martin Voinov https://launchpad.net/~mvoinov
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 03:57+0000\n"
-"Last-Translator: Alex Stanev <alex@stanev.org>\n"
+"PO-Revision-Date: 2018-05-01 20:30+0000\n"
+"Last-Translator: Anton Todorov <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 msgid "Running from source directory\n"
-msgstr ""
+msgstr "стартиране от главната директория\n"
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
@@ -75,31 +76,31 @@ msgstr "шестия изход"
 
 #, c-format
 msgid "%d feet"
-msgstr ""
+msgstr "%d фута"
 
 #, c-format
 msgid "in %d feet"
-msgstr ""
+msgstr "след %d фута"
 
 #, c-format
 msgid "%d.%d miles"
-msgstr ""
+msgstr "%d.%d мили"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr ""
+msgstr "след %d.%d мили"
 
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d мили"
+msgstr[1] "%d miles"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "след %d миля"
+msgstr[1] "in %d miles"
 
 #, c-format
 msgid "%d meters"
@@ -154,7 +155,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "на рампата"
 
@@ -189,7 +189,7 @@ msgstr "Когато е възможно обърнете"
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "към %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -204,7 +204,7 @@ msgid "Enter the roundabout %s"
 msgstr "Навлизате в кръгово %s"
 
 msgid "then enter the roundabout"
-msgstr ""
+msgstr "след това навлезте в кръговото движение"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -241,57 +241,57 @@ msgid "Merge %1$s%2$s|left"
 msgstr ""
 
 msgid "on your left"
-msgstr ""
+msgstr "ваше ляво"
 
 msgid "on your right"
-msgstr ""
+msgstr "ваше дясно"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
 msgid "Take exit %1$s %2$s %3$s"
-msgstr ""
+msgstr "вземете изход %1$s %2$s %3$s"
 
 #. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination
 #, c-format
 msgid "Take the exit %1$s %2$s%3$s"
-msgstr ""
+msgstr "вземете изхода %1$s %2$s %3$s"
 
 #. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West"
 msgid "at interchange"
-msgstr ""
+msgstr "при обмен"
 
 msgid "at exit"
-msgstr ""
+msgstr "на изхода"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then continue straight%1$s"
-msgstr ""
+msgstr "след това продължете%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Continue straight %1$s%2$s%3$s"
-msgstr ""
+msgstr "продължете направо %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep right%1$s"
-msgstr ""
+msgstr "след това дръжте в дясно %1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep right %1$s%2$s%3$s"
-msgstr ""
+msgstr "дръжте в дясно %1$s%2$s%3$s"
 
 #. TRANSLATORS: the arg. is where to do the maneuver
 #, c-format
 msgid "then keep left%1$s"
-msgstr ""
+msgstr "след това дръжте в ляво%1$s"
 
 #. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination
 #, c-format
 msgid "Keep left %1$s%2$s%3$s"
-msgstr ""
+msgstr "дръжте в ляво%1$s%2$s%3$s"
 
 #. TRANSLATORS: "right" as in "turn right"
 msgid "right"
@@ -357,7 +357,7 @@ msgstr "Обърнете %1$s"
 #. *
 #.
 msgid "follow"
-msgstr ""
+msgstr "следвайте"
 
 msgid "then you have reached your destination."
 msgstr "след това пристигате на местоназначението"
@@ -367,9 +367,8 @@ msgstr "след това пристигате на местоназначени
 msgid "You have reached your destination %s"
 msgstr "Достигнахте до целта %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
-msgstr ""
+msgstr "обмен"
 
 msgid "Exit"
 msgstr "Изход"
@@ -384,9 +383,15 @@ msgstr "Команда"
 msgid "Length"
 msgstr "Дължина"
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr "км"
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr "м"
 
@@ -447,6 +452,7 @@ msgid "Anguilla"
 msgstr "Ангуила"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Албания"
 
@@ -459,6 +465,7 @@ msgid "Netherlands Antilles"
 msgstr "Холандски Антили"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Ангола"
 
@@ -467,6 +474,7 @@ msgid "Antarctica"
 msgstr "Антарктика"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Аржентина"
 
@@ -475,10 +483,12 @@ msgid "American Samoa"
 msgstr "Американска Самоа"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Австрия"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Австралия"
 
@@ -491,10 +501,12 @@ msgid "Aland Islands"
 msgstr "Айландски Острови"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Азърбайджан"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Босна и Херцеговина"
 
@@ -507,6 +519,7 @@ msgid "Bangladesh"
 msgstr "Бангладеш"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "Белгия"
 
@@ -515,6 +528,7 @@ msgid "Burkina Faso"
 msgstr "Буркина Фасо"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "България"
 
@@ -523,6 +537,7 @@ msgid "Bahrain"
 msgstr "Бахрейн"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Бурунди"
 
@@ -543,6 +558,7 @@ msgid "Brunei Darussalam"
 msgstr "Бруней"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Боливия"
 
@@ -551,6 +567,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Бразилия"
 
@@ -567,10 +584,12 @@ msgid "Bouvet Island"
 msgstr "Остров Буве"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Ботсвана"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Беларус"
 
@@ -579,6 +598,7 @@ msgid "Belize"
 msgstr "Белийз"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Канада"
 
@@ -587,6 +607,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Кокосови Острови"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "Демократична Република Конго"
 
@@ -599,10 +620,12 @@ msgid "Congo"
 msgstr "Конго"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Швейцария"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Кот Д'Ивоар"
 
@@ -611,6 +634,7 @@ msgid "Cook Islands"
 msgstr "Острови Кук"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Чили"
 
@@ -619,10 +643,12 @@ msgid "Cameroon"
 msgstr "Камерун"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "Китай"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Колумбия"
 
@@ -631,6 +657,7 @@ msgid "Costa Rica"
 msgstr "Коста Рика"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Куба"
 
@@ -647,14 +674,17 @@ msgid "Christmas Island"
 msgstr "Коледни острови"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Кипър"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "Чешка република"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Германия"
 
@@ -663,6 +693,7 @@ msgid "Djibouti"
 msgstr "Джибути"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Дания"
 
@@ -671,6 +702,7 @@ msgid "Dominica"
 msgstr "Доминика"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "Доминиканска Република"
 
@@ -679,10 +711,12 @@ msgid "Algeria"
 msgstr "Алжир"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Еквадор"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Естония"
 
@@ -699,14 +733,17 @@ msgid "Eritrea"
 msgstr "Еритрея"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "Испания"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Етиопия"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Финландия"
 
@@ -723,10 +760,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Микронезия, Обединени щати"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Острови Фаро"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "Франция"
 
@@ -735,6 +774,7 @@ msgid "Gabon"
 msgstr "Габон"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "Обединеното Кралство"
 
@@ -771,6 +811,7 @@ msgid "Gambia"
 msgstr "Гамбия"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Гвинея"
 
@@ -783,6 +824,7 @@ msgid "Equatorial Guinea"
 msgstr "Екваториална Гвинея"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Гърция"
 
@@ -803,6 +845,7 @@ msgid "Guinea-Bissau"
 msgstr "Гвинея-Бисау"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Гаяна"
 
@@ -819,26 +862,32 @@ msgid "Honduras"
 msgstr "Хондурас"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Хърватска"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Хаити"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Унгария"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Индонезия"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Ирландия"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Израел"
 
@@ -847,6 +896,7 @@ msgid "Isle of Man"
 msgstr "Остров Ман"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "Индия"
 
@@ -855,18 +905,22 @@ msgid "British Indian Ocean Territory"
 msgstr "Британска територия в Индийския океан"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Ирак"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Иран, Ислямска република"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Исландия"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Италия"
 
@@ -875,6 +929,7 @@ msgid "Jersey"
 msgstr "Джърси (остров)"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Ямайка"
 
@@ -883,14 +938,17 @@ msgid "Jordan"
 msgstr "Йордания"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Япония"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Кения"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Киргизстан"
 
@@ -927,6 +985,7 @@ msgid "Cayman Islands"
 msgstr "Кайманови острови"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
@@ -951,26 +1010,32 @@ msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Либерия"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Лесото"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Литва"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Люксембург"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Латвия"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr ""
 
@@ -995,6 +1060,7 @@ msgid "Saint Martin (French part)"
 msgstr "Свети Мартин (френска част)"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
@@ -1015,6 +1081,7 @@ msgid "Myanmar"
 msgstr "Мианмарският съюз"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Монголия"
 
@@ -1055,10 +1122,12 @@ msgid "Malawi"
 msgstr "Малави"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "Мексико"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Малайзия"
 
@@ -1067,10 +1136,12 @@ msgid "Mozambique"
 msgstr "Мозамбик"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Намибия"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "Нова Каледония"
 
@@ -1091,6 +1162,7 @@ msgid "Nicaragua"
 msgstr "Никарагуа"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Кралство Холандия"
 
@@ -1099,6 +1171,7 @@ msgid "Norway"
 msgstr "Кралство Норвегия"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Непал"
 
@@ -1111,6 +1184,7 @@ msgid "Niue"
 msgstr "Ниуе"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "Нова Зеландия"
 
@@ -1123,6 +1197,7 @@ msgid "Panama"
 msgstr "Панама"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Перу"
 
@@ -1135,14 +1210,17 @@ msgid "Papua New Guinea"
 msgstr "Папуа Нова Гвинея"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Филипини"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Пакистан"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Полша"
 
@@ -1163,6 +1241,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Палестинска територия, Окупирана"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Португалия"
 
@@ -1171,6 +1250,7 @@ msgid "Palau"
 msgstr "Палау"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Парагвай"
 
@@ -1179,10 +1259,12 @@ msgid "Qatar"
 msgstr "Катар"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Реюнион"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Румъния"
 
@@ -1191,14 +1273,17 @@ msgid "Serbia"
 msgstr "Сърбия"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Руска Федерация"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Руанда"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Саудитска Арабия"
 
@@ -1219,6 +1304,7 @@ msgid "Sweden"
 msgstr "Швеция"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Сингапур"
 
@@ -1235,6 +1321,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Шпицберген и Ян Майен"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Словакия"
 
@@ -1255,6 +1342,7 @@ msgid "Somalia"
 msgstr "Сомалия"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Суринам"
 
@@ -1299,6 +1387,7 @@ msgid "Togo"
 msgstr "Того"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Тайланд"
 
@@ -1315,6 +1404,7 @@ msgid "Timor-Leste"
 msgstr "Източен Тимор"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Туркменистан"
 
@@ -1327,6 +1417,7 @@ msgid "Tonga"
 msgstr "Тонга"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Турция"
 
@@ -1343,14 +1434,17 @@ msgid "Taiwan, Province of China"
 msgstr "Тайван, Китайска провинция"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Танзания, Обединена република"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Украйна"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Уганда"
 
@@ -1363,6 +1457,7 @@ msgid "United States"
 msgstr "Съединени Амеркански Щати"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Уругвай"
 
@@ -1379,6 +1474,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "Сейнт Винсънт и Гренадини"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Венецуела"
 
@@ -1415,6 +1511,7 @@ msgid "Mayotte"
 msgstr "Майот"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "Република Южна Африка"
 
@@ -1442,23 +1539,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1599,6 +1696,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr "Придържай към пътя"
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1668,7 +1768,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1676,15 +1781,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1693,9 +1798,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1708,7 +1810,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1755,8 +1857,8 @@ msgid "OT"
 msgstr ""
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Маршрут %4.0fкм %02d:%02d ОВП"
+msgid "Route %4.1f%s    %02d:%02d ETA"
+msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Маршрут 0000fкм 0+00:00 ОВП"
@@ -1966,12 +2068,21 @@ 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 "Описание на маршрута"
 
 msgid "Show Locale"
 msgstr ""
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr "Предишни Местоназначения"
 
@@ -2010,734 +2121,873 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
-msgstr ""
+msgid "Vehicle Position"
+msgstr "Позиция на автомобил"
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
+msgid "Main menu"
+msgstr "Главно меню"
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Покажи\n"
+"Картата"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
+msgid "Settings"
+msgstr "Настройки"
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgid "Tools"
+msgstr "Инструменти"
+
+msgid "Route"
+msgstr "Маршрут"
+
+msgid "About"
+msgstr "Относно"
+
+msgid "Quit"
+msgstr "Излез"
+
+msgid "Actions"
+msgstr "Действия"
 
 msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Coordinates"
 msgstr ""
 
 msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+"Stop\n"
+"Navigation"
 msgstr ""
+"Спри\n"
+"Навигацията"
 
-msgid "Cancel"
-msgstr ""
+msgid "Display"
+msgstr "Показване"
 
-msgid "filenamePath"
-msgstr ""
+msgid "Fullscreen"
+msgstr "Цял екран"
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
-msgstr ""
+msgid "Window Mode"
+msgstr "Режим Прозорец"
 
-msgid "Whole Planet"
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Africa"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Layers"
 msgstr ""
 
-msgid "Asia"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Korea"
-msgstr ""
+msgid "Description"
+msgstr "Описание"
 
-msgid "Taiwan"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "UAE+Other"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "Oceania"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Tasmania"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Victoria"
+msgid "car_shortest"
 msgstr ""
 
-msgid "New South Wales"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Europe"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Western Europe"
-msgstr ""
+msgid "horse"
+msgstr "кон"
 
-msgid "Azores"
+msgid "Truck"
 msgstr ""
 
-msgid "BeNeLux"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "Alsace"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Aquitaine"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Auvergne"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Позиция на автомобил"
-
-msgid "Main menu"
-msgstr "Главно меню"
-
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
-"Покажи\n"
-"Картата"
-
-msgid "Settings"
-msgstr "Настройки"
 
-msgid "Tools"
-msgstr "Инструменти"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
+msgstr ""
 
-msgid "Route"
-msgstr "Маршрут"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
+msgstr ""
 
-msgid "About"
-msgstr "Относно"
+#. Android resource: @strings/saarland
+msgid "Saarland"
+msgstr ""
 
-msgid "Quit"
-msgstr "Излез"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr ""
 
-msgid "Actions"
-msgstr "Действия"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
+msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
 msgstr ""
-"Спри\n"
-"Навигацията"
 
-msgid "Display"
-msgstr "Показване"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr ""
 
-msgid "Fullscreen"
-msgstr "Цял екран"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
+msgstr ""
 
-msgid "Window Mode"
-msgstr "Режим Прозорец"
+#. Android resource: @strings/england
+msgid "England"
+msgstr ""
 
-msgid "Description"
-msgstr "Описание"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
-msgstr "кон"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
+msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""
 
 #, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Маршрут %4.0fкм %02d:%02d ОВП"
+
+#, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "след това излезте от кръговото на %1$s %2$s"
diff --git a/po/bs.po.in b/po/bs.po.in
index 2e9a96061..d28cdea28 100644
--- a/po/bs.po.in
+++ b/po/bs.po.in
@@ -1,5 +1,5 @@
 # Bosnian translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2018 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
@@ -8,7 +8,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-07-19 03:57+0000\n"
 "Last-Translator: Michael von Glasow <Unknown>\n"
@@ -154,7 +154,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "u rampu"
 
@@ -367,7 +366,6 @@ msgstr ""
 msgid "You have reached your destination %s"
 msgstr ""
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr ""
 
@@ -384,9 +382,15 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr ""
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr ""
 
@@ -447,6 +451,7 @@ msgid "Anguilla"
 msgstr ""
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr ""
 
@@ -459,6 +464,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr ""
 
@@ -467,6 +473,7 @@ msgid "Antarctica"
 msgstr ""
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr ""
 
@@ -475,10 +482,12 @@ msgid "American Samoa"
 msgstr ""
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr ""
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr ""
 
@@ -491,10 +500,12 @@ msgid "Aland Islands"
 msgstr ""
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr ""
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
@@ -507,6 +518,7 @@ msgid "Bangladesh"
 msgstr ""
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr ""
 
@@ -515,6 +527,7 @@ msgid "Burkina Faso"
 msgstr ""
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr ""
 
@@ -523,6 +536,7 @@ msgid "Bahrain"
 msgstr ""
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr ""
 
@@ -543,6 +557,7 @@ msgid "Brunei Darussalam"
 msgstr ""
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr ""
 
@@ -551,6 +566,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr ""
 
@@ -567,10 +583,12 @@ msgid "Bouvet Island"
 msgstr ""
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr ""
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr ""
 
@@ -579,6 +597,7 @@ msgid "Belize"
 msgstr ""
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr ""
 
@@ -587,6 +606,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr ""
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr ""
 
@@ -599,10 +619,12 @@ msgid "Congo"
 msgstr ""
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr ""
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr ""
 
@@ -611,6 +633,7 @@ msgid "Cook Islands"
 msgstr ""
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr ""
 
@@ -619,10 +642,12 @@ msgid "Cameroon"
 msgstr ""
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr ""
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr ""
 
@@ -631,6 +656,7 @@ msgid "Costa Rica"
 msgstr ""
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr ""
 
@@ -647,14 +673,17 @@ msgid "Christmas Island"
 msgstr ""
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr ""
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr ""
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr ""
 
@@ -663,6 +692,7 @@ msgid "Djibouti"
 msgstr ""
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr ""
 
@@ -671,6 +701,7 @@ msgid "Dominica"
 msgstr ""
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr ""
 
@@ -679,10 +710,12 @@ msgid "Algeria"
 msgstr ""
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr ""
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr ""
 
@@ -699,14 +732,17 @@ msgid "Eritrea"
 msgstr ""
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr ""
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr ""
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr ""
 
@@ -723,10 +759,12 @@ msgid "Micronesia, Federated States of"
 msgstr ""
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr ""
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr ""
 
@@ -735,6 +773,7 @@ msgid "Gabon"
 msgstr ""
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr ""
 
@@ -771,6 +810,7 @@ msgid "Gambia"
 msgstr ""
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr ""
 
@@ -783,6 +823,7 @@ msgid "Equatorial Guinea"
 msgstr ""
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr ""
 
@@ -803,6 +844,7 @@ msgid "Guinea-Bissau"
 msgstr ""
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr ""
 
@@ -819,26 +861,32 @@ msgid "Honduras"
 msgstr ""
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr ""
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr ""
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr ""
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr ""
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr ""
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr ""
 
@@ -847,6 +895,7 @@ msgid "Isle of Man"
 msgstr ""
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr ""
 
@@ -855,18 +904,22 @@ msgid "British Indian Ocean Territory"
 msgstr ""
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr ""
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr ""
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr ""
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr ""
 
@@ -875,6 +928,7 @@ msgid "Jersey"
 msgstr ""
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr ""
 
@@ -883,14 +937,17 @@ msgid "Jordan"
 msgstr ""
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr ""
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr ""
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr ""
 
@@ -927,6 +984,7 @@ msgid "Cayman Islands"
 msgstr ""
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr ""
 
@@ -951,26 +1009,32 @@ msgid "Sri Lanka"
 msgstr ""
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr ""
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr ""
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr ""
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr ""
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr ""
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr ""
 
@@ -995,6 +1059,7 @@ msgid "Saint Martin (French part)"
 msgstr ""
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr ""
 
@@ -1015,6 +1080,7 @@ msgid "Myanmar"
 msgstr ""
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr ""
 
@@ -1055,10 +1121,12 @@ msgid "Malawi"
 msgstr ""
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr ""
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr ""
 
@@ -1067,10 +1135,12 @@ msgid "Mozambique"
 msgstr ""
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr ""
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr ""
 
@@ -1091,6 +1161,7 @@ msgid "Nicaragua"
 msgstr ""
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr ""
 
@@ -1099,6 +1170,7 @@ msgid "Norway"
 msgstr ""
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr ""
 
@@ -1111,6 +1183,7 @@ msgid "Niue"
 msgstr ""
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr ""
 
@@ -1123,6 +1196,7 @@ msgid "Panama"
 msgstr ""
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr ""
 
@@ -1135,14 +1209,17 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr ""
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr ""
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr ""
 
@@ -1163,6 +1240,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr ""
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr ""
 
@@ -1171,6 +1249,7 @@ msgid "Palau"
 msgstr ""
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr ""
 
@@ -1179,10 +1258,12 @@ msgid "Qatar"
 msgstr ""
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr ""
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr ""
 
@@ -1191,14 +1272,17 @@ msgid "Serbia"
 msgstr ""
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr ""
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr ""
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -1219,6 +1303,7 @@ msgid "Sweden"
 msgstr ""
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr ""
 
@@ -1235,6 +1320,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr ""
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr ""
 
@@ -1255,6 +1341,7 @@ msgid "Somalia"
 msgstr ""
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr ""
 
@@ -1299,6 +1386,7 @@ msgid "Togo"
 msgstr ""
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr ""
 
@@ -1315,6 +1403,7 @@ msgid "Timor-Leste"
 msgstr ""
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr ""
 
@@ -1327,6 +1416,7 @@ msgid "Tonga"
 msgstr ""
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr ""
 
@@ -1343,14 +1433,17 @@ msgid "Taiwan, Province of China"
 msgstr ""
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr ""
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr ""
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr ""
 
@@ -1363,6 +1456,7 @@ msgid "United States"
 msgstr ""
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr ""
 
@@ -1379,6 +1473,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr ""
 
@@ -1415,6 +1510,7 @@ msgid "Mayotte"
 msgstr ""
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr ""
 
@@ -1442,23 +1538,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1599,6 +1695,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr ""
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1668,7 +1767,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1676,15 +1780,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1693,9 +1797,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1708,7 +1809,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1755,7 +1856,7 @@ msgid "OT"
 msgstr ""
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
+msgid "Route %4.1f%s    %02d:%02d ETA"
 msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
@@ -1978,6 +2079,9 @@ msgstr ""
 msgid "Show Locale"
 msgstr ""
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr ""
 
@@ -2016,729 +2120,861 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
+msgid "Vehicle Position"
 msgstr ""
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
+msgid "Main menu"
 msgstr ""
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgid "Settings"
 msgstr ""
 
-msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+msgid "Tools"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Route"
 msgstr ""
 
-msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+msgid "About"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
+msgid "Quit"
 msgstr ""
 
-msgid "Cancel"
+msgid "Actions"
 msgstr ""
 
-msgid "filenamePath"
+msgid ""
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+msgid "Coordinates"
 msgstr ""
 
-msgid "Whole Planet"
+msgid ""
+"Stop\n"
+"Navigation"
 msgstr ""
 
-msgid "Africa"
+msgid "Display"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Fullscreen"
 msgstr ""
 
-msgid "Asia"
+msgid "Window Mode"
 msgstr ""
 
-msgid "Korea"
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Taiwan"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "UAE+Other"
+msgid "Layers"
 msgstr ""
 
-msgid "Oceania"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Tasmania"
+msgid "Description"
 msgstr ""
 
-msgid "Victoria"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "New South Wales"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "Europe"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Western Europe"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Azores"
+msgid "car_shortest"
 msgstr ""
 
-msgid "BeNeLux"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Alsace"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Aquitaine"
+msgid "horse"
 msgstr ""
 
-msgid "Auvergne"
+msgid "Truck"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Vehicle Position"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Main menu"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-msgid "Settings"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-msgid "Tools"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
 
-msgid "Route"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
 msgstr ""
 
-msgid "About"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
 msgstr ""
 
-msgid "Quit"
+#. Android resource: @strings/saarland
+msgid "Saarland"
 msgstr ""
 
-msgid "Actions"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
 msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
 
-msgid "Display"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
 msgstr ""
 
-msgid "Fullscreen"
+#. Android resource: @strings/galicia
+msgid "Galicia"
 msgstr ""
 
-msgid "Window Mode"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
 msgstr ""
 
-msgid "Layers"
+#. Android resource: @strings/england
+msgid "England"
 msgstr ""
 
-msgid "Description"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
 msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
 msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""
diff --git a/po/ca.po.in b/po/ca.po.in
index d4b7111f8..da9421f44 100644
--- a/po/ca.po.in
+++ b/po/ca.po.in
@@ -1,5 +1,5 @@
 # Catalan translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2018 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Ferran Roig https://launchpad.net/~ferro9
@@ -17,7 +17,7 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-01-01 20:32+0000\n"
 "Last-Translator: pataquets <Unknown>\n"
@@ -161,7 +161,6 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr ""
 
@@ -374,7 +373,6 @@ msgstr "aleshores heu arribat a destí"
 msgid "You have reached your destination %s"
 msgstr "Heu arribat a la destinació %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr "Intersecció"
 
@@ -391,9 +389,15 @@ msgstr "Ordre"
 msgid "Length"
 msgstr "Durada"
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr "km"
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr "m"
 
@@ -454,6 +458,7 @@ msgid "Anguilla"
 msgstr "Anguilla"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Albània"
 
@@ -466,6 +471,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilles Holandeses"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Angola"
 
@@ -474,6 +480,7 @@ msgid "Antarctica"
 msgstr "Antàrtida"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Argentina"
 
@@ -482,10 +489,12 @@ msgid "American Samoa"
 msgstr "Samoa Americana"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Àustria"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Austràlia"
 
@@ -498,10 +507,12 @@ msgid "Aland Islands"
 msgstr "Illes Aland"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Azerbaitjan"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Bòsnia i Hercegovina"
 
@@ -514,6 +525,7 @@ msgid "Bangladesh"
 msgstr "Bangladesh"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "Bèlgica"
 
@@ -522,6 +534,7 @@ msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "Bulgària"
 
@@ -530,6 +543,7 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Burundi"
 
@@ -550,6 +564,7 @@ msgid "Brunei Darussalam"
 msgstr "Brunei"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Bolívia"
 
@@ -558,6 +573,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Brasil"
 
@@ -574,10 +590,12 @@ msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Botswana"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Bielorússia"
 
@@ -586,6 +604,7 @@ msgid "Belize"
 msgstr "Belize"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Canadà"
 
@@ -594,6 +613,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Illes Cocos (Keeling)"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "Congo, República Democràtica del"
 
@@ -606,10 +626,12 @@ msgid "Congo"
 msgstr "Congo"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Suïssa"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Costa d'Ivori"
 
@@ -618,6 +640,7 @@ msgid "Cook Islands"
 msgstr "Illes Cook"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Xile"
 
@@ -626,10 +649,12 @@ msgid "Cameroon"
 msgstr "Camerun"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "Xina"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Colòmbia"
 
@@ -638,6 +663,7 @@ msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Cuba"
 
@@ -654,14 +680,17 @@ msgid "Christmas Island"
 msgstr "Illa Christmas"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Xipre"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "República Txeca"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Alemanya"
 
@@ -670,6 +699,7 @@ msgid "Djibouti"
 msgstr "Djibouti"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Dinamarca"
 
@@ -678,6 +708,7 @@ msgid "Dominica"
 msgstr "Dominica"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
@@ -686,10 +717,12 @@ msgid "Algeria"
 msgstr "Algèria"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Equador"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Estònia"
 
@@ -706,14 +739,17 @@ msgid "Eritrea"
 msgstr "Eritrea"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "Espanya"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Etiòpia"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Finlàndia"
 
@@ -730,10 +766,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Micronèsia, Estats Federats de"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Illes Fèroe"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "França"
 
@@ -742,6 +780,7 @@ msgid "Gabon"
 msgstr "Gabon"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "Regne Unit"
 
@@ -778,6 +817,7 @@ msgid "Gambia"
 msgstr "Gàmbia"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Guinea"
 
@@ -790,6 +830,7 @@ msgid "Equatorial Guinea"
 msgstr "Guinea Equatorial"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Grècia"
 
@@ -810,6 +851,7 @@ msgid "Guinea-Bissau"
 msgstr "Guinea Bissau"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Guyana"
 
@@ -826,26 +868,32 @@ msgid "Honduras"
 msgstr "Hondures"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Croàcia"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Haití"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Hongria"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Indonèsia"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Irlanda"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Israel"
 
@@ -854,6 +902,7 @@ msgid "Isle of Man"
 msgstr "Illa de Man"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "Índia"
 
@@ -862,18 +911,22 @@ msgid "British Indian Ocean Territory"
 msgstr "Territori britànic de l'oceà Índic"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Iraq"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Iran"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Islàndia"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Itàlia"
 
@@ -882,6 +935,7 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Jamàica"
 
@@ -890,14 +944,17 @@ msgid "Jordan"
 msgstr "Jordània"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Japó"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Kenya"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Kirguizistan"
 
@@ -934,6 +991,7 @@ msgid "Cayman Islands"
 msgstr "Illes Caiman"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
@@ -958,26 +1016,32 @@ msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Libèria"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Lesotho"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Lituània"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Letònia"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr "Líbia"
 
@@ -1002,6 +1066,7 @@ msgid "Saint Martin (French part)"
 msgstr "Saint-Martin (zona francesa)"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Madagascar"
 
@@ -1022,6 +1087,7 @@ msgid "Myanmar"
 msgstr "Myanmar"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Mongòlia"
 
@@ -1062,10 +1128,12 @@ msgid "Malawi"
 msgstr "Malawi"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "Mèxic"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Malàisia"
 
@@ -1074,10 +1142,12 @@ msgid "Mozambique"
 msgstr "Moçambic"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Namíbia"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "Nova Caledònia"
 
@@ -1098,6 +1168,7 @@ msgid "Nicaragua"
 msgstr "Nicaragua"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Països Baixos"
 
@@ -1106,6 +1177,7 @@ msgid "Norway"
 msgstr "Noruega"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Nepal"
 
@@ -1118,6 +1190,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "Nova Zelanda"
 
@@ -1130,6 +1203,7 @@ msgid "Panama"
 msgstr "Panamà"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Perú"
 
@@ -1142,14 +1216,17 @@ msgid "Papua New Guinea"
 msgstr "Papua Nova Guinea"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Filipines"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Pakistan"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Polònia"
 
@@ -1170,6 +1247,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Palestina (territori ocupat)"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Portugal"
 
@@ -1178,6 +1256,7 @@ msgid "Palau"
 msgstr "Palau"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Paraguai"
 
@@ -1186,10 +1265,12 @@ msgid "Qatar"
 msgstr "Qatar"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Illa de la Reunió"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Romania"
 
@@ -1198,14 +1279,17 @@ msgid "Serbia"
 msgstr "Sèrbia"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Rússia"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Rwanda"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Aràbia Saudita"
 
@@ -1226,6 +1310,7 @@ msgid "Sweden"
 msgstr "Suècia"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Singapur"
 
@@ -1242,6 +1327,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard i Jan Mayen"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Eslovàquia"
 
@@ -1262,6 +1348,7 @@ msgid "Somalia"
 msgstr "Somàlia"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -1306,6 +1393,7 @@ msgid "Togo"
 msgstr "Togo"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Tailàndia"
 
@@ -1322,6 +1410,7 @@ msgid "Timor-Leste"
 msgstr "Timor Oriental"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
@@ -1334,6 +1423,7 @@ msgid "Tonga"
 msgstr "Tonga"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Turquia"
 
@@ -1350,14 +1440,17 @@ msgid "Taiwan, Province of China"
 msgstr "Taiwan"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Tanzània"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Ucraïna"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Uganda"
 
@@ -1370,6 +1463,7 @@ msgid "United States"
 msgstr "Estats Units d'Amèrica"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Uruguai"
 
@@ -1386,6 +1480,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent i les Grenadines"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Veneçuela"
 
@@ -1422,6 +1517,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "Sud-àfrica"
 
@@ -1449,23 +1545,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr "No s'ha trobat l'arxiu de configuració navit.xml, navit.xml.local\n"
+msgid "No config file navit.xml, navit.xml.local found"
+msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
-msgstr "Usant l'arxiu de configuració '%s'\n"
+msgid "Using config file '%s'"
+msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1606,6 +1702,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr ""
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1675,7 +1774,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1683,15 +1787,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1700,9 +1804,6 @@ msgstr ""
 msgid "Select a category"
 msgstr "Seleccioneu una categoria"
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1715,7 +1816,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1762,8 +1863,8 @@ msgid "OT"
 msgstr ""
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Ruta %4.0fkm    %02d:%02d TEA"
+msgid "Route %4.1f%s    %02d:%02d ETA"
+msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Ruta 0000km 0+00:00 TEA"
@@ -1985,6 +2086,9 @@ msgstr "Descripció de la ruta"
 msgid "Show Locale"
 msgstr "Mostra la localitat"
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr "Destinacions anteriors"
 
@@ -2023,737 +2127,880 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
-msgstr ""
+msgid "Vehicle Position"
+msgstr "Posició del vehicle"
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr ""
+msgid "Main menu"
+msgstr "Menú principal"
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
+"Mostra\n"
+"Mapa"
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr ""
+msgid "Settings"
+msgstr "Configuració"
+
+msgid "Tools"
+msgstr "Eines"
+
+msgid "Route"
+msgstr "Ruta"
+
+msgid "About"
+msgstr "Quant a..."
+
+msgid "Quit"
+msgstr "Surt"
+
+msgid "Actions"
+msgstr "Accions"
 
 msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Coordinates"
 msgstr ""
 
 msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+"Stop\n"
+"Navigation"
 msgstr ""
+"Atura la\n"
+"Navegació"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr ""
+msgid "Display"
+msgstr "Pantalla"
 
-msgid "Cancel"
-msgstr ""
+msgid "Fullscreen"
+msgstr "Pantalla completa"
 
-msgid "filenamePath"
-msgstr ""
+msgid "Window Mode"
+msgstr "Mode de la finestra"
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Whole Planet"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "Africa"
+msgid "Layers"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Asia"
-msgstr ""
+msgid "Description"
+msgstr "Descripció"
 
-msgid "Korea"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "Taiwan"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "UAE+Other"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Oceania"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Tasmania"
+msgid "car_shortest"
 msgstr ""
 
-msgid "Victoria"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "New South Wales"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Europe"
-msgstr ""
+msgid "horse"
+msgstr "cavall"
 
-msgid "Western Europe"
+msgid "Truck"
 msgstr ""
 
-msgid "Azores"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "BeNeLux"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Alsace"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Aquitaine"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Auvergne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
 
-msgid "Vehicle Position"
-msgstr "Posició del vehicle"
-
-msgid "Main menu"
-msgstr "Menú principal"
-
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
 msgstr ""
-"Mostra\n"
-"Mapa"
 
-msgid "Settings"
-msgstr "Configuració"
-
-msgid "Tools"
-msgstr "Eines"
-
-msgid "Route"
-msgstr "Ruta"
-
-msgid "About"
-msgstr "Quant a..."
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
+msgstr ""
 
-msgid "Quit"
-msgstr "Surt"
+#. Android resource: @strings/saarland
+msgid "Saarland"
+msgstr ""
 
-msgid "Actions"
-msgstr "Accions"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
-"Atura la\n"
-"Navegació"
 
-msgid "Display"
-msgstr "Pantalla"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
+msgstr ""
 
-msgid "Fullscreen"
-msgstr "Pantalla completa"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr ""
 
-msgid "Window Mode"
-msgstr "Mode de la finestra"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
+msgstr ""
 
-msgid "Layers"
+#. Android resource: @strings/england
+msgid "England"
 msgstr ""
 
-msgid "Description"
-msgstr "Descripció"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
-msgstr "cavall"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
+msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""
 
 #, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Ruta %4.0fkm    %02d:%02d TEA"
+
+#, c-format
+#~ msgid "Using config file '%s'\n"
+#~ msgstr "Usant l'arxiu de configuració '%s'\n"
+
+#~ msgid "No config file navit.xml, navit.xml.local found\n"
+#~ msgstr "No s'ha trobat l'arxiu de configuració navit.xml, navit.xml.local\n"
+
+#, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "aleshores deixeu la rotonda a la %1$s %2$s"
diff --git a/po/cs.po.in b/po/cs.po.in
index 4b6a3ae95..4bfa00bc1 100644
--- a/po/cs.po.in
+++ b/po/cs.po.in
@@ -8,7 +8,6 @@
 # Ivan Kološ https://launchpad.net/~ivan-kolos
 # Jakuje https://launchpad.net/~jakuje
 # Jiří Holubčík https://launchpad.net/~jery
-# KaZeR https://launchpad.net/~kazer
 # MMlosh https://launchpad.net/~mmlosh
 # Marc0 https://launchpad.net/~z-ubuntuone-y
 # Mike Crash https://launchpad.net/~mike-mikecrash
@@ -171,7 +170,6 @@ msgstr "%1$sna %2$s"
 msgid "%1$sonto %2$s|neuter form"
 msgstr "%1$sna %2$s"
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "na přivadeč"
 
@@ -384,7 +382,6 @@ msgstr "pak budete v cíli."
 msgid "You have reached your destination %s"
 msgstr "%s dorazíte do cíle"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr "Sjezd"
 
@@ -1796,8 +1793,13 @@ msgstr "Taxi"
 msgid "Shopping"
 msgstr "Nakupování"
 
-msgid "Select a search radius from screen center"
-msgstr "Vzdálenost od středu mapy"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
+msgstr ""
 
 #, c-format
 msgid "POI %s. %s"
@@ -1821,9 +1823,6 @@ msgstr "Vyhledávání POI"
 msgid "Select a category"
 msgstr "Vyberte kategorii"
 
-msgid "Select a distance to look for (km)"
-msgstr "Vyberte vzdálenost ve které hledat (km)"
-
 msgid "Select a POI"
 msgstr "Vyberte POI"
 
@@ -1836,8 +1835,8 @@ msgstr "Kategorie"
 msgid "Direction"
 msgstr "Směr"
 
-msgid "Distance(m)"
-msgstr "Vzdálenost (m)"
+msgid "Distance"
+msgstr ""
 
 msgid "Name"
 msgstr "Název"
@@ -2220,18 +2219,14 @@ msgid "Description"
 msgstr "Popis"
 
 msgid ""
-"Drop last \n"
+"Drop last\n"
 "Waypoint"
 msgstr ""
-"Zrušit minulý \n"
-"bod trasy"
 
 msgid ""
-"Drop next \n"
+"Drop next\n"
 "Waypoint"
 msgstr ""
-"Zrušit příští \n"
-" bod trasy"
 
 msgid "Satellite Status"
 msgstr "Stav satelitu"
@@ -3068,6 +3063,20 @@ msgstr "Francouzská Guyana"
 #~ msgid "Map download aborted!"
 #~ msgstr "Stahování mapy přerušeno!"
 
+#~ msgid ""
+#~ "Drop last \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Zrušit minulý \n"
+#~ "bod trasy"
+
+#~ msgid ""
+#~ "Drop next \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Zrušit příští \n"
+#~ " bod trasy"
+
 #, c-format
 #~ msgid "Error: No configuration found in config file '%s'\n"
 #~ msgstr "Chyba: Nenalezena žádná konfigurace v konfiguračním souboru '%s'\n"
@@ -3087,6 +3096,12 @@ msgstr "Francouzská Guyana"
 #~ msgid "Set next visit to %ld, %ld \n"
 #~ msgstr "Nastav další zastavení na %ld, %ld \n"
 
+#~ msgid "Select a distance to look for (km)"
+#~ msgstr "Vyberte vzdálenost ve které hledat (km)"
+
+#~ msgid "Distance(m)"
+#~ msgstr "Vzdálenost (m)"
+
 #, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "pak sjeďte na %1$s %2$s"
diff --git a/po/en_GB.po.in b/po/en_GB.po.in
index 7cb179f3b..e8cc6e9bf 100644
--- a/po/en_GB.po.in
+++ b/po/en_GB.po.in
@@ -1,5 +1,5 @@
 # English (United Kingdom) translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2018 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Andi Chandler https://launchpad.net/~bing
@@ -14,9 +14,9 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-02-17 14:43+0000\n"
+"PO-Revision-Date: 2018-06-19 22:44+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -158,7 +158,6 @@ msgstr "%1$sonto %2$s"
 msgid "%1$sonto %2$s|neuter form"
 msgstr "%1$sonto %2$s"
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "onto the slip road"
 
@@ -371,7 +370,6 @@ msgstr "then you have reached your destination"
 msgid "You have reached your destination %s"
 msgstr "You have reached your destination %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr "Interchange"
 
@@ -388,9 +386,15 @@ msgstr "Command"
 msgid "Length"
 msgstr "Length"
 
+msgid "mi"
+msgstr "mi"
+
 msgid "km"
 msgstr "km"
 
+msgid "feet"
+msgstr "feet"
+
 msgid "m"
 msgstr "m"
 
@@ -451,6 +455,7 @@ msgid "Anguilla"
 msgstr "Anguilla"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Albania"
 
@@ -463,6 +468,7 @@ msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Angola"
 
@@ -471,6 +477,7 @@ msgid "Antarctica"
 msgstr "Antarctica"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Argentina"
 
@@ -479,10 +486,12 @@ msgid "American Samoa"
 msgstr "American Samoa"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Austria"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Australia"
 
@@ -495,10 +504,12 @@ msgid "Aland Islands"
 msgstr "Aland Islands"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia and Herzegovina"
 
@@ -511,6 +522,7 @@ msgid "Bangladesh"
 msgstr "Bangladesh"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "Belgium"
 
@@ -519,6 +531,7 @@ msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
@@ -527,6 +540,7 @@ msgid "Bahrain"
 msgstr "Bahrain"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Burundi"
 
@@ -547,6 +561,7 @@ msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Bolivia"
 
@@ -555,6 +570,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr "Bonaire, Sint Eustatius and Saba"
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Brazil"
 
@@ -571,10 +587,12 @@ msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Botswana"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Belarus"
 
@@ -583,6 +601,7 @@ msgid "Belize"
 msgstr "Belize"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Canada"
 
@@ -591,6 +610,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Islands"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "Congo, Democratic Republic of the"
 
@@ -603,10 +623,12 @@ msgid "Congo"
 msgstr "Congo"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Switzerland"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
@@ -615,6 +637,7 @@ msgid "Cook Islands"
 msgstr "Cook Islands"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Chile"
 
@@ -623,10 +646,12 @@ msgid "Cameroon"
 msgstr "Cameroon"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "China"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Colombia"
 
@@ -635,6 +660,7 @@ msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Cuba"
 
@@ -651,14 +677,17 @@ msgid "Christmas Island"
 msgstr "Christmas Island"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Cyprus"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "Czech Republic"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Germany"
 
@@ -667,6 +696,7 @@ msgid "Djibouti"
 msgstr "Djibouti"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Denmark"
 
@@ -675,6 +705,7 @@ msgid "Dominica"
 msgstr "Dominica"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
@@ -683,10 +714,12 @@ msgid "Algeria"
 msgstr "Algeria"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Ecuador"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Estonia"
 
@@ -703,14 +736,17 @@ msgid "Eritrea"
 msgstr "Eritrea"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "Spain"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Finland"
 
@@ -727,10 +763,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Micronesia, Federated States of"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Faroe Islands"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "France"
 
@@ -739,6 +777,7 @@ msgid "Gabon"
 msgstr "Gabon"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
@@ -775,6 +814,7 @@ msgid "Gambia"
 msgstr "Gambia"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Guinea"
 
@@ -787,6 +827,7 @@ msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Greece"
 
@@ -807,6 +848,7 @@ msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Guyana"
 
@@ -823,26 +865,32 @@ msgid "Honduras"
 msgstr "Honduras"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Croatia"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Haiti"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Hungary"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Indonesia"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Ireland"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Israel"
 
@@ -851,6 +899,7 @@ msgid "Isle of Man"
 msgstr "Isle of Man"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "India"
 
@@ -859,18 +908,22 @@ msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Iraq"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamic Republic of"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Iceland"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Italy"
 
@@ -879,6 +932,7 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Jamaica"
 
@@ -887,14 +941,17 @@ msgid "Jordan"
 msgstr "Jordan"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Japan"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Kenya"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
@@ -931,6 +988,7 @@ msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
@@ -955,26 +1013,32 @@ msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Liberia"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Lesotho"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Lithuania"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Latvia"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr "Libya"
 
@@ -999,6 +1063,7 @@ msgid "Saint Martin (French part)"
 msgstr "Saint Martin (French part)"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Madagascar"
 
@@ -1019,6 +1084,7 @@ msgid "Myanmar"
 msgstr "Myanmar"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Mongolia"
 
@@ -1059,10 +1125,12 @@ msgid "Malawi"
 msgstr "Malawi"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "Mexico"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Malaysia"
 
@@ -1071,10 +1139,12 @@ msgid "Mozambique"
 msgstr "Mozambique"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Namibia"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "New Caledonia"
 
@@ -1095,6 +1165,7 @@ msgid "Nicaragua"
 msgstr "Nicaragua"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Netherlands"
 
@@ -1103,6 +1174,7 @@ msgid "Norway"
 msgstr "Norway"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Nepal"
 
@@ -1115,6 +1187,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "New Zealand"
 
@@ -1127,6 +1200,7 @@ msgid "Panama"
 msgstr "Panama"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Peru"
 
@@ -1139,14 +1213,17 @@ msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Philippines"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Pakistan"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Poland"
 
@@ -1167,6 +1244,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Palestinian Territory, Occupied"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Portugal"
 
@@ -1175,6 +1253,7 @@ msgid "Palau"
 msgstr "Palau"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Paraguay"
 
@@ -1183,10 +1262,12 @@ msgid "Qatar"
 msgstr "Qatar"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Reunion"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Romania"
 
@@ -1195,14 +1276,17 @@ msgid "Serbia"
 msgstr "Serbia"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Russian Federation"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Rwanda"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
@@ -1223,6 +1307,7 @@ msgid "Sweden"
 msgstr "Sweden"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Singapore"
 
@@ -1239,6 +1324,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard and Jan Mayen"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Slovakia"
 
@@ -1259,6 +1345,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -1303,6 +1390,7 @@ msgid "Togo"
 msgstr "Togo"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Thailand"
 
@@ -1319,6 +1407,7 @@ msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
@@ -1331,6 +1420,7 @@ msgid "Tonga"
 msgstr "Tonga"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Turkey"
 
@@ -1347,14 +1437,17 @@ msgid "Taiwan, Province of China"
 msgstr "Taiwan, Province of China"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Tanzania, United Republic of"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Ukraine"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Uganda"
 
@@ -1367,6 +1460,7 @@ msgid "United States"
 msgstr "United States"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -1383,6 +1477,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent and the Grenadines"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Venezuela"
 
@@ -1419,6 +1514,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "South Africa"
 
@@ -1455,25 +1551,25 @@ msgstr ""
 "\t-v: print the version and exit.\n"
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
+msgstr "No config file navit.xml, navit.xml.local found"
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
-msgstr "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
+msgstr "Error parsing config file '%s': %s"
 
 #, c-format
-msgid "Using config file '%s'\n"
-msgstr "Using config file '%s'\n"
+msgid "Using config file '%s'"
+msgstr "Using config file '%s'"
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
-msgstr "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
+msgstr "Error: No configuration found in config file '%s'"
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
-"Internal initialisation failed, exiting. Check previous error messages.\n"
+"Internal initialisation failed, exiting. Check previous error messages."
 
 msgid "unknown street"
 msgstr "unknown street"
@@ -1613,6 +1709,9 @@ msgstr "Show position _cursor"
 msgid "_Lock on Road"
 msgstr "Lock on road"
 
+msgid "_Follow Vehicle"
+msgstr "_Follow Vehicle"
+
 msgid "_Keep orientation to the North"
 msgstr "_Keep orientation to the North"
 
@@ -1682,7 +1781,12 @@ msgstr "Taxi"
 msgid "Shopping"
 msgstr "Shopping"
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1690,16 +1794,16 @@ msgid "POI %s. %s"
 msgstr "POI %s. %s"
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
-msgstr "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
+msgstr "Set destination to %ld, %ld "
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
-msgstr "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
+msgstr "Set map to %ld, %ld "
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
-msgstr "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
+msgstr "Set next visit to %ld, %ld "
 
 msgid "POI search"
 msgstr "POI search"
@@ -1707,9 +1811,6 @@ msgstr "POI search"
 msgid "Select a category"
 msgstr "Select a category"
 
-msgid "Select a distance to look for (km)"
-msgstr "Select a search radius from screen center"
-
 msgid "Select a POI"
 msgstr "Select a POI"
 
@@ -1722,9 +1823,8 @@ msgstr "Category"
 msgid "Direction"
 msgstr "Direction"
 
-# TRANSLATORS: This is the distance to a Point of Interest (POI) in the POI window. It will be feet (imperial) or, meters (metric), depending on the user's preference.
-msgid "Distance(m)"
-msgstr "Distance"
+msgid "Distance"
+msgstr ""
 
 msgid "Name"
 msgstr "Name"
@@ -1770,8 +1870,8 @@ msgid "OT"
 msgstr "QT"
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Route %4.0fkm    %02d:%02d ETA"
+msgid "Route %4.1f%s    %02d:%02d ETA"
+msgstr "Route %4.1f%s    %02d:%02d ETA"
 
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Route 0000km  0+00:00 ETA"
@@ -1982,10 +2082,10 @@ msgid "Height Profile"
 msgstr "Height Profile"
 
 msgid "please install a map *.heightlines.bin to provide elevationdata"
-msgstr ""
+msgstr "please install a map *.heightlines.bin to provide elevationdata"
 
 msgid "The route must cross at least 2 heightlines"
-msgstr ""
+msgstr "The route must cross at least 2 heightlines"
 
 msgid "Route Description"
 msgstr "Route Description"
@@ -1993,6 +2093,9 @@ msgstr "Route Description"
 msgid "Show Locale"
 msgstr "Show Locale"
 
+msgid "Network info"
+msgstr "Network info"
+
 msgid "Former Destinations"
 msgstr "Former Destinations"
 
@@ -2031,32 +2134,223 @@ msgstr "Look out! Camera!"
 msgid "Please decrease your speed"
 msgstr "Please decrease your speed"
 
-msgid "partial match"
-msgstr "partial match"
+msgid "Vehicle Position"
+msgstr "Vehicle Position"
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr "Search"
+msgid "Main menu"
+msgstr "Main Menu"
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr "Towns"
+msgid ""
+"Show\n"
+"Map"
+msgstr "Show Map"
+
+msgid "Settings"
+msgstr "Settings"
+
+msgid "Tools"
+msgstr "Tools"
+
+msgid "Route"
+msgstr "Route"
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr "Map data (c) OpenStreetMap contributors, ODBL"
+msgid "About"
+msgstr "About"
+
+msgid "Quit"
+msgstr "Quit"
+
+msgid "Actions"
+msgstr "Actions"
 
 msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
 msgstr ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+"Former\n"
+"Destinations"
+
+msgid "Coordinates"
+msgstr "Coordinates"
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr "Stop"
+
+msgid "Display"
+msgstr "Display"
+
+msgid "Fullscreen"
+msgstr "Fullscreen"
+
+msgid "Window Mode"
+msgstr "Window Mode"
+
+msgid "Auto zoom"
+msgstr "Auto zoom"
+
+msgid "Manual zoom"
+msgstr "Manual zoom"
+
+msgid "Layers"
+msgstr "Layers"
+
+msgid "Zoom to route"
+msgstr "Zoom to route"
+
+msgid "Description"
+msgstr "Description"
+
+msgid ""
+"Drop last\n"
+"Waypoint"
+msgstr ""
+"Drop last\n"
+"Waypoint"
+
+msgid ""
+"Drop next\n"
+"Waypoint"
+msgstr ""
+"Drop next\n"
+"Waypoint"
+
+msgid "Satellite Status"
+msgstr "Satellite Status"
+
+msgid "NMEA Data"
+msgstr "NMEA Data"
+
+msgid "car_shortest"
+msgstr "car_shortest"
+
+msgid "car_avoid_tolls"
+msgstr "car_avoid_tolls"
+
+msgid "car_pedantic"
+msgstr "car_pedantic"
+
+msgid "horse"
+msgstr "horse"
+
+msgid "Truck"
+msgstr "Truck"
+
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr "Yes"
+
+#. Android resource: @strings/cancel
+msgid "Cancel"
+msgstr "Cancel"
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr "Navit started"
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr "Navit running"
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr "Welcome to Navit"
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map file size may be large (>50MB) - a WiFi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr "OK"
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr "More info"
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr "Zoom in"
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr "Zoom out"
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr "Download maps"
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr "Toggle POIs"
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr "Exit Navit"
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr "Backup / Restore"
+
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr "Set map location"
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Route to here"
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr "Delete this map?"
 
-msgid "Downloaded maps"
-msgstr "Downloaded maps"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr "Map download"
 
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr "Downloading:"
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr "ETA"
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr "ready"
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr "Error downloading map."
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr "Map download aborted"
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr "Not enough free space"
+
+#. Android resource: @strings/map_download_oversize
 msgid ""
 "Sorry, we currently do not support maps above 3.8G on Android, please select "
 "a smaller one."
@@ -2064,726 +2358,771 @@ msgstr ""
 "Sorry, we currently do not support maps above 3.8G on Android, please select "
 "a smaller one."
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Route to here"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr "No location. Reopen after location fix."
 
-msgid "Cancel"
-msgstr "Cancel"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr "Maps containing current location"
+
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
+msgstr "Installed maps"
+
+#. Android resource: @strings/map_downloading
+msgid "downloading"
+msgstr "downloading"
+
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
+msgstr "Media selected for map storage is not available"
+
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
+msgstr "Error writing map!"
 
-msgid "filenamePath"
-msgstr "filenamePath"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
+msgstr "New location set to %s Restart Navit to apply the changes."
 
+#. Android resource: @strings/map_location_unavailable
+#, c-format
 msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr "Address search"
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr "Enter destination"
 
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr "Match partial address"
+
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr "Search"
+
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr "Searching..."
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr "Address not found"
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr "Getting search results"
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr "Loading search results"
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr "No results found"
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr "No text entered"
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr "Setting destination to:"
+
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr "Towns"
+
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr "Choose an action"
+
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr "Please insert an SD Card"
+
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr "Backing up..."
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr "Restoring..."
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr "Failed to create backup directory"
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr "Backup failed"
+
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr "No backup found"
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr "Failed to restore"
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr "Backup successful"
+
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
+msgstr ""
+"Restore Successful\n"
+"Please restart Navit"
+
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr "Backup not found"
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr "Restore failed"
+
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr "Select backup"
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr "Backup"
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr "Restore"
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr "System text to speech engine data is missing"
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
+msgstr ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
+
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
+msgstr "One or more ungranted permissions"
+
+#. Android resource: @strings/whole_planet
 msgid "Whole Planet"
 msgstr "Whole Planet"
 
+#. Android resource: @strings/africa
 msgid "Africa"
 msgstr "Africa"
 
+#. Android resource: @strings/canary_islands
 msgid "Canary Islands"
 msgstr "Canary Islands"
 
+#. Android resource: @strings/asia
 msgid "Asia"
 msgstr "Asia"
 
-msgid "Korea"
-msgstr "Korea"
-
+#. Android resource: @strings/taiwan
 msgid "Taiwan"
 msgstr "Taiwan"
 
+#. Android resource: @strings/korea
+msgid "Korea"
+msgstr "Korea"
+
+#. Android resource: @strings/uae_other
 msgid "UAE+Other"
 msgstr "UAE+Other"
 
+#. Android resource: @strings/oceania
 msgid "Oceania"
 msgstr "Oceania"
 
+#. Android resource: @strings/tasmania
 msgid "Tasmania"
 msgstr "Tasmania"
 
+#. Android resource: @strings/victoria
 msgid "Victoria"
 msgstr "Victoria"
 
+#. Android resource: @strings/new_south_wales
 msgid "New South Wales"
 msgstr "New South Wales"
 
+#. Android resource: @strings/europe
 msgid "Europe"
 msgstr "Europe"
 
+#. Android resource: @strings/western_europe
 msgid "Western Europe"
 msgstr "Western Europe"
 
+#. Android resource: @strings/azores
 msgid "Azores"
 msgstr "Azores"
 
+#. Android resource: @strings/benelux
 msgid "BeNeLux"
 msgstr "BeNeLux"
 
+#. Android resource: @strings/alsace
 msgid "Alsace"
 msgstr "Alsace"
 
+#. Android resource: @strings/aquitaine
 msgid "Aquitaine"
 msgstr "Aquitaine"
 
+#. Android resource: @strings/auvergne
 msgid "Auvergne"
 msgstr "Auvergne"
 
-msgid "Basse-Normandie"
-msgstr "Basse-Normandie"
-
-msgid "Bourgogne"
-msgstr "Bourgogne"
+#. Android resource: @strings/centre
+msgid "Centre"
+msgstr "Centre"
 
+#. Android resource: @strings/bretagne
 msgid "Bretagne"
 msgstr "Bretagne"
 
-msgid "Centre"
-msgstr "Centre"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
+msgstr "Bourgogne"
 
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
+msgstr "Basse-Normandie"
+
+#. Android resource: @strings/champagne_ardenne
 msgid "Champagne-Ardenne"
 msgstr "Champagne-Ardenne"
 
+#. Android resource: @strings/corse
 msgid "Corse"
 msgstr "Corse"
 
+#. Android resource: @strings/franche_comte
 msgid "Franche-Comte"
 msgstr "Franche-Comte"
 
+#. Android resource: @strings/haute_normandie
 msgid "Haute-Normandie"
 msgstr "Haute-Normandie"
 
+#. Android resource: @strings/ile_de_france
 msgid "Ile-de-France"
 msgstr "Ile-de-France"
 
+#. Android resource: @strings/languedoc_roussillon
 msgid "Languedoc-Roussillon"
 msgstr "Languedoc-Roussillon"
 
+#. Android resource: @strings/limousin
 msgid "Limousin"
 msgstr "Limousin"
 
+#. Android resource: @strings/lorraine
 msgid "Lorraine"
 msgstr "Lorraine"
 
+#. Android resource: @strings/midi_pyrenees
 msgid "Midi-Pyrenees"
 msgstr "Midi-Pyrenees"
 
+#. Android resource: @strings/nord_pas_de_calais
 msgid "Nord-pas-de-Calais"
 msgstr "Nord-pas-de-Calais"
 
+#. Android resource: @strings/pays_de_la_loire
 msgid "Pays-de-la-Loire"
 msgstr "Pays-de-la-Loire"
 
+#. Android resource: @strings/picardie
 msgid "Picardie"
 msgstr "Picardie"
 
+#. Android resource: @strings/poitou_charentes
 msgid "Poitou-Charentes"
 msgstr "Poitou-Charentes"
 
+#. Android resource: @strings/provence_alpes_cote_d_azur
 msgid "Provence-Alpes-Cote-d-Azur"
 msgstr "Provence-Alpes-Cote-d-Azur"
 
+#. Android resource: @strings/rhone_alpes
 msgid "Rhone-Alpes"
 msgstr "Rhone-Alpes"
 
+#. Android resource: @strings/baden_wuerttemberg
 msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
 
+#. Android resource: @strings/bayern
 msgid "Bayern"
 msgstr "Bayern"
 
+#. Android resource: @strings/mittelfranken
 msgid "Mittelfranken"
 msgstr "Mittelfranken"
 
+#. Android resource: @strings/niederbayern
 msgid "Niederbayern"
 msgstr "Niederbayern"
 
+#. Android resource: @strings/oberbayern
 msgid "Oberbayern"
 msgstr "Oberbayern"
 
+#. Android resource: @strings/oberfranken
 msgid "Oberfranken"
 msgstr "Oberfranken"
 
+#. Android resource: @strings/oberpfalz
 msgid "Oberpfalz"
 msgstr "Oberpfalz"
 
+#. Android resource: @strings/schwaben
 msgid "Schwaben"
 msgstr "Schwaben"
 
+#. Android resource: @strings/unterfranken
 msgid "Unterfranken"
 msgstr "Unterfranken"
 
+#. Android resource: @strings/berlin
 msgid "Berlin"
 msgstr "Berlin"
 
+#. Android resource: @strings/brandenburg
 msgid "Brandenburg"
 msgstr "Brandenburg"
 
+#. Android resource: @strings/bremen
 msgid "Bremen"
 msgstr "Bremen"
 
+#. Android resource: @strings/hamburg
 msgid "Hamburg"
 msgstr "Hamburg"
 
+#. Android resource: @strings/hessen
 msgid "Hessen"
 msgstr "Hessen"
 
+#. Android resource: @strings/mecklenburg_vorpommern
 msgid "Mecklenburg-Vorpommern"
 msgstr "Mecklenburg-Vorpommern"
 
+#. Android resource: @strings/niedersachsen
 msgid "Niedersachsen"
 msgstr "Niedersachsen"
 
+#. Android resource: @strings/nordrhein_westfalen
 msgid "Nordrhein-westfalen"
 msgstr "Nordrhein-westfalen"
 
+#. Android resource: @strings/rheinland_pfalz
 msgid "Rheinland-Pfalz"
 msgstr "Rheinland-Pfalz"
 
+#. Android resource: @strings/saarland
 msgid "Saarland"
 msgstr "Saarland"
 
+#. Android resource: @strings/sachsen_anhalt
 msgid "Sachsen-Anhalt"
 msgstr "Sachsen-Anhalt"
 
+#. Android resource: @strings/sachsen
 msgid "Sachsen"
 msgstr "Sachsen"
 
+#. Android resource: @strings/schleswig_holstein
 msgid "Schleswig-Holstein"
 msgstr "Schleswig-Holstein"
 
+#. Android resource: @strings/thueringen
 msgid "Thueringen"
 msgstr "Thueringen"
 
+#. Android resource: @strings/mallorca
 msgid "Mallorca"
 msgstr "Mallorca"
 
+#. Android resource: @strings/galicia
 msgid "Galicia"
 msgstr "Galicia"
 
+#. Android resource: @strings/scandinavia
 msgid "Scandinavia"
 msgstr "Scandinavia"
 
+#. Android resource: @strings/england
 msgid "England"
 msgstr "England"
 
+#. Android resource: @strings/buckinghamshire
 msgid "Buckinghamshire"
 msgstr "Buckinghamshire"
 
+#. Android resource: @strings/cambridgeshire
 msgid "Cambridgeshire"
 msgstr "Cambridgeshire"
 
+#. Android resource: @strings/cumbria
 msgid "Cumbria"
 msgstr "Cumbria"
 
+#. Android resource: @strings/east_yorkshire_with_hull
 msgid "East yorkshire with hull"
 msgstr "East Yorkshire with Hull"
 
+#. Android resource: @strings/essex
 msgid "Essex"
 msgstr "Essex"
 
+#. Android resource: @strings/herefordshire
 msgid "Herefordshire"
 msgstr "Herefordshire"
 
+#. Android resource: @strings/kent
 msgid "Kent"
 msgstr "Kent"
 
+#. Android resource: @strings/lancashire
 msgid "Lancashire"
 msgstr "Lancashire"
 
+#. Android resource: @strings/leicestershire
 msgid "Leicestershire"
 msgstr "Leicestershire"
 
+#. Android resource: @strings/norfolk
 msgid "Norfolk"
 msgstr "Norfolk"
 
+#. Android resource: @strings/nottinghamshire
 msgid "Nottinghamshire"
 msgstr "Nottinghamshire"
 
+#. Android resource: @strings/oxfordshire
 msgid "Oxfordshire"
 msgstr "Oxfordshire"
 
+#. Android resource: @strings/shropshire
 msgid "Shropshire"
 msgstr "Shropshire"
 
+#. Android resource: @strings/somerset
 msgid "Somerset"
 msgstr "Somerset"
 
+#. Android resource: @strings/south_yorkshire
 msgid "South yorkshire"
 msgstr "South Yorkshire"
 
+#. Android resource: @strings/suffolk
 msgid "Suffolk"
 msgstr "Suffolk"
 
+#. Android resource: @strings/surrey
 msgid "Surrey"
 msgstr "Surrey"
 
+#. Android resource: @strings/wiltshire
 msgid "Wiltshire"
 msgstr "Wiltshire"
 
+#. Android resource: @strings/scotland
 msgid "Scotland"
 msgstr "Scotland"
 
+#. Android resource: @strings/wales
 msgid "Wales"
 msgstr "Wales"
 
+#. Android resource: @strings/crete
 msgid "Crete"
 msgstr "Crete"
 
+#. Android resource: @strings/north_america
 msgid "North America"
 msgstr "North America"
 
+#. Android resource: @strings/alaska
 msgid "Alaska"
 msgstr "Alaska"
 
+#. Android resource: @strings/hawaii
 msgid "Hawaii"
 msgstr "Hawaii"
 
+#. Android resource: @strings/usa
 msgid "USA"
 msgstr "USA"
 
-msgid " (except Alaska and Hawaii)"
-msgstr " (except Alaska and Hawaii)"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
+msgstr "(except Alaska and Hawaii)"
 
+#. Android resource: @strings/midwest
 msgid "Midwest"
 msgstr "Midwest"
 
+#. Android resource: @strings/michigan
 msgid "Michigan"
 msgstr "Michigan"
 
+#. Android resource: @strings/ohio
 msgid "Ohio"
 msgstr "Ohio"
 
+#. Android resource: @strings/northeast
 msgid "Northeast"
 msgstr "Northeast"
 
+#. Android resource: @strings/massachusetts
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
+#. Android resource: @strings/vermont
 msgid "Vermont"
 msgstr "Vermont"
 
+#. Android resource: @strings/pacific
 msgid "Pacific"
 msgstr "Pacific"
 
+#. Android resource: @strings/south
 msgid "South"
 msgstr "South"
 
+#. Android resource: @strings/arkansas
 msgid "Arkansas"
 msgstr "Arkansas"
 
+#. Android resource: @strings/district_of_columbia
 msgid "District of Columbia"
 msgstr "District of Columbia"
 
+#. Android resource: @strings/florida
 msgid "Florida"
 msgstr "Florida"
 
+#. Android resource: @strings/louisiana
 msgid "Louisiana"
 msgstr "Louisiana"
 
+#. Android resource: @strings/maryland
 msgid "Maryland"
 msgstr "Maryland"
 
+#. Android resource: @strings/mississippi
 msgid "Mississippi"
 msgstr "Mississippi"
 
+#. Android resource: @strings/oklahoma
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
+#. Android resource: @strings/texas
 msgid "Texas"
 msgstr "Texas"
 
+#. Android resource: @strings/virginia
 msgid "Virginia"
 msgstr "Virginia"
 
+#. Android resource: @strings/west_virginia
 msgid "West Virginia"
 msgstr "West Virginia"
 
+#. Android resource: @strings/west
 msgid "West"
 msgstr "West"
 
+#. Android resource: @strings/arizona
 msgid "Arizona"
 msgstr "Arizona"
 
+#. Android resource: @strings/california
 msgid "California"
 msgstr "California"
 
+#. Android resource: @strings/colorado
 msgid "Colorado"
 msgstr "Colorado"
 
+#. Android resource: @strings/idaho
 msgid "Idaho"
 msgstr "Idaho"
 
+#. Android resource: @strings/montana
 msgid "Montana"
 msgstr "Montana"
 
+#. Android resource: @strings/new_mexico
 msgid "New Mexico"
 msgstr "New Mexico"
 
+#. Android resource: @strings/nevada
 msgid "Nevada"
 msgstr "Nevada"
 
+#. Android resource: @strings/oregon
 msgid "Oregon"
 msgstr "Oregon"
 
+#. Android resource: @strings/utah
 msgid "Utah"
 msgstr "Utah"
 
+#. Android resource: @strings/washington_state
 msgid "Washington State"
 msgstr "Washington State"
 
+#. Android resource: @strings/south_middle_america
 msgid "South+Middle America"
 msgstr "South+Middle America"
 
+#. Android resource: @strings/guyane_francaise
 msgid "Guyane Francaise"
 msgstr "Guyane Francaise"
 
-msgid "downloading"
-msgstr "downloading"
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr "ready"
-
-msgid "Media selected for map storage is not available"
-msgstr "Media selected for map storage is not available"
-
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr "Not enough free space"
-
-msgid "Error downloading map!"
-msgstr "Error downloading map!"
-
-msgid "Error writing map!"
-msgstr "Error writing map!"
-
-msgid "Map download aborted!"
-msgstr "Map download aborted!"
-
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr "ETA"
-
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr "Map download"
-
-msgid "Vehicle Position"
-msgstr "Vehicle Position"
-
-msgid "Main menu"
-msgstr "Main Menu"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr "Show Map"
-
-msgid "Settings"
-msgstr "Settings"
-
-msgid "Tools"
-msgstr "Tools"
-
-msgid "Route"
-msgstr "Route"
-
-msgid "About"
-msgstr "About"
-
-msgid "Quit"
-msgstr "Quit"
-
-msgid "Actions"
-msgstr "Actions"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-"Former\n"
-"Destinations"
-
-msgid "Coordinates"
-msgstr "Coordinates"
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr "Stop"
-
-msgid "Display"
-msgstr "Display"
-
-msgid "Fullscreen"
-msgstr "Fullscreen"
-
-msgid "Window Mode"
-msgstr "Window Mode"
-
-msgid "Layers"
-msgstr ""
-
-msgid "Description"
-msgstr "Description"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-"Drop last \n"
-"Waypoint"
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-"Drop next \n"
-"Waypoint"
-
-msgid "Satellite Status"
-msgstr "Satellite Status"
-
-msgid "NMEA Data"
-msgstr "NMEA Data"
-
-msgid "car_shortest"
-msgstr "car_shortest"
-
-msgid "car_avoid_tolls"
-msgstr "car_avoid_tolls"
-
-msgid "car_pedantic"
-msgstr "car_pedantic"
-
-msgid "horse"
-msgstr "horse"
-
-msgid "Truck"
-msgstr "Truck"
-
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
-msgstr "Yes"
-
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
-msgstr "Navit started"
-
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
-msgstr "Navit running"
-
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
-msgstr "Welcome to Navit"
-
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
-msgstr ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map file size may be large (>50MB) - a WiFi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
-
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
-msgstr "OK"
-
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
-msgstr "More info"
-
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
-msgstr "Zoom in"
-
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
-msgstr "Zoom out"
-
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
-msgstr "Download maps"
-
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
-msgstr "Toggle POIs"
-
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
-msgstr "Exit Navit"
-
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
-msgstr "Backup / Restore"
-
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
-msgstr "Set map location"
-
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
-msgstr "Delete this map?"
-
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
-msgstr "Downloading:"
-
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
-msgstr "Error downloading map."
-
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
-msgstr "Map download aborted"
-
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
-msgstr "No location. Reopen after location fix."
-
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
-msgstr "Maps containing current location"
-
-#. Android resource: @strings/address_search_title
-msgid "Address search"
-msgstr "Address search"
-
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
-msgstr "Enter destination"
-
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
-msgstr "Match partial address"
+#, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Route %4.0fkm    %02d:%02d ETA"
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
-msgstr "Searching..."
+#, c-format
+#~ msgid "Error: No configuration found in config file '%s'\n"
+#~ msgstr "Error: No configuration found in config file '%s'\n"
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
-msgstr "Address not found"
+#, c-format
+#~ msgid "Using config file '%s'\n"
+#~ msgstr "Using config file '%s'\n"
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
-msgstr "Getting search results"
+#~ msgid ""
+#~ "Internal initialization failed, exiting. Check previous error messages.\n"
+#~ msgstr ""
+#~ "Internal initialisation failed, exiting. Check previous error messages.\n"
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
-msgstr "Loading search results"
+#~ msgid "No config file navit.xml, navit.xml.local found\n"
+#~ msgstr "No config file navit.xml, navit.xml.local found\n"
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
-msgstr "No results found"
+#, c-format
+#~ msgid "Error parsing config file '%s': %s\n"
+#~ msgstr "Error parsing config file '%s': %s\n"
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
-msgstr "No text entered"
+#~ msgid "Map data (c) OpenStreetMap contributors, ODBL"
+#~ msgstr "Map data (c) OpenStreetMap contributors, ODBL"
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
-msgstr "Setting destination to:"
+#~ msgid "partial match"
+#~ msgstr "partial match"
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
-msgstr "Choose an action"
+#~ msgid "Downloaded maps"
+#~ msgstr "Downloaded maps"
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
-msgstr "Please insert an SD Card"
+#~ msgid " (except Alaska and Hawaii)"
+#~ msgstr " (except Alaska and Hawaii)"
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
-msgstr "Backing up..."
+#~ msgid "Error downloading map!"
+#~ msgstr "Error downloading map!"
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
-msgstr "Restoring..."
+#~ msgid ""
+#~ "Drop last \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Drop last \n"
+#~ "Waypoint"
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
-msgstr "Failed to create backup directory"
+#~ msgid ""
+#~ "Drop next \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Drop next \n"
+#~ "Waypoint"
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
-msgstr "Backup failed"
+#~ msgid "Map download aborted!"
+#~ msgstr "Map download aborted!"
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
-msgstr "No backup found"
+#, c-format
+#~ msgid "Set destination to %ld, %ld \n"
+#~ msgstr "Set destination to %ld, %ld \n"
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
-msgstr "Failed to restore"
+#~ msgid "Distance from screen center (km)"
+#~ msgstr "Distance from screen centre (km)"
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
-msgstr "Backup successful"
+#, c-format
+#~ msgid "Set map to %ld, %ld \n"
+#~ msgstr "Set map to %ld, %ld \n"
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
-msgstr ""
-"Restore Successful\n"
-"Please restart Navit"
+#, c-format
+#~ msgid "Set next visit to %ld, %ld \n"
+#~ msgstr "Set next visit to %ld, %ld \n"
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
-msgstr "Backup not found"
+#, c-format
+#~ msgid "then leave the roundabout at the %1$s %2$s"
+#~ msgstr "then leave the roundabout at the %1$s %2$s"
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
-msgstr "Restore failed"
+#~ msgid "filenamePath"
+#~ msgstr "filenamePath"
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
-msgstr "Select backup"
+#~ msgid ""
+#~ "New location set to %s\n"
+#~ "Restart Navit to apply the changes."
+#~ msgstr ""
+#~ "New location set to %s\n"
+#~ "Restart Navit to apply the changes."
 
-#. Android resource: @strings/backup
-msgid "Backup"
-msgstr "Backup"
+#~ msgid ""
+#~ "Current map location %s is not available\n"
+#~ "Please restart Navit after you attach an SD card or select a different map "
+#~ "location."
+#~ msgstr ""
+#~ "Current map location %s is not available\n"
+#~ "Please restart Navit after you attach an SD card or select a different map "
+#~ "location."
 
-#. Android resource: @strings/restore
-msgid "Restore"
-msgstr "Restore"
+#~ msgid "Select a distance to look for (km)"
+#~ msgstr "Select a search radius from screen center"
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
-msgstr "System text to speech engine data is missing"
+# TRANSLATORS: This is the distance to a Point of Interest (POI) in the POI window. It will be feet (imperial) or, meters (metric), depending on the user's preference.
+#~ msgid "Distance(m)"
+#~ msgstr "Distance"
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
-msgstr ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#, c-format
+#~ msgid "in %d m"
+#~ msgstr "in %d m"
 
 #, c-format
-#~ msgid "then leave the roundabout at the %1$s %2$s"
-#~ msgstr "then leave the roundabout at the %1$s %2$s"
+#~ msgid "%d m"
+#~ msgstr "%d m"
diff --git a/po/fil.po.in b/po/fil.po.in
index b3ba50fd8..5e301ac35 100644
--- a/po/fil.po.in
+++ b/po/fil.po.in
@@ -1,15 +1,16 @@
 # Filipino translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2018 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
+# Marlon Janssen Arao https://launchpad.net/~marlonjanssenarao
 # chito https://launchpad.net/~cnuarin
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 03:58+0000\n"
-"Last-Translator: chito <cnuarin@gmail.com>\n"
+"PO-Revision-Date: 2018-06-04 20:43+0000\n"
+"Last-Translator: Marlon Janssen Arao <Unknown>\n"
 "Language-Team: Filipino <fil@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,20 +23,20 @@ msgstr ""
 
 #, c-format
 msgid "setting '%s' to '%s'\n"
-msgstr ""
+msgstr "itinatakda ang '%s' sa '%s'\n"
 
 #. TRANSLATORS: the following counts refer to streets
 msgid "zeroth"
 msgstr ""
 
 msgid "first"
-msgstr ""
+msgstr "una"
 
 msgid "second"
-msgstr ""
+msgstr "pangalawa"
 
 msgid "third"
-msgstr ""
+msgstr "pangatlo"
 
 msgid "fourth"
 msgstr "pang-apat"
@@ -70,39 +71,39 @@ msgstr "pang-anim na labasan"
 
 #, c-format
 msgid "%d feet"
-msgstr ""
+msgstr "%d talampakan"
 
 #, c-format
 msgid "in %d feet"
-msgstr ""
+msgstr "sa %d talampakan"
 
 #, c-format
 msgid "%d.%d miles"
-msgstr ""
+msgstr "%d.%d milya"
 
 #, c-format
 msgid "in %d.%d miles"
-msgstr ""
+msgstr "sa %d.%d na milya"
 
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "isang milya"
+msgstr[1] "%d na milya"
 
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "sa isang milya"
+msgstr[1] "sa %d na milya"
 
 #, c-format
 msgid "%d meters"
-msgstr ""
+msgstr "%d metro"
 
 #, c-format
 msgid "in %d meters"
-msgstr ""
+msgstr "sa %d metro"
 
 #, c-format
 msgid "%d.%d kilometers"
@@ -110,29 +111,29 @@ msgstr "%d.%d kilometro"
 
 #, c-format
 msgid "in %d.%d kilometers"
-msgstr "%d.%d kilometro"
+msgstr "sa %d.%d na kilometro"
 
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] ""
+msgstr[0] "isang kilometro"
 msgstr[1] "%d kilometro"
 
 #, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
-msgstr[0] "sa loob ng isang kilometro"
-msgstr[1] "sa loob ng %d kilometro"
+msgstr[0] "sa isang kilometro"
+msgstr[1] "sa %d na kilometro"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$s papunta sa %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
 msgid "%1$sonto %2$s"
-msgstr ""
+msgstr "%1$s papuntang %2$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
@@ -149,71 +150,70 @@ msgstr ""
 msgid "%1$sonto %2$s|neuter form"
 msgstr ""
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr ""
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
 msgid "%sinto %s%s%s"
-msgstr "%s sa kalyeng %s%s%s"
+msgstr "%s sa %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|masculine form"
-msgstr "%s sa kalyeng %s%s%s"
+msgstr "%s sa %s%s%s|masculine form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|feminine form"
-msgstr "%s sa kalyeng %s%s%s"
+msgstr "%s sa %s%s%s|feminine form"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%sinto %s%s%s|neuter form"
-msgstr "%s sa kalyeng %s%s%s"
+msgstr "%s sa %s%s%s|neuter form"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #, c-format
 msgid "%sinto the %s"
-msgstr ""
+msgstr "%s sa %s"
 
 msgid "When possible, please turn around"
-msgstr "Kung maari ay bumalik"
+msgstr "Kung maari, mangyaring umikot pabalik"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr ""
+msgstr "patungo sa %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr "Sundan ang kalye sa susunod na %s"
+msgstr "Sundan ang daan para sa susunod na %s"
 
 msgid "Enter the roundabout soon"
-msgstr ""
+msgstr "Pumasok sa rotonda sa lalong madaling panahon"
 
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+msgstr "Pumasok sa rotonda sa %s"
 
 msgid "then enter the roundabout"
-msgstr ""
+msgstr "pagkatapos ay pumasok sa rotonda"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
 msgid "Leave the roundabout at the %1$s %2$s"
-msgstr "Lisanin ang rotonda sa may %1$s %2$s"
+msgstr "Lumabas sa rotonda sa %1$s %2$s"
 
 msgid "soon"
-msgstr ""
+msgstr "sa lalong madaling panahon"
 
 msgid "now"
 msgstr "ngayon na"
 
 msgid "then"
-msgstr ""
+msgstr "pagkatapos"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -236,10 +236,10 @@ msgid "Merge %1$s%2$s|left"
 msgstr ""
 
 msgid "on your left"
-msgstr ""
+msgstr "sa iyong gawing kaliwa"
 
 msgid "on your right"
-msgstr ""
+msgstr "sa iyong gawing kaliwa"
 
 #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance
 #, c-format
@@ -362,7 +362,6 @@ msgstr ""
 msgid "You have reached your destination %s"
 msgstr ""
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr ""
 
@@ -379,9 +378,15 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
+msgid "mi"
+msgstr ""
+
 msgid "km"
 msgstr ""
 
+msgid "feet"
+msgstr ""
+
 msgid "m"
 msgstr ""
 
@@ -442,6 +447,7 @@ msgid "Anguilla"
 msgstr ""
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr ""
 
@@ -454,6 +460,7 @@ msgid "Netherlands Antilles"
 msgstr ""
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr ""
 
@@ -462,6 +469,7 @@ msgid "Antarctica"
 msgstr ""
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr ""
 
@@ -470,10 +478,12 @@ msgid "American Samoa"
 msgstr ""
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr ""
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr ""
 
@@ -486,10 +496,12 @@ msgid "Aland Islands"
 msgstr ""
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr ""
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
@@ -502,6 +514,7 @@ msgid "Bangladesh"
 msgstr ""
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr ""
 
@@ -510,6 +523,7 @@ msgid "Burkina Faso"
 msgstr ""
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr ""
 
@@ -518,6 +532,7 @@ msgid "Bahrain"
 msgstr ""
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr ""
 
@@ -538,6 +553,7 @@ msgid "Brunei Darussalam"
 msgstr ""
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr ""
 
@@ -546,6 +562,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr ""
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr ""
 
@@ -562,10 +579,12 @@ msgid "Bouvet Island"
 msgstr ""
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr ""
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr ""
 
@@ -574,6 +593,7 @@ msgid "Belize"
 msgstr ""
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr ""
 
@@ -582,6 +602,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr ""
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr ""
 
@@ -594,10 +615,12 @@ msgid "Congo"
 msgstr ""
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr ""
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr ""
 
@@ -606,6 +629,7 @@ msgid "Cook Islands"
 msgstr ""
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr ""
 
@@ -614,10 +638,12 @@ msgid "Cameroon"
 msgstr ""
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr ""
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr ""
 
@@ -626,6 +652,7 @@ msgid "Costa Rica"
 msgstr ""
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr ""
 
@@ -642,14 +669,17 @@ msgid "Christmas Island"
 msgstr ""
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr ""
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr ""
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr ""
 
@@ -658,6 +688,7 @@ msgid "Djibouti"
 msgstr ""
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr ""
 
@@ -666,6 +697,7 @@ msgid "Dominica"
 msgstr ""
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr ""
 
@@ -674,10 +706,12 @@ msgid "Algeria"
 msgstr ""
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr ""
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr ""
 
@@ -694,14 +728,17 @@ msgid "Eritrea"
 msgstr ""
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr ""
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr ""
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr ""
 
@@ -718,10 +755,12 @@ msgid "Micronesia, Federated States of"
 msgstr ""
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr ""
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr ""
 
@@ -730,6 +769,7 @@ msgid "Gabon"
 msgstr ""
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr ""
 
@@ -766,6 +806,7 @@ msgid "Gambia"
 msgstr ""
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr ""
 
@@ -778,6 +819,7 @@ msgid "Equatorial Guinea"
 msgstr ""
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr ""
 
@@ -798,6 +840,7 @@ msgid "Guinea-Bissau"
 msgstr ""
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr ""
 
@@ -814,26 +857,32 @@ msgid "Honduras"
 msgstr ""
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr ""
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr ""
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr ""
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr ""
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr ""
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr ""
 
@@ -842,6 +891,7 @@ msgid "Isle of Man"
 msgstr ""
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr ""
 
@@ -850,18 +900,22 @@ msgid "British Indian Ocean Territory"
 msgstr ""
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr ""
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr ""
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr ""
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr ""
 
@@ -870,6 +924,7 @@ msgid "Jersey"
 msgstr ""
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr ""
 
@@ -878,14 +933,17 @@ msgid "Jordan"
 msgstr ""
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr ""
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr ""
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr ""
 
@@ -922,6 +980,7 @@ msgid "Cayman Islands"
 msgstr ""
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr ""
 
@@ -946,26 +1005,32 @@ msgid "Sri Lanka"
 msgstr ""
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr ""
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr ""
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr ""
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr ""
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr ""
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr ""
 
@@ -990,6 +1055,7 @@ msgid "Saint Martin (French part)"
 msgstr ""
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr ""
 
@@ -1010,6 +1076,7 @@ msgid "Myanmar"
 msgstr ""
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr ""
 
@@ -1050,10 +1117,12 @@ msgid "Malawi"
 msgstr ""
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr ""
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr ""
 
@@ -1062,10 +1131,12 @@ msgid "Mozambique"
 msgstr ""
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr ""
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr ""
 
@@ -1086,6 +1157,7 @@ msgid "Nicaragua"
 msgstr ""
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr ""
 
@@ -1094,6 +1166,7 @@ msgid "Norway"
 msgstr ""
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr ""
 
@@ -1106,6 +1179,7 @@ msgid "Niue"
 msgstr ""
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr ""
 
@@ -1118,6 +1192,7 @@ msgid "Panama"
 msgstr ""
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr ""
 
@@ -1130,14 +1205,17 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr ""
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr ""
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr ""
 
@@ -1158,6 +1236,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr ""
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr ""
 
@@ -1166,6 +1245,7 @@ msgid "Palau"
 msgstr ""
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr ""
 
@@ -1174,10 +1254,12 @@ msgid "Qatar"
 msgstr ""
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr ""
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr ""
 
@@ -1186,14 +1268,17 @@ msgid "Serbia"
 msgstr ""
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr ""
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr ""
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -1214,6 +1299,7 @@ msgid "Sweden"
 msgstr ""
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr ""
 
@@ -1230,6 +1316,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr ""
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr ""
 
@@ -1250,6 +1337,7 @@ msgid "Somalia"
 msgstr ""
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr ""
 
@@ -1294,6 +1382,7 @@ msgid "Togo"
 msgstr ""
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr ""
 
@@ -1310,6 +1399,7 @@ msgid "Timor-Leste"
 msgstr ""
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr ""
 
@@ -1322,6 +1412,7 @@ msgid "Tonga"
 msgstr ""
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr ""
 
@@ -1338,14 +1429,17 @@ msgid "Taiwan, Province of China"
 msgstr ""
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr ""
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr ""
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr ""
 
@@ -1358,6 +1452,7 @@ msgid "United States"
 msgstr ""
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr ""
 
@@ -1374,6 +1469,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr ""
 
@@ -1410,6 +1506,7 @@ msgid "Mayotte"
 msgstr ""
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr ""
 
@@ -1437,23 +1534,23 @@ msgid ""
 msgstr ""
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
+msgid "No config file navit.xml, navit.xml.local found"
 msgstr ""
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
 msgstr ""
 
 #, c-format
-msgid "Using config file '%s'\n"
+msgid "Using config file '%s'"
 msgstr ""
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
 msgstr ""
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
 
 msgid "unknown street"
@@ -1594,6 +1691,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr ""
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr ""
 
@@ -1663,7 +1763,12 @@ msgstr ""
 msgid "Shopping"
 msgstr ""
 
-msgid "Select a search radius from screen center"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
 msgstr ""
 
 #, c-format
@@ -1671,15 +1776,15 @@ msgid "POI %s. %s"
 msgstr ""
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
+msgid "Set map to %ld, %ld "
 msgstr ""
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
 msgstr ""
 
 msgid "POI search"
@@ -1688,9 +1793,6 @@ msgstr ""
 msgid "Select a category"
 msgstr ""
 
-msgid "Select a distance to look for (km)"
-msgstr ""
-
 msgid "Select a POI"
 msgstr ""
 
@@ -1703,7 +1805,7 @@ msgstr ""
 msgid "Direction"
 msgstr ""
 
-msgid "Distance(m)"
+msgid "Distance"
 msgstr ""
 
 msgid "Name"
@@ -1750,7 +1852,7 @@ msgid "OT"
 msgstr ""
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
+msgid "Route %4.1f%s    %02d:%02d ETA"
 msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
@@ -1973,6 +2075,9 @@ msgstr ""
 msgid "Show Locale"
 msgstr ""
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr ""
 
@@ -2011,731 +2116,863 @@ msgstr ""
 msgid "Please decrease your speed"
 msgstr ""
 
-msgid "partial match"
+msgid "Vehicle Position"
 msgstr ""
 
-#. Android resource: @strings/address_search_button
-msgid "Search"
+msgid "Main menu"
 msgstr ""
 
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
+msgid ""
+"Show\n"
+"Map"
 msgstr ""
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
+msgid "Settings"
 msgstr ""
 
-msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
+msgid "Tools"
 msgstr ""
 
-msgid "Downloaded maps"
+msgid "Route"
 msgstr ""
 
-msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+msgid "About"
 msgstr ""
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
+msgid "Quit"
 msgstr ""
 
-msgid "Cancel"
+msgid "Actions"
 msgstr ""
 
-msgid "filenamePath"
+msgid ""
+"Former\n"
+"Destinations"
 msgstr ""
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+msgid "Coordinates"
 msgstr ""
 
-msgid "Whole Planet"
+msgid ""
+"Stop\n"
+"Navigation"
 msgstr ""
 
-msgid "Africa"
+msgid "Display"
 msgstr ""
 
-msgid "Canary Islands"
+msgid "Fullscreen"
 msgstr ""
 
-msgid "Asia"
+msgid "Window Mode"
 msgstr ""
 
-msgid "Korea"
+msgid "Auto zoom"
 msgstr ""
 
-msgid "Taiwan"
+msgid "Manual zoom"
 msgstr ""
 
-msgid "UAE+Other"
+msgid "Layers"
 msgstr ""
 
-msgid "Oceania"
+msgid "Zoom to route"
 msgstr ""
 
-msgid "Tasmania"
+msgid "Description"
 msgstr ""
 
-msgid "Victoria"
+msgid ""
+"Drop last\n"
+"Waypoint"
 msgstr ""
 
-msgid "New South Wales"
+msgid ""
+"Drop next\n"
+"Waypoint"
 msgstr ""
 
-msgid "Europe"
+msgid "Satellite Status"
 msgstr ""
 
-msgid "Western Europe"
+msgid "NMEA Data"
 msgstr ""
 
-msgid "Azores"
+msgid "car_shortest"
 msgstr ""
 
-msgid "BeNeLux"
+msgid "car_avoid_tolls"
 msgstr ""
 
-msgid "Alsace"
+msgid "car_pedantic"
 msgstr ""
 
-msgid "Aquitaine"
+msgid "horse"
 msgstr ""
 
-msgid "Auvergne"
+msgid "Truck"
 msgstr ""
 
-msgid "Basse-Normandie"
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
 msgstr ""
 
-msgid "Bourgogne"
+#. Android resource: @strings/cancel
+msgid "Cancel"
 msgstr ""
 
-msgid "Bretagne"
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
 msgstr ""
 
-msgid "Centre"
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
 msgstr ""
 
-msgid "Champagne-Ardenne"
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
 msgstr ""
 
-msgid "Corse"
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
 msgstr ""
 
-msgid "Franche-Comte"
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
 msgstr ""
 
-msgid "Haute-Normandie"
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
 msgstr ""
 
-msgid "Ile-de-France"
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
 msgstr ""
 
-msgid "Languedoc-Roussillon"
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
 msgstr ""
 
-msgid "Limousin"
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
 msgstr ""
 
-msgid "Lorraine"
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
 msgstr ""
 
-msgid "Midi-Pyrenees"
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
 msgstr ""
 
-msgid "Nord-pas-de-Calais"
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
 msgstr ""
 
-msgid "Pays-de-la-Loire"
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
 msgstr ""
 
-msgid "Picardie"
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
 msgstr ""
 
-msgid "Poitou-Charentes"
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
 msgstr ""
 
-msgid "Provence-Alpes-Cote-d-Azur"
+#. Android resource: @strings/map_download_title
+msgid "Map download"
 msgstr ""
 
-msgid "Rhone-Alpes"
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
 msgstr ""
 
-msgid "Baden-Wuerttemberg"
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
 msgstr ""
 
-msgid "Bayern"
+#. Android resource: @strings/map_download_ready
+msgid "ready"
 msgstr ""
 
-msgid "Mittelfranken"
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
 msgstr ""
 
-msgid "Niederbayern"
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
 msgstr ""
 
-msgid "Oberbayern"
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
 msgstr ""
 
-msgid "Oberfranken"
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
 msgstr ""
 
-msgid "Oberpfalz"
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
 msgstr ""
 
-msgid "Schwaben"
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
 msgstr ""
 
-msgid "Unterfranken"
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
 msgstr ""
 
-msgid "Berlin"
+#. Android resource: @strings/map_downloading
+msgid "downloading"
 msgstr ""
 
-msgid "Brandenburg"
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
 msgstr ""
 
-msgid "Bremen"
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
 msgstr ""
 
-msgid "Hamburg"
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
 msgstr ""
 
-msgid "Hessen"
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
 msgstr ""
 
-msgid "Mecklenburg-Vorpommern"
+#. Android resource: @strings/address_search_title
+msgid "Address search"
 msgstr ""
 
-msgid "Niedersachsen"
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
 msgstr ""
 
-msgid "Nordrhein-westfalen"
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
 msgstr ""
 
-msgid "Rheinland-Pfalz"
+#. Android resource: @strings/address_search_button
+msgid "Search"
 msgstr ""
 
-msgid "Saarland"
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
 msgstr ""
 
-msgid "Sachsen-Anhalt"
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
 msgstr ""
 
-msgid "Sachsen"
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
 msgstr ""
 
-msgid "Schleswig-Holstein"
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
 msgstr ""
 
-msgid "Thueringen"
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
 msgstr ""
 
-msgid "Mallorca"
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
 msgstr ""
 
-msgid "Galicia"
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
 msgstr ""
 
-msgid "Scandinavia"
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
 msgstr ""
 
-msgid "England"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
 msgstr ""
 
-msgid "Buckinghamshire"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
 msgstr ""
 
-msgid "Cambridgeshire"
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
 msgstr ""
 
-msgid "Cumbria"
+#. Android resource: @strings/restoring
+msgid "Restoring..."
 msgstr ""
 
-msgid "East yorkshire with hull"
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
 msgstr ""
 
-msgid "Essex"
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
 msgstr ""
 
-msgid "Herefordshire"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
 msgstr ""
 
-msgid "Kent"
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
 msgstr ""
 
-msgid "Lancashire"
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
 msgstr ""
 
-msgid "Leicestershire"
+#. Android resource: @strings/restore_successful_please_restart_navit
+msgid ""
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
 
-msgid "Norfolk"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
 msgstr ""
 
-msgid "Nottinghamshire"
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
 msgstr ""
 
-msgid "Oxfordshire"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
 msgstr ""
 
-msgid "Shropshire"
+#. Android resource: @strings/backup
+msgid "Backup"
 msgstr ""
 
-msgid "Somerset"
+#. Android resource: @strings/restore
+msgid "Restore"
 msgstr ""
 
-msgid "South yorkshire"
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
 msgstr ""
 
-msgid "Suffolk"
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
 
-msgid "Surrey"
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
 
-msgid "Wiltshire"
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
 msgstr ""
 
-msgid "Scotland"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
 msgstr ""
 
-msgid "Wales"
+#. Android resource: @strings/africa
+msgid "Africa"
 msgstr ""
 
-msgid "Crete"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
 msgstr ""
 
-msgid "North America"
+#. Android resource: @strings/asia
+msgid "Asia"
 msgstr ""
 
-msgid "Alaska"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
 msgstr ""
 
-msgid "Hawaii"
+#. Android resource: @strings/korea
+msgid "Korea"
 msgstr ""
 
-msgid "USA"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
 msgstr ""
 
-msgid " (except Alaska and Hawaii)"
+#. Android resource: @strings/oceania
+msgid "Oceania"
 msgstr ""
 
-msgid "Midwest"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
 msgstr ""
 
-msgid "Michigan"
+#. Android resource: @strings/victoria
+msgid "Victoria"
 msgstr ""
 
-msgid "Ohio"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
 msgstr ""
 
-msgid "Northeast"
+#. Android resource: @strings/europe
+msgid "Europe"
 msgstr ""
 
-msgid "Massachusetts"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
 msgstr ""
 
-msgid "Vermont"
+#. Android resource: @strings/azores
+msgid "Azores"
 msgstr ""
 
-msgid "Pacific"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
 msgstr ""
 
-msgid "South"
+#. Android resource: @strings/alsace
+msgid "Alsace"
 msgstr ""
 
-msgid "Arkansas"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
 msgstr ""
 
-msgid "District of Columbia"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
 msgstr ""
 
-msgid "Florida"
+#. Android resource: @strings/centre
+msgid "Centre"
 msgstr ""
 
-msgid "Louisiana"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
 msgstr ""
 
-msgid "Maryland"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
 msgstr ""
 
-msgid "Mississippi"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
 msgstr ""
 
-msgid "Oklahoma"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
 msgstr ""
 
-msgid "Texas"
+#. Android resource: @strings/corse
+msgid "Corse"
 msgstr ""
 
-msgid "Virginia"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
 msgstr ""
 
-msgid "West Virginia"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
 msgstr ""
 
-msgid "West"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
 msgstr ""
 
-msgid "Arizona"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
 msgstr ""
 
-msgid "California"
+#. Android resource: @strings/limousin
+msgid "Limousin"
 msgstr ""
 
-msgid "Colorado"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
 msgstr ""
 
-msgid "Idaho"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
 msgstr ""
 
-msgid "Montana"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
 msgstr ""
 
-msgid "New Mexico"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
 msgstr ""
 
-msgid "Nevada"
+#. Android resource: @strings/picardie
+msgid "Picardie"
 msgstr ""
 
-msgid "Oregon"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
 msgstr ""
 
-msgid "Utah"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
 msgstr ""
 
-msgid "Washington State"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
 msgstr ""
 
-msgid "South+Middle America"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
 msgstr ""
 
-msgid "Guyane Francaise"
+#. Android resource: @strings/bayern
+msgid "Bayern"
 msgstr ""
 
-msgid "downloading"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
 msgstr ""
 
-#. Android resource: @strings/map_download_ready
-msgid "ready"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
 msgstr ""
 
-msgid "Media selected for map storage is not available"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
 msgstr ""
 
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
 msgstr ""
 
-msgid "Error downloading map!"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
 msgstr ""
 
-msgid "Error writing map!"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
 msgstr ""
 
-msgid "Map download aborted!"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
 msgstr ""
 
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
+#. Android resource: @strings/berlin
+msgid "Berlin"
 msgstr ""
 
-#. Android resource: @strings/map_download_title
-msgid "Map download"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
 msgstr ""
 
-msgid "Vehicle Position"
+#. Android resource: @strings/bremen
+msgid "Bremen"
 msgstr ""
 
-msgid "Main menu"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
 msgstr ""
 
-msgid ""
-"Show\n"
-"Map"
+#. Android resource: @strings/hessen
+msgid "Hessen"
 msgstr ""
 
-msgid "Settings"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
 msgstr ""
 
-msgid "Tools"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
 msgstr ""
 
-msgid "Route"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
 msgstr ""
 
-msgid "About"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
 msgstr ""
 
-msgid "Quit"
+#. Android resource: @strings/saarland
+msgid "Saarland"
 msgstr ""
 
-msgid "Actions"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
 msgstr ""
 
-msgid ""
-"Former\n"
-"Destinations"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
 msgstr ""
 
-msgid "Coordinates"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
 msgstr ""
 
-msgid ""
-"Stop\n"
-"Navigation"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
 msgstr ""
 
-msgid "Display"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
 msgstr ""
 
-msgid "Fullscreen"
+#. Android resource: @strings/galicia
+msgid "Galicia"
 msgstr ""
 
-msgid "Window Mode"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
 msgstr ""
 
-msgid "Layers"
+#. Android resource: @strings/england
+msgid "England"
 msgstr ""
 
-msgid "Description"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
 msgstr ""
 
-msgid ""
-"Drop last \n"
-"Waypoint"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
 msgstr ""
 
-msgid ""
-"Drop next \n"
-"Waypoint"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
 msgstr ""
 
-msgid "Satellite Status"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
 msgstr ""
 
-msgid "NMEA Data"
+#. Android resource: @strings/essex
+msgid "Essex"
 msgstr ""
 
-msgid "car_shortest"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
 msgstr ""
 
-msgid "car_avoid_tolls"
+#. Android resource: @strings/kent
+msgid "Kent"
 msgstr ""
 
-msgid "car_pedantic"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
 msgstr ""
 
-msgid "horse"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
 msgstr ""
 
-msgid "Truck"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
 msgstr ""
 
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
 msgstr ""
 
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
 msgstr ""
 
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
+#. Android resource: @strings/somerset
+msgid "Somerset"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
 msgstr ""
 
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
+#. Android resource: @strings/surrey
+msgid "Surrey"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
+#. Android resource: @strings/scotland
+msgid "Scotland"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
+#. Android resource: @strings/wales
+msgid "Wales"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
+#. Android resource: @strings/crete
+msgid "Crete"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
+#. Android resource: @strings/north_america
+msgid "North America"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
+#. Android resource: @strings/alaska
+msgid "Alaska"
 msgstr ""
 
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
 msgstr ""
 
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
+#. Android resource: @strings/usa
+msgid "USA"
 msgstr ""
 
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
+#. Android resource: @strings/midwest
+msgid "Midwest"
 msgstr ""
 
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
+#. Android resource: @strings/michigan
+msgid "Michigan"
 msgstr ""
 
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
+#. Android resource: @strings/ohio
+msgid "Ohio"
 msgstr ""
 
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
+#. Android resource: @strings/northeast
+msgid "Northeast"
 msgstr ""
 
-#. Android resource: @strings/address_search_title
-msgid "Address search"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
 msgstr ""
 
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
+#. Android resource: @strings/vermont
+msgid "Vermont"
 msgstr ""
 
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
+#. Android resource: @strings/pacific
+msgid "Pacific"
 msgstr ""
 
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
+#. Android resource: @strings/south
+msgid "South"
 msgstr ""
 
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
 msgstr ""
 
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
 msgstr ""
 
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
+#. Android resource: @strings/florida
+msgid "Florida"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
 msgstr ""
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
+#. Android resource: @strings/maryland
+msgid "Maryland"
 msgstr ""
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
 msgstr ""
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
 msgstr ""
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
+#. Android resource: @strings/texas
+msgid "Texas"
 msgstr ""
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
+#. Android resource: @strings/virginia
+msgid "Virginia"
 msgstr ""
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
 msgstr ""
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
+#. Android resource: @strings/west
+msgid "West"
 msgstr ""
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
+#. Android resource: @strings/arizona
+msgid "Arizona"
 msgstr ""
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
+#. Android resource: @strings/california
+msgid "California"
 msgstr ""
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
+#. Android resource: @strings/colorado
+msgid "Colorado"
 msgstr ""
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
+#. Android resource: @strings/idaho
+msgid "Idaho"
 msgstr ""
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
+#. Android resource: @strings/montana
+msgid "Montana"
 msgstr ""
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
 msgstr ""
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
+#. Android resource: @strings/nevada
+msgid "Nevada"
 msgstr ""
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
+#. Android resource: @strings/oregon
+msgid "Oregon"
 msgstr ""
 
-#. Android resource: @strings/backup
-msgid "Backup"
+#. Android resource: @strings/utah
+msgid "Utah"
 msgstr ""
 
-#. Android resource: @strings/restore
-msgid "Restore"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
 msgstr ""
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
 msgstr ""
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
 msgstr ""
 
 #, c-format
diff --git a/po/fr.po.in b/po/fr.po.in
index 60d708f76..380470f6c 100644
--- a/po/fr.po.in
+++ b/po/fr.po.in
@@ -21,6 +21,7 @@
 # alfred002 https://launchpad.net/~alfred002
 # boism https://launchpad.net/~boism
 # cyp https://launchpad.net/~cyprien-d
+# lains https://launchpad.net/~lains-lp
 # mercier133 https://launchpad.net/~mercierdamien
 # metehyi https://launchpad.net/~metehyi
 # pierre https://launchpad.net/~pmghost4
@@ -30,10 +31,10 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2018-04-13 17:26+0000\n"
-"Last-Translator: Francois.Mocq <francois.mocq@gmail.com>\n"
+"PO-Revision-Date: 2018-10-13 16:09+0000\n"
+"Last-Translator: lains <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -174,7 +175,6 @@ msgstr "%1$svers la %2$s"
 msgid "%1$sonto %2$s|neuter form"
 msgstr "%1$svers l'%2$s"
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "et prendre la bretelle"
 
@@ -243,22 +243,22 @@ msgstr "puis"
 #. 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 "Puis prendre à droite %1$s"
+msgstr "puis s'insérer à droite %1$s"
 
 #. 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 "%1$s prendre à droite %2$s"
+msgstr "%1$s s'insérer à droite %2$s"
 
 #. 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 "Puis prendre à gauche %1$s"
+msgstr "Puis s'insérer à gauche %1$s"
 
 #. 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 "%1$s prendre à gauche %2$s"
+msgstr "%1$s s'insérer à gauche %2$s"
 
 msgid "on your left"
 msgstr "sur votre gauche"
@@ -390,7 +390,6 @@ msgstr "puis vous arriverez à destination"
 msgid "You have reached your destination %s"
 msgstr "Vous êtes arrivé à destination %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr "Echangeur"
 
@@ -414,7 +413,7 @@ msgid "km"
 msgstr "km"
 
 msgid "feet"
-msgstr ""
+msgstr "pieds"
 
 msgid "m"
 msgstr "m"
@@ -476,6 +475,7 @@ msgid "Anguilla"
 msgstr "Anguille"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Albanie"
 
@@ -488,6 +488,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilles néerlandaises"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Angola"
 
@@ -496,6 +497,7 @@ msgid "Antarctica"
 msgstr "Antarctique"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Argentine"
 
@@ -504,10 +506,12 @@ msgid "American Samoa"
 msgstr "Samoa américaines"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Autriche"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Australie"
 
@@ -520,10 +524,12 @@ msgid "Aland Islands"
 msgstr "Åland, îles"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Azerbaïdjan"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnie Herzégovine"
 
@@ -536,6 +542,7 @@ msgid "Bangladesh"
 msgstr "Bengladesh"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "Belgique"
 
@@ -544,6 +551,7 @@ msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "Bulgarie"
 
@@ -552,6 +560,7 @@ msgid "Bahrain"
 msgstr "Bahreïn"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Burundi"
 
@@ -572,6 +581,7 @@ msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Bolivie"
 
@@ -580,6 +590,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr "Bonaire, Saint-Eustache et Saba"
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Brésil"
 
@@ -596,10 +607,12 @@ msgid "Bouvet Island"
 msgstr "Îles Bouvet"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Botswana"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Biélorussie"
 
@@ -608,6 +621,7 @@ msgid "Belize"
 msgstr "Belize"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Canada"
 
@@ -616,6 +630,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Îles Cocos"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "Répulique démocratique du Congo"
 
@@ -628,10 +643,12 @@ msgid "Congo"
 msgstr "Congo"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Suisse"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Côte d'Ivoire"
 
@@ -640,6 +657,7 @@ msgid "Cook Islands"
 msgstr "Îles Cook"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Chili"
 
@@ -648,10 +666,12 @@ msgid "Cameroon"
 msgstr "Cameroun"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "Chine"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Colombie"
 
@@ -660,6 +680,7 @@ msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Cuba"
 
@@ -676,14 +697,17 @@ msgid "Christmas Island"
 msgstr "Île Christmas"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Chypre"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Allemagne"
 
@@ -692,6 +716,7 @@ msgid "Djibouti"
 msgstr "Djibouti"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Danemark"
 
@@ -700,6 +725,7 @@ msgid "Dominica"
 msgstr "Dominique"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "République Dominicaine"
 
@@ -708,10 +734,12 @@ msgid "Algeria"
 msgstr "Algérie"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Équateur"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Estonie"
 
@@ -728,14 +756,17 @@ msgid "Eritrea"
 msgstr "Erythrée"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "Espagne"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Ethiopie"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Finlande"
 
@@ -752,10 +783,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Micronésie, États fédérés de"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Îles Féroé"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "France"
 
@@ -764,6 +797,7 @@ msgid "Gabon"
 msgstr "Gabon"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
@@ -800,6 +834,7 @@ msgid "Gambia"
 msgstr "Gambie"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Guinée"
 
@@ -812,6 +847,7 @@ msgid "Equatorial Guinea"
 msgstr "Guinée équatoriale"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Grèce"
 
@@ -832,6 +868,7 @@ msgid "Guinea-Bissau"
 msgstr "Guinée-Bissau"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Guyane"
 
@@ -848,26 +885,32 @@ msgid "Honduras"
 msgstr "Honduras"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Croatie"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Haïti"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Hongrie"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Indonésie"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Irlande"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Israël"
 
@@ -876,6 +919,7 @@ msgid "Isle of Man"
 msgstr "Ile de Man"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "Inde"
 
@@ -884,18 +928,22 @@ msgid "British Indian Ocean Territory"
 msgstr "Territoire britannique de l'océan Indien"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Irak"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, République islamique d'"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Islande"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Italie"
 
@@ -904,6 +952,7 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Jamaïque"
 
@@ -912,14 +961,17 @@ msgid "Jordan"
 msgstr "Jordanie"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Japon"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Kenya"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Kirghizstan"
 
@@ -956,6 +1008,7 @@ msgid "Cayman Islands"
 msgstr "Îles Cayman"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
@@ -980,26 +1033,32 @@ msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Libéria"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Lesotho"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Lithuanie"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Lettonie"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr "Libye"
 
@@ -1024,6 +1083,7 @@ msgid "Saint Martin (French part)"
 msgstr "Saint Martin"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Madagascar"
 
@@ -1044,6 +1104,7 @@ msgid "Myanmar"
 msgstr "Myanmar"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Mongolie"
 
@@ -1084,10 +1145,12 @@ msgid "Malawi"
 msgstr "Malawi"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "Mexique"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Malaisie"
 
@@ -1096,10 +1159,12 @@ msgid "Mozambique"
 msgstr "Mozambique"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Namibie"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "Nouvelle Calédonie"
 
@@ -1120,6 +1185,7 @@ msgid "Nicaragua"
 msgstr "Nicaragua"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
@@ -1128,6 +1194,7 @@ msgid "Norway"
 msgstr "Norvège"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Népal"
 
@@ -1140,6 +1207,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "Nouvelle-Zélande"
 
@@ -1152,6 +1220,7 @@ msgid "Panama"
 msgstr "Panama"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Pérou"
 
@@ -1164,14 +1233,17 @@ msgid "Papua New Guinea"
 msgstr "Papouasie-Nouvelle-Guinée"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Philippines"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Pakistan"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Pologne"
 
@@ -1192,6 +1264,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Territoire palestinien, occupé"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Portugal"
 
@@ -1200,6 +1273,7 @@ msgid "Palau"
 msgstr "Palau"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Paraguay"
 
@@ -1208,10 +1282,12 @@ msgid "Qatar"
 msgstr "Qatar"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Réunion"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Roumanie"
 
@@ -1220,14 +1296,17 @@ msgid "Serbia"
 msgstr "Serbie"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Russie"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Rwanda"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Arabie Saoudite"
 
@@ -1248,6 +1327,7 @@ msgid "Sweden"
 msgstr "Suède"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Singapour"
 
@@ -1264,6 +1344,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard et Jan Mayen"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Slovaquie"
 
@@ -1284,6 +1365,7 @@ msgid "Somalia"
 msgstr "Somalie"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -1328,6 +1410,7 @@ msgid "Togo"
 msgstr "Togo"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Thailande"
 
@@ -1344,6 +1427,7 @@ msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
@@ -1356,6 +1440,7 @@ msgid "Tonga"
 msgstr "Tonga"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Turquie"
 
@@ -1372,14 +1457,17 @@ msgid "Taiwan, Province of China"
 msgstr "Taïwan, province de Chine"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Tanzanie, République unie de"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Ukraine"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Uganda"
 
@@ -1392,6 +1480,7 @@ msgid "United States"
 msgstr "États-Unis"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -1408,6 +1497,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "Saint-Vincent-et-les Grenadines"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Venezuela"
 
@@ -1444,6 +1534,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
@@ -1481,26 +1572,26 @@ msgstr ""
 "\t-v: affiche la version et quitte.\n"
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr "Pas de fichier de configuration navit.xml, navit.xml.local trouvé\n"
+msgid "No config file navit.xml, navit.xml.local found"
+msgstr "Aucun fichier de configuration (navit.xml, navit.xml.local) trouvé"
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
-msgstr "erreur d'analyse du fichier de configuration '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
+msgstr "Erreur d'analyse du fichier de configuration '%s': %s"
 
 #, c-format
-msgid "Using config file '%s'\n"
-msgstr "utilisation du fichier '%s'\n"
+msgid "Using config file '%s'"
+msgstr "Utilisation du fichier de configuration '%s'"
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
-msgstr "Erreur: Configuration non trouvée dans le fichier '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
+msgstr "Erreur: Aucune configuration trouvée dans le fichier '%s'"
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
-"initialisation interne échouée, arrêt de l'exécution. Vérifiez les messages "
-"d'erreurs précédents.\n"
+"\"Echec de l'initialisation interne , arrêt de l'exécution. Consulter les "
+"messages d'erreur précédents."
 
 msgid "unknown street"
 msgstr "rue inconnue"
@@ -1712,24 +1803,29 @@ msgstr "Taxi"
 msgid "Shopping"
 msgstr "Achats"
 
-msgid "Select a search radius from screen center"
-msgstr "Distance du centre de l'écran"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr "Choisir un rayon de recherche autour du centre de l'écran (en km)"
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
+msgstr "Choisir un rayon de recherche autour du centre de l'écran (en miles)"
 
 #, c-format
 msgid "POI %s. %s"
 msgstr "Point d'intérêt %s. %s"
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
-msgstr "Définir la destination vers %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
+msgstr "Définir la destination vers %ld,%ld "
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
-msgstr "sélectionner la carte de  %ld, %ld \n"
+msgid "Set map to %ld, %ld "
+msgstr "Centrer la carte sur  %ld, %ld \\n "
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
-msgstr "Définir la prochaine visite à %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
+msgstr "Définir la prochaine étape à %ld, %ld\\n "
 
 msgid "POI search"
 msgstr "recherche de point d'intérêt"
@@ -1737,9 +1833,6 @@ msgstr "recherche de point d'intérêt"
 msgid "Select a category"
 msgstr "Sélectionnez une catégorie"
 
-msgid "Select a distance to look for (km)"
-msgstr "Sélectionnez une distance à chercher (km)"
-
 msgid "Select a POI"
 msgstr "Sélectionnez un point d'intérêt"
 
@@ -1752,8 +1845,8 @@ msgstr "Catégorie"
 msgid "Direction"
 msgstr "Direction"
 
-msgid "Distance(m)"
-msgstr "Distance (m)"
+msgid "Distance"
+msgstr "Distance"
 
 msgid "Name"
 msgstr "Nom"
@@ -1889,14 +1982,14 @@ msgstr "Insérer le signet"
 
 #, c-format
 msgid "Bookmark %s"
-msgstr "Ajouter %s aux favoris"
+msgstr "Favoris %s"
 
 #, c-format
 msgid "Download %s"
 msgstr "Télécharger %s"
 
 msgid "Map Download"
-msgstr "Télécharger la carte"
+msgstr "Téléchargement de carte"
 
 msgid "Active"
 msgstr "Actif"
@@ -1905,7 +1998,7 @@ msgid "Download Enabled"
 msgstr "Téléchargement activé"
 
 msgid "Download completely"
-msgstr "Télécharger completement"
+msgstr "Télécharger complètement"
 
 msgid "Show Satellite Status"
 msgstr "Afficher les infos satellite"
@@ -2024,7 +2117,7 @@ msgid "Show Locale"
 msgstr "Afficher la locale"
 
 msgid "Network info"
-msgstr ""
+msgstr "Informations réseau"
 
 msgid "Former Destinations"
 msgstr "Destinations précédentes"
@@ -2064,9 +2157,6 @@ msgstr "Attention ! Contrôle radar !"
 msgid "Please decrease your speed"
 msgstr "Veuillez ralentir"
 
-msgid "filenamePath"
-msgstr "emplacementFichier"
-
 msgid "Vehicle Position"
 msgstr "Position du véhicule"
 
@@ -2125,33 +2215,29 @@ msgid "Window Mode"
 msgstr "Mode fenêtré"
 
 msgid "Auto zoom"
-msgstr ""
+msgstr "Zoom auto"
 
 msgid "Manual zoom"
-msgstr ""
+msgstr "Zoom manuel"
 
 msgid "Layers"
 msgstr "Couches"
 
 msgid "Zoom to route"
-msgstr ""
+msgstr "Zoomer sur le parcours"
 
 msgid "Description"
 msgstr "Description"
 
 msgid ""
-"Drop last \n"
+"Drop last\n"
 "Waypoint"
-msgstr ""
-"Sauter le dernier \n"
-"Point de passage"
+msgstr "Abandonner la\\ndernière étape"
 
 msgid ""
-"Drop next \n"
+"Drop next\n"
 "Waypoint"
-msgstr ""
-"Sauter le prochain \n"
-"point de passage"
+msgstr "Abandonner la\\nprochaine étape"
 
 msgid "Satellite Status"
 msgstr "Etat des satellites"
@@ -2179,6 +2265,10 @@ msgstr "Camion"
 msgid "Yes"
 msgstr "Oui"
 
+#. Android resource: @strings/cancel
+msgid "Cancel"
+msgstr "Annuler"
+
 #. Android resource: @strings/notification_ticker
 msgid "Navit started"
 msgstr "Navit commencé"
@@ -2234,7 +2324,7 @@ msgstr "Télécharger des cartes"
 
 #. Android resource: @strings/optionsmenu_toggle_poi
 msgid "Toggle POIs"
-msgstr "Basculer POIs"
+msgstr "Afficher/masquer POIs"
 
 #. Android resource: @strings/optionsmenu_exit_navit
 msgid "Exit Navit"
@@ -2246,7 +2336,7 @@ msgstr "Sauvegarde / Restauration"
 
 #. Android resource: @strings/optionsmenu_set_map_location
 msgid "Set map location"
-msgstr "sélectionner le chemin de la carte"
+msgstr "Emplacement des cartes"
 
 #. Android resource: @strings/position_popup_drive_here
 msgid "Route to here"
@@ -2258,7 +2348,7 @@ msgstr "Supprimer cette carte?"
 
 #. Android resource: @strings/map_download_title
 msgid "Map download"
-msgstr "Télécharger la carte"
+msgstr "Téléchargement de carte"
 
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
@@ -2284,6 +2374,14 @@ msgstr "Téléchargement de la carte abandonné"
 msgid "Not enough free space"
 msgstr "Pas assez d'espace libre"
 
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+"Désolé, nous ne supportons pas les cartes de plus de 3.8GB sur Android, "
+"merci de sélectionner une carte plus petite."
+
 #. Android resource: @strings/map_no_fix
 msgid "No location. Reopen after location fix."
 msgstr "Pas de géolocalisation. Relancez après obtention d'un signal GPS"
@@ -2292,6 +2390,35 @@ msgstr "Pas de géolocalisation. Relancez après obtention d'un signal GPS"
 msgid "Maps containing current location"
 msgstr "Cartes couvrant la position actuelle"
 
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
+msgstr ""
+
+#. Android resource: @strings/map_downloading
+msgid "downloading"
+msgstr "transfert en cours"
+
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
+msgstr ""
+"Le support sélectionné pour le stockage de la carte n'est pas disponible"
+
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
+msgstr "Erreur d'écriture de carte !"
+
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
+msgstr ""
+
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
+msgstr ""
+
 #. Android resource: @strings/address_search_title
 msgid "Address search"
 msgstr "Cherchez adresse"
@@ -2431,398 +2558,559 @@ msgstr ""
 msgid "One or more ungranted permissions"
 msgstr "Une ou plusieurs autorisations manquantes"
 
-#, c-format
-#~ msgid "Route %4.0fkm    %02d:%02d ETA"
-#~ msgstr "Trajet restant %4.0f km    heure d'arrivée estimée %02d:%02d"
+#. Android resource: @strings/whole_planet
+msgid "Whole Planet"
+msgstr "Terre entière"
 
-#~ msgid "Downloaded maps"
-#~ msgstr "Cartes téléchargées"
+#. Android resource: @strings/africa
+msgid "Africa"
+msgstr "Afrique"
 
-#~ msgid "Taiwan"
-#~ msgstr "Taïwan"
+#. Android resource: @strings/canary_islands
+msgid "Canary Islands"
+msgstr "Îles Canaries"
 
-#~ msgid "Asia"
-#~ msgstr "Asie"
+#. Android resource: @strings/asia
+msgid "Asia"
+msgstr "Asie"
 
-#~ msgid "Canary Islands"
-#~ msgstr "Îles Canaries"
+#. Android resource: @strings/taiwan
+msgid "Taiwan"
+msgstr "Taïwan"
 
-#~ msgid "Africa"
-#~ msgstr "Afrique"
+#. Android resource: @strings/korea
+msgid "Korea"
+msgstr "Corée"
 
-#~ msgid "Korea"
-#~ msgstr "Corée"
+#. Android resource: @strings/uae_other
+msgid "UAE+Other"
+msgstr "EAU+Autres"
 
-#~ msgid "Tasmania"
-#~ msgstr "Tasmanie"
+#. Android resource: @strings/oceania
+msgid "Oceania"
+msgstr "Océanie"
 
-#~ msgid "partial match"
-#~ msgstr "correspondance partielle"
+#. Android resource: @strings/tasmania
+msgid "Tasmania"
+msgstr "Tasmanie"
 
-#~ msgid "downloading"
-#~ msgstr "transfert en cours"
+#. Android resource: @strings/victoria
+msgid "Victoria"
+msgstr "Victoria"
 
-#~ msgid "Whole Planet"
-#~ msgstr "Terre entière"
+#. Android resource: @strings/new_south_wales
+msgid "New South Wales"
+msgstr "Nouvelle-Galles du Sud"
 
-#~ msgid "Map data (c) OpenStreetMap contributors, ODBL"
-#~ msgstr "Données cartographiques (c) OpenStreetMap contributors, ODBL"
+#. Android resource: @strings/europe
+msgid "Europe"
+msgstr "Europe"
 
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
+#. Android resource: @strings/western_europe
+msgid "Western Europe"
+msgstr "Europe de l'Ouest"
 
-#~ msgid "Alsace"
-#~ msgstr "Alsace"
+#. Android resource: @strings/azores
+msgid "Azores"
+msgstr "Açores"
 
-#~ msgid "BeNeLux"
-#~ msgstr "BeNeLux"
+#. Android resource: @strings/benelux
+msgid "BeNeLux"
+msgstr "BeNeLux"
 
-#~ msgid "Oceania"
-#~ msgstr "Océanie"
+#. Android resource: @strings/alsace
+msgid "Alsace"
+msgstr "Alsace"
 
-#~ msgid "Western Europe"
-#~ msgstr "Europe de l'Ouest"
+#. Android resource: @strings/aquitaine
+msgid "Aquitaine"
+msgstr "Aquitaine"
 
-#~ msgid "Azores"
-#~ msgstr "Açores"
+#. Android resource: @strings/auvergne
+msgid "Auvergne"
+msgstr "Auvergne"
 
-#~ msgid "New South Wales"
-#~ msgstr "Nouvelle-Galles du Sud"
+#. Android resource: @strings/centre
+msgid "Centre"
+msgstr "Centre"
 
-#~ msgid "Europe"
-#~ msgstr "Europe"
+#. Android resource: @strings/bretagne
+msgid "Bretagne"
+msgstr "Bretagne"
 
-#~ msgid "Haute-Normandie"
-#~ msgstr "Haute-Normandie"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
+msgstr "Bourgogne"
 
-#~ msgid "Franche-Comte"
-#~ msgstr "Franche-Comté"
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
+msgstr "Basse-Normandie"
 
-#~ msgid "Centre"
-#~ msgstr "Centre"
+#. Android resource: @strings/champagne_ardenne
+msgid "Champagne-Ardenne"
+msgstr "Champagne-Ardenne"
 
-#~ msgid "Bretagne"
-#~ msgstr "Bretagne"
+#. Android resource: @strings/corse
+msgid "Corse"
+msgstr "Corse"
 
-#~ msgid "Corse"
-#~ msgstr "Corse"
+#. Android resource: @strings/franche_comte
+msgid "Franche-Comte"
+msgstr "Franche-Comté"
 
-#~ msgid "Champagne-Ardenne"
-#~ msgstr "Champagne-Ardenne"
+#. Android resource: @strings/haute_normandie
+msgid "Haute-Normandie"
+msgstr "Haute-Normandie"
 
-#~ msgid "Auvergne"
-#~ msgstr "Auvergne"
+#. Android resource: @strings/ile_de_france
+msgid "Ile-de-France"
+msgstr "Île-de-France"
 
-#~ msgid "Aquitaine"
-#~ msgstr "Aquitaine"
+#. Android resource: @strings/languedoc_roussillon
+msgid "Languedoc-Roussillon"
+msgstr "Languedoc-Roussillon"
 
-#~ msgid "Bourgogne"
-#~ msgstr "Bourgogne"
+#. Android resource: @strings/limousin
+msgid "Limousin"
+msgstr "Limousin"
 
-#~ msgid "Basse-Normandie"
-#~ msgstr "Basse-Normandie"
+#. Android resource: @strings/lorraine
+msgid "Lorraine"
+msgstr "Lorraine"
 
-#~ msgid "Ile-de-France"
-#~ msgstr "Île-de-France"
+#. Android resource: @strings/midi_pyrenees
+msgid "Midi-Pyrenees"
+msgstr "Midi-Pyrénées"
 
-#~ msgid "Languedoc-Roussillon"
-#~ msgstr "Languedoc-Roussillon"
+#. Android resource: @strings/nord_pas_de_calais
+msgid "Nord-pas-de-Calais"
+msgstr "Nord-Pas-de-Calais"
 
-#~ msgid "Limousin"
-#~ msgstr "Limousin"
+#. Android resource: @strings/pays_de_la_loire
+msgid "Pays-de-la-Loire"
+msgstr "Pays-de-la-Loire"
 
-#~ msgid "Lorraine"
-#~ msgstr "Lorraine"
+#. Android resource: @strings/picardie
+msgid "Picardie"
+msgstr "Picardie"
 
-#~ msgid "Midi-Pyrenees"
-#~ msgstr "Midi-Pyrénées"
+#. Android resource: @strings/poitou_charentes
+msgid "Poitou-Charentes"
+msgstr "Poitou-Charentes"
 
-#~ msgid "Nord-pas-de-Calais"
-#~ msgstr "Nord-Pas-de-Calais"
+#. Android resource: @strings/provence_alpes_cote_d_azur
+msgid "Provence-Alpes-Cote-d-Azur"
+msgstr "Provence-Alpes-Côte d'Azur"
 
-#~ msgid "Pays-de-la-Loire"
-#~ msgstr "Pays-de-la-Loire"
+#. Android resource: @strings/rhone_alpes
+msgid "Rhone-Alpes"
+msgstr "Rhône-Alpes"
 
-#~ msgid "Picardie"
-#~ msgstr "Picardie"
+#. Android resource: @strings/baden_wuerttemberg
+msgid "Baden-Wuerttemberg"
+msgstr "Bade-Wurtemberg"
 
-#~ msgid "Poitou-Charentes"
-#~ msgstr "Poitou-Charentes"
+#. Android resource: @strings/bayern
+msgid "Bayern"
+msgstr "Bavière"
 
-#~ msgid "Provence-Alpes-Cote-d-Azur"
-#~ msgstr "Provence-Alpes-Côte d'Azur"
+#. Android resource: @strings/mittelfranken
+msgid "Mittelfranken"
+msgstr "Moyenne-Franconie"
 
-#~ msgid "Mittelfranken"
-#~ msgstr "Moyenne-Franconie"
+#. Android resource: @strings/niederbayern
+msgid "Niederbayern"
+msgstr "Basse-Bavière"
 
-#~ msgid "Bayern"
-#~ msgstr "Bavière"
+#. Android resource: @strings/oberbayern
+msgid "Oberbayern"
+msgstr "Basse-Bavière"
 
-#~ msgid "Baden-Wuerttemberg"
-#~ msgstr "Bade-Wurtemberg"
+#. Android resource: @strings/oberfranken
+msgid "Oberfranken"
+msgstr "Haute-Franconie"
 
-#~ msgid "Rhone-Alpes"
-#~ msgstr "Rhône-Alpes"
+#. Android resource: @strings/oberpfalz
+msgid "Oberpfalz"
+msgstr "Haut-Palatinat"
 
-#~ msgid "Oberpfalz"
-#~ msgstr "Haut-Palatinat"
+#. Android resource: @strings/schwaben
+msgid "Schwaben"
+msgstr "Souabe"
 
-#~ msgid "Oberfranken"
-#~ msgstr "Haute-Franconie"
+#. Android resource: @strings/unterfranken
+msgid "Unterfranken"
+msgstr "Basse-Franconie"
 
-#~ msgid "Oberbayern"
-#~ msgstr "Basse-Bavière"
+#. Android resource: @strings/berlin
+msgid "Berlin"
+msgstr "Berlin"
 
-#~ msgid "Unterfranken"
-#~ msgstr "Basse-Franconie"
+#. Android resource: @strings/brandenburg
+msgid "Brandenburg"
+msgstr "Brandebourg"
 
-#~ msgid "Schwaben"
-#~ msgstr "Souabe"
+#. Android resource: @strings/bremen
+msgid "Bremen"
+msgstr "Brême"
 
-#~ msgid "Niederbayern"
-#~ msgstr "Basse-Bavière"
+#. Android resource: @strings/hamburg
+msgid "Hamburg"
+msgstr "Hambourg"
 
-#~ msgid "Rheinland-Pfalz"
-#~ msgstr "Rhénanie-Palatinat"
+#. Android resource: @strings/hessen
+msgid "Hessen"
+msgstr "Hesse"
 
-#~ msgid "Niedersachsen"
-#~ msgstr "Basse-Saxe"
+#. Android resource: @strings/mecklenburg_vorpommern
+msgid "Mecklenburg-Vorpommern"
+msgstr "Mecklembourg-Poméranie occidentale"
 
-#~ msgid "Nordrhein-westfalen"
-#~ msgstr "Rhénanie-du-Nord - Westphalie"
+#. Android resource: @strings/niedersachsen
+msgid "Niedersachsen"
+msgstr "Basse-Saxe"
 
-#~ msgid "Hessen"
-#~ msgstr "Hesse"
+#. Android resource: @strings/nordrhein_westfalen
+msgid "Nordrhein-westfalen"
+msgstr "Rhénanie-du-Nord - Westphalie"
 
-#~ msgid "Mecklenburg-Vorpommern"
-#~ msgstr "Mecklembourg-Poméranie occidentale"
+#. Android resource: @strings/rheinland_pfalz
+msgid "Rheinland-Pfalz"
+msgstr "Rhénanie-Palatinat"
 
-#~ msgid "Bremen"
-#~ msgstr "Brême"
+#. Android resource: @strings/saarland
+msgid "Saarland"
+msgstr "Sarre"
 
-#~ msgid "Hamburg"
-#~ msgstr "Hambourg"
+#. Android resource: @strings/sachsen_anhalt
+msgid "Sachsen-Anhalt"
+msgstr "Saxe-Anhalt"
 
-#~ msgid "Berlin"
-#~ msgstr "Berlin"
+#. Android resource: @strings/sachsen
+msgid "Sachsen"
+msgstr "Saxe"
 
-#~ msgid "Brandenburg"
-#~ msgstr "Brandebourg"
+#. Android resource: @strings/schleswig_holstein
+msgid "Schleswig-Holstein"
+msgstr "Schleswig-Holstein"
 
-#~ msgid "Saarland"
-#~ msgstr "Sarre"
+#. Android resource: @strings/thueringen
+msgid "Thueringen"
+msgstr "Thuringe"
 
-#~ msgid "Galicia"
-#~ msgstr "Galice"
+#. Android resource: @strings/mallorca
+msgid "Mallorca"
+msgstr "Majorque"
 
-#~ msgid "Cambridgeshire"
-#~ msgstr "Cambridgeshire"
+#. Android resource: @strings/galicia
+msgid "Galicia"
+msgstr "Galice"
 
-#~ msgid "Sachsen"
-#~ msgstr "Saxe"
+#. Android resource: @strings/scandinavia
+msgid "Scandinavia"
+msgstr "Scandinavie"
 
-#~ msgid "Sachsen-Anhalt"
-#~ msgstr "Saxe-Anhalt"
+#. Android resource: @strings/england
+msgid "England"
+msgstr "Angleterre"
 
-#~ msgid "Thueringen"
-#~ msgstr "Thuringe"
+#. Android resource: @strings/buckinghamshire
+msgid "Buckinghamshire"
+msgstr "Buckinghamshire"
 
-#~ msgid "Schleswig-Holstein"
-#~ msgstr "Schleswig-Holstein"
+#. Android resource: @strings/cambridgeshire
+msgid "Cambridgeshire"
+msgstr "Cambridgeshire"
 
-#~ msgid "Mallorca"
-#~ msgstr "Majorque"
+#. Android resource: @strings/cumbria
+msgid "Cumbria"
+msgstr "Cumbrie"
 
-#~ msgid "England"
-#~ msgstr "Angleterre"
+#. Android resource: @strings/east_yorkshire_with_hull
+msgid "East yorkshire with hull"
+msgstr "Hull & Yorkshire de l'Est"
 
-#~ msgid "Scandinavia"
-#~ msgstr "Scandinavie"
+#. Android resource: @strings/essex
+msgid "Essex"
+msgstr "Essex"
 
-#~ msgid "Buckinghamshire"
-#~ msgstr "Buckinghamshire"
+#. Android resource: @strings/herefordshire
+msgid "Herefordshire"
+msgstr "Herefordshire"
 
-#~ msgid "Cumbria"
-#~ msgstr "Cumbrie"
+#. Android resource: @strings/kent
+msgid "Kent"
+msgstr "Kent"
 
-#~ msgid "Oregon"
-#~ msgstr "Oregon"
+#. Android resource: @strings/lancashire
+msgid "Lancashire"
+msgstr "Lancashire"
 
-#~ msgid "Nevada"
-#~ msgstr "Nevada"
+#. Android resource: @strings/leicestershire
+msgid "Leicestershire"
+msgstr "Leicestershire"
 
-#~ msgid "New Mexico"
-#~ msgstr "Nouveau-Mexique"
+#. Android resource: @strings/norfolk
+msgid "Norfolk"
+msgstr "Norfolk"
 
-#~ msgid "Arizona"
-#~ msgstr "Arizona"
+#. Android resource: @strings/nottinghamshire
+msgid "Nottinghamshire"
+msgstr "Nottinghamshire"
 
-#~ msgid "West"
-#~ msgstr "Ouest"
+#. Android resource: @strings/oxfordshire
+msgid "Oxfordshire"
+msgstr "Oxfordshire"
 
-#~ msgid "Colorado"
-#~ msgstr "Colorado"
+#. Android resource: @strings/shropshire
+msgid "Shropshire"
+msgstr "Shropshire"
 
-#~ msgid "California"
-#~ msgstr "Californie"
+#. Android resource: @strings/somerset
+msgid "Somerset"
+msgstr "Somerset"
 
-#~ msgid "Montana"
-#~ msgstr "Montana"
+#. Android resource: @strings/south_yorkshire
+msgid "South yorkshire"
+msgstr "Yorkshire de l'Ouest"
 
-#~ msgid "Florida"
-#~ msgstr "Floride"
+#. Android resource: @strings/suffolk
+msgid "Suffolk"
+msgstr "Suffolk"
 
-#~ msgid "Louisiana"
-#~ msgstr "Louisiane"
+#. Android resource: @strings/surrey
+msgid "Surrey"
+msgstr "Surrey"
 
-#~ msgid "Maryland"
-#~ msgstr "Maryland"
+#. Android resource: @strings/wiltshire
+msgid "Wiltshire"
+msgstr "Wiltshire"
 
-#~ msgid "Oklahoma"
-#~ msgstr "Oklahoma"
+#. Android resource: @strings/scotland
+msgid "Scotland"
+msgstr "Écosse"
 
-#~ msgid "Texas"
-#~ msgstr "Texas"
+#. Android resource: @strings/wales
+msgid "Wales"
+msgstr "Pays de Galles"
 
-#~ msgid "Mississippi"
-#~ msgstr "Mississippi"
+#. Android resource: @strings/crete
+msgid "Crete"
+msgstr "Crète"
 
-#~ msgid "West Virginia"
-#~ msgstr "Virginie-Occidentale"
+#. Android resource: @strings/north_america
+msgid "North America"
+msgstr "Amérique du Nord"
 
-#~ msgid "Virginia"
-#~ msgstr "Virginie"
+#. Android resource: @strings/alaska
+msgid "Alaska"
+msgstr "Alaska"
 
-#~ msgid "Idaho"
-#~ msgstr "Idaho"
+#. Android resource: @strings/hawaii
+msgid "Hawaii"
+msgstr "Hawaï"
 
-#~ msgid "Error downloading map!"
-#~ msgstr "Erreur de téléchargement de carte !"
+#. Android resource: @strings/usa
+msgid "USA"
+msgstr "États-Unis"
 
-#~ msgid "Guyane Francaise"
-#~ msgstr "Guyane Française"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
+msgstr ""
 
-#~ msgid "Washington State"
-#~ msgstr "État de Washington"
+#. Android resource: @strings/midwest
+msgid "Midwest"
+msgstr "Midwest"
 
-#~ msgid "Utah"
-#~ msgstr "Utah"
+#. Android resource: @strings/michigan
+msgid "Michigan"
+msgstr "Michigan"
 
-#~ msgid "South"
-#~ msgstr "Sud"
+#. Android resource: @strings/ohio
+msgid "Ohio"
+msgstr "Ohio"
 
-#~ msgid "Arkansas"
-#~ msgstr "Arkansas"
+#. Android resource: @strings/northeast
+msgid "Northeast"
+msgstr "Nord-Est"
 
-#~ msgid "District of Columbia"
-#~ msgstr "District de Columbia"
+#. Android resource: @strings/massachusetts
+msgid "Massachusetts"
+msgstr "Massachusetts"
 
-#~ msgid "Error writing map!"
-#~ msgstr "Erreur d'écriture de carte !"
+#. Android resource: @strings/vermont
+msgid "Vermont"
+msgstr "Vermont"
 
-#~ msgid "Victoria"
-#~ msgstr "Victoria"
+#. Android resource: @strings/pacific
+msgid "Pacific"
+msgstr "Pacifique"
 
-#~ msgid "Oxfordshire"
-#~ msgstr "Oxfordshire"
+#. Android resource: @strings/south
+msgid "South"
+msgstr "Sud"
 
-#~ msgid "Nottinghamshire"
-#~ msgstr "Nottinghamshire"
+#. Android resource: @strings/arkansas
+msgid "Arkansas"
+msgstr "Arkansas"
 
-#~ msgid "Lancashire"
-#~ msgstr "Lancashire"
+#. Android resource: @strings/district_of_columbia
+msgid "District of Columbia"
+msgstr "District de Columbia"
 
-#~ msgid "Kent"
-#~ msgstr "Kent"
+#. Android resource: @strings/florida
+msgid "Florida"
+msgstr "Floride"
 
-#~ msgid "Norfolk"
-#~ msgstr "Norfolk"
+#. Android resource: @strings/louisiana
+msgid "Louisiana"
+msgstr "Louisiane"
 
-#~ msgid "Leicestershire"
-#~ msgstr "Leicestershire"
+#. Android resource: @strings/maryland
+msgid "Maryland"
+msgstr "Maryland"
 
-#~ msgid "Herefordshire"
-#~ msgstr "Herefordshire"
+#. Android resource: @strings/mississippi
+msgid "Mississippi"
+msgstr "Mississippi"
 
-#~ msgid "Essex"
-#~ msgstr "Essex"
+#. Android resource: @strings/oklahoma
+msgid "Oklahoma"
+msgstr "Oklahoma"
 
-#~ msgid "Shropshire"
-#~ msgstr "Shropshire"
+#. Android resource: @strings/texas
+msgid "Texas"
+msgstr "Texas"
 
-#~ msgid "North America"
-#~ msgstr "Amérique du Nord"
+#. Android resource: @strings/virginia
+msgid "Virginia"
+msgstr "Virginie"
 
-#~ msgid "Alaska"
-#~ msgstr "Alaska"
+#. Android resource: @strings/west_virginia
+msgid "West Virginia"
+msgstr "Virginie-Occidentale"
 
-#~ msgid "Crete"
-#~ msgstr "Crète"
+#. Android resource: @strings/west
+msgid "West"
+msgstr "Ouest"
 
-#~ msgid "Somerset"
-#~ msgstr "Somerset"
+#. Android resource: @strings/arizona
+msgid "Arizona"
+msgstr "Arizona"
 
-#~ msgid "Scotland"
-#~ msgstr "Écosse"
+#. Android resource: @strings/california
+msgid "California"
+msgstr "Californie"
 
-#~ msgid "Wales"
-#~ msgstr "Pays de Galles"
+#. Android resource: @strings/colorado
+msgid "Colorado"
+msgstr "Colorado"
 
-#~ msgid " (except Alaska and Hawaii)"
-#~ msgstr " (sans Alaska et Hawaï)"
+#. Android resource: @strings/idaho
+msgid "Idaho"
+msgstr "Idaho"
 
-#~ msgid "USA"
-#~ msgstr "États-Unis"
+#. Android resource: @strings/montana
+msgid "Montana"
+msgstr "Montana"
 
-#~ msgid "Hawaii"
-#~ msgstr "Hawaï"
+#. Android resource: @strings/new_mexico
+msgid "New Mexico"
+msgstr "Nouveau-Mexique"
 
-#~ msgid "Ohio"
-#~ msgstr "Ohio"
+#. Android resource: @strings/nevada
+msgid "Nevada"
+msgstr "Nevada"
 
-#~ msgid "Michigan"
-#~ msgstr "Michigan"
+#. Android resource: @strings/oregon
+msgid "Oregon"
+msgstr "Oregon"
 
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
+#. Android resource: @strings/utah
+msgid "Utah"
+msgstr "Utah"
 
-#~ msgid "UAE+Other"
-#~ msgstr "EAU+Autres"
+#. Android resource: @strings/washington_state
+msgid "Washington State"
+msgstr "État de Washington"
 
-#~ msgid "East yorkshire with hull"
-#~ msgstr "Hull & Yorkshire de l'Est"
+#. Android resource: @strings/south_middle_america
+msgid "South+Middle America"
+msgstr "Amérique (Centrale et Sud)"
 
-#~ msgid "South yorkshire"
-#~ msgstr "Yorkshire de l'Ouest"
+#. Android resource: @strings/guyane_francaise
+msgid "Guyane Francaise"
+msgstr "Guyane Française"
 
-#~ msgid "Pacific"
-#~ msgstr "Pacifique"
+#, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Trajet restant %4.0f km    heure d'arrivée estimée %02d:%02d"
 
-#~ msgid "South+Middle America"
-#~ msgstr "Amérique (Centrale et Sud)"
+#, c-format
+#~ msgid "Using config file '%s'\n"
+#~ msgstr "utilisation du fichier '%s'\n"
 
-#~ msgid "Northeast"
-#~ msgstr "Nord-Est"
+#~ msgid ""
+#~ "Internal initialization failed, exiting. Check previous error messages.\n"
+#~ msgstr ""
+#~ "initialisation interne échouée, arrêt de l'exécution. Vérifiez les messages "
+#~ "d'erreurs précédents.\n"
 
-#~ msgid "Midwest"
-#~ msgstr "Midwest"
+#~ msgid "No config file navit.xml, navit.xml.local found\n"
+#~ msgstr "Pas de fichier de configuration navit.xml, navit.xml.local trouvé\n"
 
-#~ msgid "Massachusetts"
-#~ msgstr "Massachusetts"
+#, c-format
+#~ msgid "Error parsing config file '%s': %s\n"
+#~ msgstr "erreur d'analyse du fichier de configuration '%s': %s\n"
 
-#~ msgid "Suffolk"
-#~ msgstr "Suffolk"
+#~ msgid "Downloaded maps"
+#~ msgstr "Cartes téléchargées"
 
-#~ msgid "Surrey"
-#~ msgstr "Surrey"
+#~ msgid ""
+#~ "Drop last \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Sauter le dernier \n"
+#~ "Point de passage"
+
+#~ msgid ""
+#~ "Drop next \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Sauter le prochain \n"
+#~ "point de passage"
+
+#~ msgid "partial match"
+#~ msgstr "correspondance partielle"
 
-#~ msgid "Wiltshire"
-#~ msgstr "Wiltshire"
+#~ msgid "Map data (c) OpenStreetMap contributors, ODBL"
+#~ msgstr "Données cartographiques (c) OpenStreetMap contributors, ODBL"
+
+#~ msgid "Error downloading map!"
+#~ msgstr "Erreur de téléchargement de carte !"
+
+#~ msgid " (except Alaska and Hawaii)"
+#~ msgstr " (sans Alaska et Hawaï)"
+
+#, c-format
+#~ msgid "Error: No configuration found in config file '%s'\n"
+#~ msgstr "Erreur: Configuration non trouvée dans le fichier '%s'\n"
+
+#, c-format
+#~ msgid "Set destination to %ld, %ld \n"
+#~ msgstr "Définir la destination vers %ld, %ld \n"
+
+#~ msgid "Distance(m)"
+#~ msgstr "Distance (m)"
 
 #, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "puis sortez du rond-point à la %1$s %2$s"
 
+#, c-format
+#~ msgid "Set map to %ld, %ld \n"
+#~ msgstr "sélectionner la carte de  %ld, %ld \n"
+
 #~ msgid ""
 #~ "New location set to %s\n"
 #~ "Restart Navit to apply the changes."
@@ -2836,9 +3124,18 @@ msgstr "Une ou plusieurs autorisations manquantes"
 #~ msgid "%d m"
 #~ msgstr "%d m"
 
-#~ msgid "Media selected for map storage is not available"
-#~ msgstr ""
-#~ "Le support sélectionné pour le stockage de la carte n'est pas disponible"
+#~ msgid "Select a distance to look for (km)"
+#~ msgstr "Sélectionnez une distance à chercher (km)"
+
+#, c-format
+#~ msgid "Set next visit to %ld, %ld \n"
+#~ msgstr "Définir la prochaine visite à %ld, %ld \n"
+
+#~ msgid "Distance from screen center (km)"
+#~ msgstr "Distance du centre de l'écran (km)"
+
+#~ msgid "filenamePath"
+#~ msgstr "emplacementFichier"
 
 #~ msgid ""
 #~ "Current map location %s is not available\n"
@@ -2849,12 +3146,5 @@ msgstr "Une ou plusieurs autorisations manquantes"
 #~ "Veuillez redémarrer Navit après avoir branché une carte SD ou selectionné en "
 #~ "emplacement de carte différent."
 
-#~ msgid ""
-#~ "Sorry, we currently do not support maps above 3.8G on Android, please select "
-#~ "a smaller one."
-#~ msgstr ""
-#~ "Désolé, nous ne supportons pas les cartes de plus de 3.8GB sur Android, "
-#~ "merci de sélectionner une carte plus petite."
-
 #~ msgid "Map download aborted!"
 #~ msgstr "Téléchargement de la carte abandonné!"
diff --git a/po/nl.po.in b/po/nl.po.in
index 353b12e44..6b1936122 100644
--- a/po/nl.po.in
+++ b/po/nl.po.in
@@ -170,7 +170,6 @@ msgstr "%1$s de %2$s op"
 msgid "%1$sonto %2$s|neuter form"
 msgstr "%1$s de %2$s op"
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "naar de oprit"
 
@@ -380,7 +379,6 @@ msgstr "daarna heeft u uw bestemming bereikt."
 msgid "You have reached your destination %s"
 msgstr "Bestemming %s bereikt"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr "Knooppunt"
 
@@ -1796,8 +1794,13 @@ msgstr "Taxi"
 msgid "Shopping"
 msgstr "Winkelen"
 
-msgid "Select a search radius from screen center"
-msgstr "Afstand vanaf schem midden"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
+msgstr ""
 
 #, c-format
 msgid "POI %s. %s"
@@ -1821,9 +1824,6 @@ msgstr "POI zoeken"
 msgid "Select a category"
 msgstr "Kies een categorie"
 
-msgid "Select a distance to look for (km)"
-msgstr "Zoekafstand kiezen (km)"
-
 msgid "Select a POI"
 msgstr "POI selecteren"
 
@@ -1836,8 +1836,8 @@ msgstr "Categorie"
 msgid "Direction"
 msgstr "Richting"
 
-msgid "Distance(m)"
-msgstr "Afstand(m)"
+msgid "Distance"
+msgstr ""
 
 msgid "Name"
 msgstr "Naam"
@@ -2220,18 +2220,14 @@ msgid "Description"
 msgstr "Beschrijving"
 
 msgid ""
-"Drop last \n"
+"Drop last\n"
 "Waypoint"
 msgstr ""
-"Laatste routepunt \n"
-"verwijderen"
 
 msgid ""
-"Drop next \n"
+"Drop next\n"
 "Waypoint"
 msgstr ""
-"Volgende routepunt \n"
-"verwijderen"
 
 msgid "Satellite Status"
 msgstr "GPS-status"
@@ -3073,10 +3069,27 @@ msgstr "Frans Guyana"
 #~ msgid "Map download aborted!"
 #~ msgstr "Kaart-download afgebroken!"
 
+#~ msgid ""
+#~ "Drop last \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Laatste routepunt \n"
+#~ "verwijderen"
+
+#~ msgid ""
+#~ "Drop next \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Volgende routepunt \n"
+#~ "verwijderen"
+
 #, c-format
 #~ msgid "Error: No configuration found in config file '%s'\n"
 #~ msgstr "Fout: Geen configuratie gevonden in configuratiebestand '%s'\n"
 
+#~ msgid "Distance(m)"
+#~ msgstr "Afstand(m)"
+
 #~ msgid ""
 #~ "Current map location %s is not available\n"
 #~ "Please restart Navit after you attach an SD card or select a different map "
@@ -3093,6 +3106,9 @@ msgstr "Frans Guyana"
 #~ "%s is als nieuwe locatie ingesteld.\n"
 #~ "Herstart a.u.b. Navit om de wijzigingen door te voeren."
 
+#~ msgid "Select a distance to look for (km)"
+#~ msgstr "Zoekafstand kiezen (km)"
+
 #~ msgid "Distance from screen center (km)"
 #~ msgstr "Afstand vanaf schem midden (km)"
 
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index 348bd0725..e20c8a1ca 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translations for navit
-# Copyright (C) 2006-2015 The Navit Team
+# Copyright (C) 2006-2018 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # Carla Pita https://launchpad.net/~carla-pita
@@ -22,10 +22,10 @@
 
 msgid ""
 msgstr ""
-"Project-Id-Version: navit 0.5.0\n"
+"Project-Id-Version: navit 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-27 11:44+0000\n"
-"Last-Translator: Julio Alexander Sieg <julio.sieg@gmail.com>\n"
+"PO-Revision-Date: 2018-07-20 01:19+0000\n"
+"Last-Translator: Jairo Roberto Duarte <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -144,7 +144,7 @@ msgstr[1] "em %d quilômetros"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name
 #, c-format
 msgid "%1$sonto the %2$s%3$s%4$s"
-msgstr ""
+msgstr "%1$sno %2$s%3$s%4$s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name
 #, c-format
@@ -154,19 +154,18 @@ msgstr "%1$sno %2$s"
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|masculine form"
-msgstr ""
+msgstr "%1$sno %2$s|formato masculino"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|feminine form"
-msgstr ""
+msgstr "%1$sno %2$s|formato feminino"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included
 #, c-format
 msgid "%1$sonto %2$s|neuter form"
-msgstr ""
+msgstr "%1$sno %2$s|formato neutro"
 
-#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
 msgstr "na rampa"
 
@@ -216,7 +215,7 @@ msgid "Enter the roundabout %s"
 msgstr "Entre na rotatória %s"
 
 msgid "then enter the roundabout"
-msgstr ""
+msgstr "em seguida entre na rotatória"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -235,12 +234,12 @@ msgstr "em seguida"
 #. 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 "em seguida vire a %1$s|direita"
 
 #. 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 "Vire a %1$s%2$s|direita"
 
 #. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
@@ -323,7 +322,7 @@ msgstr "fortemente "
 
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "então pegue a %1$s via para a %2$s"
 
 #, c-format
 msgid "Take the %1$s road to the %2$s"
@@ -379,7 +378,6 @@ msgstr "então você chegará ao destino."
 msgid "You have reached your destination %s"
 msgstr "Você chegará ao destino %s"
 
-#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
 msgstr "Trevo"
 
@@ -396,9 +394,15 @@ msgstr "Comando"
 msgid "Length"
 msgstr "Distância"
 
+msgid "mi"
+msgstr "milha"
+
 msgid "km"
 msgstr "km"
 
+msgid "feet"
+msgstr "pé"
+
 msgid "m"
 msgstr "m"
 
@@ -459,6 +463,7 @@ msgid "Anguilla"
 msgstr "Anguilla"
 
 #. 008
+#. Android resource: @strings/albania
 msgid "Albania"
 msgstr "Albânia"
 
@@ -471,6 +476,7 @@ msgid "Netherlands Antilles"
 msgstr "Antilhas Holandesas"
 
 #. 024
+#. Android resource: @strings/angola
 msgid "Angola"
 msgstr "Angola"
 
@@ -479,6 +485,7 @@ msgid "Antarctica"
 msgstr "Antártida"
 
 #. 032
+#. Android resource: @strings/argentina
 msgid "Argentina"
 msgstr "Argentina"
 
@@ -487,10 +494,12 @@ msgid "American Samoa"
 msgstr "Samoa Americana"
 
 #. 040
+#. Android resource: @strings/austria
 msgid "Austria"
 msgstr "Áustria"
 
 #. 036
+#. Android resource: @strings/australia
 msgid "Australia"
 msgstr "Austrália"
 
@@ -503,10 +512,12 @@ msgid "Aland Islands"
 msgstr "Ilhas Aland"
 
 #. 031
+#. Android resource: @strings/azerbaijan
 msgid "Azerbaijan"
 msgstr "Azerbaijão"
 
 #. 070
+#. Android resource: @strings/bosnia_and_herzegovina
 msgid "Bosnia and Herzegovina"
 msgstr "Bósnia e Herzegovina"
 
@@ -519,6 +530,7 @@ msgid "Bangladesh"
 msgstr "Bangladesh"
 
 #. 056
+#. Android resource: @strings/belgium
 msgid "Belgium"
 msgstr "Bélgica"
 
@@ -527,6 +539,7 @@ msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
 #. 100
+#. Android resource: @strings/bulgaria
 msgid "Bulgaria"
 msgstr "Bulgária"
 
@@ -535,6 +548,7 @@ msgid "Bahrain"
 msgstr "Bahrein"
 
 #. 108
+#. Android resource: @strings/burundi
 msgid "Burundi"
 msgstr "Burundi"
 
@@ -555,6 +569,7 @@ msgid "Brunei Darussalam"
 msgstr "Brunei"
 
 #. 068
+#. Android resource: @strings/bolivia
 msgid "Bolivia"
 msgstr "Bolívia"
 
@@ -563,6 +578,7 @@ msgid "Bonaire, Sint Eustatius and Saba"
 msgstr "Bonaire, São Eustácio e Saba"
 
 #. 076
+#. Android resource: @strings/brazil
 msgid "Brazil"
 msgstr "Brasil"
 
@@ -579,10 +595,12 @@ msgid "Bouvet Island"
 msgstr "Ilha Bouvet"
 
 #. 072
+#. Android resource: @strings/botswana
 msgid "Botswana"
 msgstr "Botswana"
 
 #. 112
+#. Android resource: @strings/belarus
 msgid "Belarus"
 msgstr "Bielorrússia"
 
@@ -591,6 +609,7 @@ msgid "Belize"
 msgstr "Belize"
 
 #. 124
+#. Android resource: @strings/canada
 msgid "Canada"
 msgstr "Canadá"
 
@@ -599,6 +618,7 @@ msgid "Cocos (Keeling) Islands"
 msgstr "Ilhas Cocos (Keeling)"
 
 #. 180
+#. Android resource: @strings/congo
 msgid "Congo, Democratic Republic of the"
 msgstr "República Democrática do Congo"
 
@@ -611,10 +631,12 @@ msgid "Congo"
 msgstr "Congo"
 
 #. 756
+#. Android resource: @strings/switzerland
 msgid "Switzerland"
 msgstr "Suíça"
 
 #. 384
+#. Android resource: @strings/cotedivoire
 msgid "Cote d'Ivoire"
 msgstr "Costa do Marfim"
 
@@ -623,6 +645,7 @@ msgid "Cook Islands"
 msgstr "Ilhas Cook"
 
 #. 152
+#. Android resource: @strings/chile
 msgid "Chile"
 msgstr "Chile"
 
@@ -631,10 +654,12 @@ msgid "Cameroon"
 msgstr "Camarões"
 
 #. 156
+#. Android resource: @strings/china
 msgid "China"
 msgstr "China"
 
 #. 170
+#. Android resource: @strings/colombia
 msgid "Colombia"
 msgstr "Colômbia"
 
@@ -643,6 +668,7 @@ msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. 192
+#. Android resource: @strings/cuba
 msgid "Cuba"
 msgstr "Cuba"
 
@@ -659,14 +685,17 @@ msgid "Christmas Island"
 msgstr "Ilha Christmas"
 
 #. 196
+#. Android resource: @strings/cyprus
 msgid "Cyprus"
 msgstr "Chipre"
 
 #. 203
+#. Android resource: @strings/czech_republic
 msgid "Czech Republic"
 msgstr "República Tcheca"
 
 #. 276
+#. Android resource: @strings/germany
 msgid "Germany"
 msgstr "Alemanha"
 
@@ -675,6 +704,7 @@ msgid "Djibouti"
 msgstr "Djibuti"
 
 #. 208
+#. Android resource: @strings/denmark
 msgid "Denmark"
 msgstr "Dinamarca"
 
@@ -683,6 +713,7 @@ msgid "Dominica"
 msgstr "Dominica"
 
 #. 214
+#. Android resource: @strings/dominican_republic
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
@@ -691,10 +722,12 @@ msgid "Algeria"
 msgstr "Argélia"
 
 #. 218
+#. Android resource: @strings/ecuador
 msgid "Ecuador"
 msgstr "Equador"
 
 #. 233
+#. Android resource: @strings/estonia
 msgid "Estonia"
 msgstr "Estônia"
 
@@ -711,14 +744,17 @@ msgid "Eritrea"
 msgstr "Eritréia"
 
 #. 724
+#. Android resource: @strings/spain
 msgid "Spain"
 msgstr "Espanha"
 
 #. 231
+#. Android resource: @strings/ethiopia
 msgid "Ethiopia"
 msgstr "Etiópia"
 
 #. 246
+#. Android resource: @strings/finland
 msgid "Finland"
 msgstr "Finlândia"
 
@@ -735,10 +771,12 @@ msgid "Micronesia, Federated States of"
 msgstr "Micronésia"
 
 #. 234
+#. Android resource: @strings/faroe_islands
 msgid "Faroe Islands"
 msgstr "Ilhas Faroé"
 
 #. 250
+#. Android resource: @strings/france
 msgid "France"
 msgstr "França"
 
@@ -747,6 +785,7 @@ msgid "Gabon"
 msgstr "Gabão"
 
 #. 826
+#. Android resource: @strings/united_kingdom
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
@@ -783,6 +822,7 @@ msgid "Gambia"
 msgstr "Gâmbia"
 
 #. 324
+#. Android resource: @strings/guinea
 msgid "Guinea"
 msgstr "Guiné"
 
@@ -795,6 +835,7 @@ msgid "Equatorial Guinea"
 msgstr "Guiné Equatorial"
 
 #. 300
+#. Android resource: @strings/greece
 msgid "Greece"
 msgstr "Grécia"
 
@@ -815,6 +856,7 @@ msgid "Guinea-Bissau"
 msgstr "Guiné-Bissau"
 
 #. 328
+#. Android resource: @strings/guyana
 msgid "Guyana"
 msgstr "Guiana"
 
@@ -831,26 +873,32 @@ msgid "Honduras"
 msgstr "Honduras"
 
 #. 191
+#. Android resource: @strings/croatia
 msgid "Croatia"
 msgstr "Croácia"
 
 #. 332
+#. Android resource: @strings/haiti
 msgid "Haiti"
 msgstr "Haiti"
 
 #. 348
+#. Android resource: @strings/hungary
 msgid "Hungary"
 msgstr "Hungria"
 
 #. 360
+#. Android resource: @strings/indonesia
 msgid "Indonesia"
 msgstr "Indonésia"
 
 #. 372
+#. Android resource: @strings/ireland
 msgid "Ireland"
 msgstr "Irlanda"
 
 #. 376
+#. Android resource: @strings/israel
 msgid "Israel"
 msgstr "Israel"
 
@@ -859,6 +907,7 @@ msgid "Isle of Man"
 msgstr "Ilha de Man"
 
 #. 356
+#. Android resource: @strings/india
 msgid "India"
 msgstr "Índia"
 
@@ -867,18 +916,22 @@ msgid "British Indian Ocean Territory"
 msgstr "Território Britânico do Oceano Índico"
 
 #. 368
+#. Android resource: @strings/iraq
 msgid "Iraq"
 msgstr "Iraque"
 
 #. 364
+#. Android resource: @strings/iran
 msgid "Iran, Islamic Republic of"
 msgstr "Irã"
 
 #. 352
+#. Android resource: @strings/iceland
 msgid "Iceland"
 msgstr "Islândia"
 
 #. 380
+#. Android resource: @strings/italy
 msgid "Italy"
 msgstr "Itália"
 
@@ -887,6 +940,7 @@ msgid "Jersey"
 msgstr "Jersey"
 
 #. 388
+#. Android resource: @strings/jamaica
 msgid "Jamaica"
 msgstr "Jamaica"
 
@@ -895,14 +949,17 @@ msgid "Jordan"
 msgstr "Jordânia"
 
 #. 392
+#. Android resource: @strings/japan
 msgid "Japan"
 msgstr "Japão"
 
 #. 404
+#. Android resource: @strings/kenya
 msgid "Kenya"
 msgstr "Quênia"
 
 #. 417
+#. Android resource: @strings/kyrgyzsyan
 msgid "Kyrgyzstan"
 msgstr "Quirguistão"
 
@@ -939,6 +996,7 @@ msgid "Cayman Islands"
 msgstr "Ilhas Caiman"
 
 #. 398
+#. Android resource: @strings/kazakhstan
 msgid "Kazakhstan"
 msgstr "Cazaquistão"
 
@@ -963,26 +1021,32 @@ msgid "Sri Lanka"
 msgstr "Siri Lanka"
 
 #. 430
+#. Android resource: @strings/liberia
 msgid "Liberia"
 msgstr "Libéria"
 
 #. 426
+#. Android resource: @strings/lesotho
 msgid "Lesotho"
 msgstr "Lesoto"
 
 #. 440
+#. Android resource: @strings/lithuania
 msgid "Lithuania"
 msgstr "Lituânia"
 
 #. 442
+#. Android resource: @strings/luxembourg
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
 #. 428
+#. Android resource: @strings/latvia
 msgid "Latvia"
 msgstr "Letônia"
 
 #. 434
+#. Android resource: @strings/libya
 msgid "Libya"
 msgstr "Líbia"
 
@@ -1007,6 +1071,7 @@ msgid "Saint Martin (French part)"
 msgstr "São Martin (parte francesa)"
 
 #. 450
+#. Android resource: @strings/madagascar
 msgid "Madagascar"
 msgstr "Madagascar"
 
@@ -1027,6 +1092,7 @@ msgid "Myanmar"
 msgstr "Mianmar"
 
 #. 496
+#. Android resource: @strings/mongolia
 msgid "Mongolia"
 msgstr "Mongólia"
 
@@ -1067,10 +1133,12 @@ msgid "Malawi"
 msgstr "Malawi"
 
 #. 484
+#. Android resource: @strings/mexico
 msgid "Mexico"
 msgstr "México"
 
 #. 458
+#. Android resource: @strings/malaysia
 msgid "Malaysia"
 msgstr "Malásia"
 
@@ -1079,10 +1147,12 @@ msgid "Mozambique"
 msgstr "Moçambique"
 
 #. 516
+#. Android resource: @strings/namibia
 msgid "Namibia"
 msgstr "Namíbia"
 
 #. 540
+#. Android resource: @strings/new_caledonia
 msgid "New Caledonia"
 msgstr "Nova Caledônia"
 
@@ -1103,6 +1173,7 @@ msgid "Nicaragua"
 msgstr "Nicarágua"
 
 #. 528
+#. Android resource: @strings/netherlands
 msgid "Netherlands"
 msgstr "Holanda"
 
@@ -1111,6 +1182,7 @@ msgid "Norway"
 msgstr "Noruega"
 
 #. 524
+#. Android resource: @strings/nepal
 msgid "Nepal"
 msgstr "Nepal"
 
@@ -1123,6 +1195,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #. 554
+#. Android resource: @strings/newzealand
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
@@ -1135,6 +1208,7 @@ msgid "Panama"
 msgstr "Panamá"
 
 #. 604
+#. Android resource: @strings/peru
 msgid "Peru"
 msgstr "Perú"
 
@@ -1147,14 +1221,17 @@ msgid "Papua New Guinea"
 msgstr "Papua Nova Guiné"
 
 #. 608
+#. Android resource: @strings/philippines
 msgid "Philippines"
 msgstr "Filipinas"
 
 #. 586
+#. Android resource: @strings/pakistan
 msgid "Pakistan"
 msgstr "Paquistão"
 
 #. 616
+#. Android resource: @strings/poland
 msgid "Poland"
 msgstr "Polônia"
 
@@ -1175,6 +1252,7 @@ msgid "Palestinian Territory, Occupied"
 msgstr "Palestina"
 
 #. 620
+#. Android resource: @strings/portugal
 msgid "Portugal"
 msgstr "Portugal"
 
@@ -1183,6 +1261,7 @@ msgid "Palau"
 msgstr "Palau"
 
 #. 600
+#. Android resource: @strings/paraguay
 msgid "Paraguay"
 msgstr "Paraguai"
 
@@ -1191,10 +1270,12 @@ msgid "Qatar"
 msgstr "Catar"
 
 #. 638
+#. Android resource: @strings/reunion
 msgid "Reunion"
 msgstr "Ilhas Reunião"
 
 #. 642
+#. Android resource: @strings/romania
 msgid "Romania"
 msgstr "Romênia"
 
@@ -1203,14 +1284,17 @@ msgid "Serbia"
 msgstr "Sérvia"
 
 #. 643
+#. Android resource: @strings/russian_federation
 msgid "Russian Federation"
 msgstr "Rússia"
 
 #. 646
+#. Android resource: @strings/rwanda
 msgid "Rwanda"
 msgstr "Ruanda"
 
 #. 682
+#. Android resource: @strings/saudi_arabia
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
@@ -1231,6 +1315,7 @@ msgid "Sweden"
 msgstr "Suécia"
 
 #. 702
+#. Android resource: @strings/singapore
 msgid "Singapore"
 msgstr "Singapura"
 
@@ -1247,6 +1332,7 @@ msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard e Jan Mayen"
 
 #. 703
+#. Android resource: @strings/slovakia
 msgid "Slovakia"
 msgstr "Eslováquia"
 
@@ -1267,6 +1353,7 @@ msgid "Somalia"
 msgstr "Somália"
 
 #. 740
+#. Android resource: @strings/suriname
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -1311,6 +1398,7 @@ msgid "Togo"
 msgstr "Togo"
 
 #. 764
+#. Android resource: @strings/thailand
 msgid "Thailand"
 msgstr "Tailândia"
 
@@ -1327,6 +1415,7 @@ msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
 #. 795
+#. Android resource: @strings/turkmenistan
 msgid "Turkmenistan"
 msgstr "Turcomenistão"
 
@@ -1339,6 +1428,7 @@ msgid "Tonga"
 msgstr "Tonga"
 
 #. 792
+#. Android resource: @strings/turkey
 msgid "Turkey"
 msgstr "Turquia"
 
@@ -1355,14 +1445,17 @@ msgid "Taiwan, Province of China"
 msgstr "Taiwan"
 
 #. 834
+#. Android resource: @strings/tanzania
 msgid "Tanzania, United Republic of"
 msgstr "Tanzânia"
 
 #. 804
+#. Android resource: @strings/ukraine
 msgid "Ukraine"
 msgstr "Ucrânia"
 
 #. 800
+#. Android resource: @strings/uganda
 msgid "Uganda"
 msgstr "Uganda"
 
@@ -1375,6 +1468,7 @@ msgid "United States"
 msgstr "Estados Unidos"
 
 #. 858
+#. Android resource: @strings/uruguay
 msgid "Uruguay"
 msgstr "Uruguai"
 
@@ -1391,6 +1485,7 @@ msgid "Saint Vincent and the Grenadines"
 msgstr "São Vicente e Granadinas"
 
 #. 862
+#. Android resource: @strings/venezuela
 msgid "Venezuela"
 msgstr "Venezuela"
 
@@ -1427,6 +1522,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #. 710
+#. Android resource: @strings/south_africa
 msgid "South Africa"
 msgstr "África do Sul"
 
@@ -1464,27 +1560,26 @@ msgstr ""
 "\t-v: imprimir a versão e sair.\n"
 
 #. We have not found an existing config file from all possibilities
-msgid "No config file navit.xml, navit.xml.local found\n"
-msgstr ""
-"Nenhum arquivo de configuração navit.xml, navit.xml.local foi encontrado\n"
+msgid "No config file navit.xml, navit.xml.local found"
+msgstr "Nenhum arquivo de configuração navit.xml, navit.xml.local encontrado"
 
 #, c-format
-msgid "Error parsing config file '%s': %s\n"
-msgstr "Erro ao analizar o arquivo de configuração '%s': %s\n"
+msgid "Error parsing config file '%s': %s"
+msgstr "Erro ao analisar o arquivo de configuração '%s': %s"
 
 #, c-format
-msgid "Using config file '%s'\n"
-msgstr "Utilizando arquivo de configuração '%s'\n"
+msgid "Using config file '%s'"
+msgstr "Usando o arquivo de configuração '%s'"
 
 #, c-format
-msgid "Error: No configuration found in config file '%s'\n"
-msgstr "Erro: Nenhuma configuração encontrada no arquivo '%s'\n"
+msgid "Error: No configuration found in config file '%s'"
+msgstr ""
+"Erro: Nenhuma configuração encontrada no arquivo de configuração '%s'"
 
 msgid ""
-"Internal initialization failed, exiting. Check previous error messages.\n"
+"Internal initialization failed, exiting. Check previous error messages."
 msgstr ""
-"Inicialização interna falhou, finalizando. Verifique mensagens de erro "
-"anteriores.\n"
+"Inicialização interna falhou, saindo. Verificar mensagens de erro anteriores."
 
 msgid "unknown street"
 msgstr "rua desconhecida"
@@ -1624,6 +1719,9 @@ msgstr "Mostrar a posição _cursor"
 msgid "_Lock on Road"
 msgstr "_Bloqueio na estrada"
 
+msgid "_Follow Vehicle"
+msgstr "_Siga o Veículo"
+
 msgid "_Keep orientation to the North"
 msgstr "_Manter orientação para o Norte"
 
@@ -1693,24 +1791,29 @@ msgstr "Táxi"
 msgid "Shopping"
 msgstr "Comprando"
 
-msgid "Select a search radius from screen center"
-msgstr "Distância do centro da tela"
+#. Input is in kilometers
+msgid "Select a search radius from screen center in km"
+msgstr ""
+
+#. Input is in miles.
+msgid "Select a search radius from screen center in miles"
+msgstr ""
 
 #, c-format
 msgid "POI %s. %s"
 msgstr "POI %s. %s"
 
 #, c-format
-msgid "Set destination to %ld, %ld \n"
-msgstr "Definir destino para %ld, %ld \n"
+msgid "Set destination to %ld, %ld "
+msgstr "Definir destino para %ld, %ld "
 
 #, c-format
-msgid "Set map to %ld, %ld \n"
-msgstr "Definir mapa para o %ld, %ld \n"
+msgid "Set map to %ld, %ld "
+msgstr "Definir mapa para %ld, %ld "
 
 #, c-format
-msgid "Set next visit to %ld, %ld \n"
-msgstr "Definir próxima parada parao %ld, %ld \n"
+msgid "Set next visit to %ld, %ld "
+msgstr "Configurar próxima visita para %ld, %ld "
 
 msgid "POI search"
 msgstr "Pesquisar POI"
@@ -1718,9 +1821,6 @@ msgstr "Pesquisar POI"
 msgid "Select a category"
 msgstr "Selecione uma categoria"
 
-msgid "Select a distance to look for (km)"
-msgstr "Selecione a distância para pesquisar (km)"
-
 msgid "Select a POI"
 msgstr "Selecione um POI"
 
@@ -1733,8 +1833,8 @@ msgstr "Categori­a"
 msgid "Direction"
 msgstr "Direção"
 
-msgid "Distance(m)"
-msgstr "Distância (m)"
+msgid "Distance"
+msgstr ""
 
 msgid "Name"
 msgstr "Nome"
@@ -1780,8 +1880,8 @@ msgid "OT"
 msgstr "OT"
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Rota %4.0fkm    TEC %02d:%02d"
+msgid "Route %4.1f%s    %02d:%02d ETA"
+msgstr "Rota %4.1f%s    %02d:%02d ETA"
 
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Rota 0000km  TEC 0+00:00"
@@ -1991,12 +2091,21 @@ msgstr "Layout"
 msgid "Height Profile"
 msgstr "Perfil de Altitude"
 
+msgid "please install a map *.heightlines.bin to provide elevationdata"
+msgstr "Instale um mapa *.heightlines.bin para fornecer dados de elevação"
+
+msgid "The route must cross at least 2 heightlines"
+msgstr "A rota deve atravessar pelo menos 2 linhas de altitude"
+
 msgid "Route Description"
 msgstr "Descrição da Rota"
 
 msgid "Show Locale"
 msgstr "Inf. Regionais"
 
+msgid "Network info"
+msgstr "Informações de rede"
+
 msgid "Former Destinations"
 msgstr "Destinos Anteriores"
 
@@ -2035,751 +2144,996 @@ msgstr "Cuidado! Radar!"
 msgid "Please decrease your speed"
 msgstr "Por favor, reduza a velocidade"
 
-msgid "partial match"
-msgstr "resultado parcial"
+msgid "Vehicle Position"
+msgstr "Posição do Veículo"
+
+msgid "Main menu"
+msgstr "Menu principal"
+
+msgid ""
+"Show\n"
+"Map"
+msgstr ""
+"Mostrar\n"
+"Mapa"
+
+msgid "Settings"
+msgstr "Configurações"
+
+msgid "Tools"
+msgstr "Ferramentas"
+
+msgid "Route"
+msgstr "Rota"
+
+msgid "About"
+msgstr "Sobre"
+
+msgid "Quit"
+msgstr "Sair"
+
+msgid "Actions"
+msgstr "Ações"
+
+msgid ""
+"Former\n"
+"Destinations"
+msgstr ""
+"Destinos\n"
+"Anteriores"
+
+msgid "Coordinates"
+msgstr "Coordenadas"
+
+msgid ""
+"Stop\n"
+"Navigation"
+msgstr ""
+"Parar\n"
+"Navegação"
+
+msgid "Display"
+msgstr "Exibição"
+
+msgid "Fullscreen"
+msgstr "Tela cheia"
+
+msgid "Window Mode"
+msgstr "Modo de Janela"
+
+msgid "Auto zoom"
+msgstr "Zoom automático"
+
+msgid "Manual zoom"
+msgstr "Zoom manual"
+
+msgid "Layers"
+msgstr "Camadas"
+
+msgid "Zoom to route"
+msgstr "Zoom para rota"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid ""
+"Drop last\n"
+"Waypoint"
+msgstr ""
+"Baixe o último\n"
+"Nó"
+
+msgid ""
+"Drop next\n"
+"Waypoint"
+msgstr ""
+"Baixe o próximo\n"
+"Nó"
+
+msgid "Satellite Status"
+msgstr "Estado do Satélite"
+
+msgid "NMEA Data"
+msgstr "Dados NMEA"
+
+msgid "car_shortest"
+msgstr "carro_pequeno"
+
+msgid "car_avoid_tolls"
+msgstr "Evitar pedágios"
+
+msgid "car_pedantic"
+msgstr "detalhe do carro"
+
+msgid "horse"
+msgstr "cavalo"
+
+msgid "Truck"
+msgstr "Caminhão"
+
+#. Strings from android/res/values/strings.xml
+#. Android resource: @strings/yes
+msgid "Yes"
+msgstr "Sim"
+
+#. Android resource: @strings/cancel
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. Android resource: @strings/notification_ticker
+msgid "Navit started"
+msgstr "Navit iniciou"
+
+#. Android resource: @strings/notification_event_default
+msgid "Navit running"
+msgstr "Navit rodando"
+
+#. Android resource: @strings/initial_info_box_title
+msgid "Welcome to Navit"
+msgstr "Bem-vindo ao Navit"
+
+#. Android resource: @strings/initial_info_box_message
+msgid ""
+"Thank you for installing Navit!\n"
+"\n"
+"To start, select \"Download maps\" from the menu to download a map. Note: "
+"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
+"\n"
+"Mapdata: (c) OpenStreetMap contributors\n"
+"\n"
+"Enjoy Navit!"
+msgstr ""
+"Obrigado por instalar Navit!\n"
+"\n"
+"Para começar, selecione \"Importar mapas\" no menu para fazer o download de "
+"um mapa. Nota: O tamanho do arquivo do mapa pode ser grande (> 50MB) - uma "
+"conexão Wi-Fi é recomendada.\n"
+"\n"
+"Mapdata: (c) contribuidores OpenStreetMap\n"
+"\n"
+"Desfrute do Navit!"
+
+#. Android resource: @strings/initial_info_box_OK
+msgid "OK"
+msgstr "OK"
+
+#. Android resource: @strings/initial_info_box_more_info
+msgid "More info"
+msgstr "Mais informações"
+
+#. Android resource: @strings/optionsmenu_zoom_in
+msgid "Zoom in"
+msgstr "Aumentar zoom"
+
+#. Android resource: @strings/optionsmenu_zoom_out
+msgid "Zoom out"
+msgstr "Diminuir zoom"
+
+#. Android resource: @strings/optionsmenu_download_maps
+msgid "Download maps"
+msgstr "Baixar mapas"
+
+#. Android resource: @strings/optionsmenu_toggle_poi
+msgid "Toggle POIs"
+msgstr "Alternar POIs"
+
+#. Android resource: @strings/optionsmenu_exit_navit
+msgid "Exit Navit"
+msgstr "Sair do Navit"
+
+#. Android resource: @strings/optionsmenu_backup_restore
+msgid "Backup / Restore"
+msgstr "Backup / Restauração"
+
+#. Android resource: @strings/optionsmenu_set_map_location
+msgid "Set map location"
+msgstr "Definir localização no mapa"
+
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "Rota até aqui"
+
+#. Android resource: @strings/map_delete
+msgid "Delete this map?"
+msgstr "Excluir este mapa?"
+
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr "Baixa do mapa"
+
+#. Android resource: @strings/map_download_downloading
+msgid "Downloading:"
+msgstr "Baixando:"
+
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr "ETA"
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr "pronto"
+
+#. Android resource: @strings/map_download_download_error
+msgid "Error downloading map."
+msgstr "Erro ao baixar mapa."
+
+#. Android resource: @strings/map_download_download_aborted
+msgid "Map download aborted"
+msgstr "Baixa do mapa abortada"
+
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr "Não há espaço livre suficiente"
+
+#. Android resource: @strings/map_download_oversize
+msgid ""
+"Sorry, we currently do not support maps above 3.8G on Android, please select "
+"a smaller one."
+msgstr ""
+"Desculpe, atualmente não suportamos mapas acima do 3.8G no Android, "
+"selecione um menor."
+
+#. Android resource: @strings/map_no_fix
+msgid "No location. Reopen after location fix."
+msgstr "Nenhum local. Reabrir após corrigir localização"
+
+#. Android resource: @strings/maps_for_current_location
+msgid "Maps containing current location"
+msgstr "Mapas contendo localização atual"
+
+#. Android resource: @strings/maps_installed
+msgid "Installed maps"
+msgstr "Installed maps"
+
+#. Android resource: @strings/map_downloading
+msgid "downloading"
+msgstr "baixando"
+
+#. Android resource: @strings/map_download_medium_unavailable
+msgid "Media selected for map storage is not available"
+msgstr "Mídia selecionada para armazenamento de mapas não está disponível"
+
+#. Android resource: @strings/map_download_error_writing_map
+msgid "Error writing map!"
+msgstr "Erro escrevendo mapa!"
+
+#. Android resource: @strings/map_location_changed
+#, c-format
+msgid "New location set to %s Restart Navit to apply the changes."
+msgstr ""
+"Novo local configurado para %s Reinicie o Navit para aplicar as alterações."
+
+#. Android resource: @strings/map_location_unavailable
+#, c-format
+msgid ""
+"Current map location %s is not available Please restart Navit after you "
+"attach an SD card or select a different map location."
+msgstr ""
+"Localização atual no mapa %s não está disponível. Por favor, reinicie o "
+"Navit depois de conectar um cartão SD ou selecione um local diferente no "
+"mapa."
+
+#. Android resource: @strings/address_search_title
+msgid "Address search"
+msgstr "Pesquisar endereço"
+
+#. Android resource: @strings/address_enter_destination
+msgid "Enter destination"
+msgstr "Digite o destino"
+
+#. Android resource: @strings/address_partial_match
+msgid "Match partial address"
+msgstr "Combine endereço parcial"
 
 #. Android resource: @strings/address_search_button
 msgid "Search"
 msgstr "Pesquisar"
 
+#. Android resource: @strings/address_search_searching
+msgid "Searching..."
+msgstr "Procurando..."
+
+#. Android resource: @strings/address_search_not_found
+msgid "Address not found"
+msgstr "Endereço não encontrado"
+
+#. Android resource: @strings/address_search_getting_results
+msgid "Getting search results"
+msgstr "Obtendo resultados de busca"
+
+#. Android resource: @strings/address_search_loading_results
+msgid "Loading search results"
+msgstr "Carregando resultados da busca"
+
+#. Android resource: @strings/address_search_no_results
+msgid "No results found"
+msgstr "Nenhum resultado encontrado"
+
+#. Android resource: @strings/address_search_no_text_entered
+msgid "No text entered"
+msgstr "Nenhum texto digitado"
+
+#. Android resource: @strings/address_search_set_destination
+msgid "Setting destination to:"
+msgstr "Definir destino para:"
+
 #. Android resource: @strings/address_search_towns
 msgid "Towns"
 msgstr "Cidades"
 
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "Rota até aqui"
+#. Android resource: @strings/choose_an_action
+msgid "Choose an action"
+msgstr "Escolha uma ação"
 
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-msgstr "Dados do mapa (c) colaboradores OpenStreetMap, ODBL"
+#. Android resource: @strings/please_insert_an_sd_card
+msgid "Please insert an SD Card"
+msgstr "Por favor insira um cartão SD"
 
-msgid ""
-"Current map location %s is not available\n"
-"Please restart Navit after you attach an SD card or select a different map "
-"location."
-msgstr ""
+#. Android resource: @strings/backing_up
+msgid "Backing up..."
+msgstr "Cópia de Segurança em andamento..."
+
+#. Android resource: @strings/restoring
+msgid "Restoring..."
+msgstr "Restaurando ..."
+
+#. Android resource: @strings/failed_to_create_backup_directory
+msgid "Failed to create backup directory"
+msgstr "Falha ao criar o diretório da cópia de segurança"
+
+#. Android resource: @strings/backup_failed
+msgid "Backup failed"
+msgstr "Cópia de segurança falhou"
 
-msgid "Downloaded maps"
-msgstr "Mapas baixados"
+#. Android resource: @strings/no_backup_found
+msgid "No backup found"
+msgstr "Não encontrou a cópia de segurança"
+
+#. Android resource: @strings/failed_to_restore
+msgid "Failed to restore"
+msgstr "Falha ao restaurar"
+
+#. Android resource: @strings/backup_successful
+msgid "Backup successful"
+msgstr "Cópia de segurança bem-sucedida"
 
+#. Android resource: @strings/restore_successful_please_restart_navit
 msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
+"Restore Successful\n"
+"Please restart Navit"
 msgstr ""
+"Restauração bem-sucedida\n"
+"Por favor, reinicie Navit"
 
-msgid "Cancel"
-msgstr "Cancelar"
+#. Android resource: @strings/backup_not_found
+msgid "Backup not found"
+msgstr "Cópia de segurança não encontrada"
+
+#. Android resource: @strings/restore_failed
+msgid "Restore failed"
+msgstr "Falha na restauração"
 
-msgid "filenamePath"
+#. Android resource: @strings/select_backup
+msgid "Select backup"
+msgstr "Selecione a cópia de segurança"
+
+#. Android resource: @strings/backup
+msgid "Backup"
+msgstr "Cópia de segurança"
+
+#. Android resource: @strings/restore
+msgid "Restore"
+msgstr "Restaurar"
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr "Faltam dados de texto para o sistema de fala"
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
 msgstr ""
+"Navit pode usar qualquer motor de conversão de texto para voz instalado em "
+"seu dispositivo. O motor atualmente selecionado  informa que é incapaz de "
+"falar em seu idioma. Devemos pedir ao sistema que mostre a caixa de diálogo "
+"de download de voz?"
 
+#. Android resource: @strings/permissions_not_granted
 msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
 msgstr ""
+"Navit precisa de permissão para acessar GPS e ler o mapa. \n"
+"Se você mudar de idéia, por favor, reinicie o Navit e conceda as permissões"
 
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
+msgstr "Uma ou mais permissões não concedidas"
+
+#. Android resource: @strings/whole_planet
 msgid "Whole Planet"
 msgstr "Todo o Planeta"
 
+#. Android resource: @strings/africa
 msgid "Africa"
 msgstr "África"
 
+#. Android resource: @strings/canary_islands
 msgid "Canary Islands"
 msgstr "Ilhas Canárias"
 
+#. Android resource: @strings/asia
 msgid "Asia"
 msgstr "Ásia"
 
-msgid "Korea"
-msgstr "Coréia"
-
+#. Android resource: @strings/taiwan
 msgid "Taiwan"
 msgstr "Taiwan"
 
+#. Android resource: @strings/korea
+msgid "Korea"
+msgstr "Coréia"
+
+#. Android resource: @strings/uae_other
 msgid "UAE+Other"
-msgstr "UAE + Outros"
+msgstr "Emirados Árabes Unidos+Outros"
 
+#. Android resource: @strings/oceania
 msgid "Oceania"
 msgstr "Oceania"
 
+#. Android resource: @strings/tasmania
 msgid "Tasmania"
 msgstr "Tasmânia"
 
+#. Android resource: @strings/victoria
 msgid "Victoria"
 msgstr "Vitória"
 
+#. Android resource: @strings/new_south_wales
 msgid "New South Wales"
 msgstr "Nova Gales do Sul"
 
+#. Android resource: @strings/europe
 msgid "Europe"
 msgstr "Europa"
 
+#. Android resource: @strings/western_europe
 msgid "Western Europe"
 msgstr "Europa Ocidental"
 
+#. Android resource: @strings/azores
 msgid "Azores"
 msgstr "Açores"
 
+#. Android resource: @strings/benelux
 msgid "BeNeLux"
 msgstr "Países Baixos"
 
+#. Android resource: @strings/alsace
 msgid "Alsace"
 msgstr "Alsácia"
 
+#. Android resource: @strings/aquitaine
 msgid "Aquitaine"
 msgstr "Aquitânia"
 
+#. Android resource: @strings/auvergne
 msgid "Auvergne"
 msgstr "Auvergne"
 
-msgid "Basse-Normandie"
-msgstr "Baixa-Normandia"
-
-msgid "Bourgogne"
-msgstr "Borgonha"
+#. Android resource: @strings/centre
+msgid "Centre"
+msgstr "Centro"
 
+#. Android resource: @strings/bretagne
 msgid "Bretagne"
 msgstr "Bretanha"
 
-msgid "Centre"
-msgstr "Centro"
+#. Android resource: @strings/bourgogne
+msgid "Bourgogne"
+msgstr "Borgonha"
+
+#. Android resource: @strings/basse_normandie
+msgid "Basse-Normandie"
+msgstr "Baixa-Normandia"
 
+#. Android resource: @strings/champagne_ardenne
 msgid "Champagne-Ardenne"
 msgstr "Champagne-Ardenne"
 
+#. Android resource: @strings/corse
 msgid "Corse"
 msgstr "Córsega"
 
+#. Android resource: @strings/franche_comte
 msgid "Franche-Comte"
 msgstr "Franche-Comte"
 
+#. Android resource: @strings/haute_normandie
 msgid "Haute-Normandie"
 msgstr "Alta-Normandia"
 
+#. Android resource: @strings/ile_de_france
 msgid "Ile-de-France"
 msgstr "Ile-deFrance"
 
+#. Android resource: @strings/languedoc_roussillon
 msgid "Languedoc-Roussillon"
 msgstr "Languedoc-Roussillon"
 
+#. Android resource: @strings/limousin
 msgid "Limousin"
 msgstr "Limousin"
 
+#. Android resource: @strings/lorraine
 msgid "Lorraine"
 msgstr "Lorena"
 
+#. Android resource: @strings/midi_pyrenees
 msgid "Midi-Pyrenees"
 msgstr "Médio Pirineus"
 
+#. Android resource: @strings/nord_pas_de_calais
 msgid "Nord-pas-de-Calais"
 msgstr "Nord-pas-de-Calais"
 
+#. Android resource: @strings/pays_de_la_loire
 msgid "Pays-de-la-Loire"
 msgstr "País do Loire"
 
+#. Android resource: @strings/picardie
 msgid "Picardie"
 msgstr "Picardia"
 
+#. Android resource: @strings/poitou_charentes
 msgid "Poitou-Charentes"
 msgstr "Poitou-Charentes"
 
+#. Android resource: @strings/provence_alpes_cote_d_azur
 msgid "Provence-Alpes-Cote-d-Azur"
 msgstr "Provença-Alpes-Costa Azul"
 
+#. Android resource: @strings/rhone_alpes
 msgid "Rhone-Alpes"
 msgstr "Rhone-Alpes"
 
+#. Android resource: @strings/baden_wuerttemberg
 msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
 
+#. Android resource: @strings/bayern
 msgid "Bayern"
 msgstr "Bayern"
 
+#. Android resource: @strings/mittelfranken
 msgid "Mittelfranken"
 msgstr "Mittelfranken"
 
+#. Android resource: @strings/niederbayern
 msgid "Niederbayern"
 msgstr "Baixa Bavária"
 
+#. Android resource: @strings/oberbayern
 msgid "Oberbayern"
 msgstr "Alta Bavária"
 
+#. Android resource: @strings/oberfranken
 msgid "Oberfranken"
 msgstr "Alta Franconia"
 
+#. Android resource: @strings/oberpfalz
 msgid "Oberpfalz"
 msgstr "Alto Palatinado"
 
+#. Android resource: @strings/schwaben
 msgid "Schwaben"
 msgstr "Suábia"
 
+#. Android resource: @strings/unterfranken
 msgid "Unterfranken"
 msgstr "Baixa Francônia"
 
+#. Android resource: @strings/berlin
 msgid "Berlin"
 msgstr "Berlim"
 
+#. Android resource: @strings/brandenburg
 msgid "Brandenburg"
 msgstr "Brandenburg"
 
+#. Android resource: @strings/bremen
 msgid "Bremen"
 msgstr "Bremen"
 
+#. Android resource: @strings/hamburg
 msgid "Hamburg"
 msgstr "Hamburgo"
 
+#. Android resource: @strings/hessen
 msgid "Hessen"
 msgstr "Hesse"
 
+#. Android resource: @strings/mecklenburg_vorpommern
 msgid "Mecklenburg-Vorpommern"
 msgstr "Mecklenburgo-Pomerânia Ocidental"
 
+#. Android resource: @strings/niedersachsen
 msgid "Niedersachsen"
 msgstr "Baixa Saxônia"
 
+#. Android resource: @strings/nordrhein_westfalen
 msgid "Nordrhein-westfalen"
 msgstr "Renânia do Norte-Vestfália"
 
+#. Android resource: @strings/rheinland_pfalz
 msgid "Rheinland-Pfalz"
 msgstr "Renânia-Palatinado"
 
+#. Android resource: @strings/saarland
 msgid "Saarland"
 msgstr "Sarre"
 
+#. Android resource: @strings/sachsen_anhalt
 msgid "Sachsen-Anhalt"
 msgstr "Saxônia-Anhalt"
 
+#. Android resource: @strings/sachsen
 msgid "Sachsen"
 msgstr "Saxônia"
 
+#. Android resource: @strings/schleswig_holstein
 msgid "Schleswig-Holstein"
 msgstr "Schleswig-Holstein"
 
+#. Android resource: @strings/thueringen
 msgid "Thueringen"
 msgstr "Turíngia"
 
+#. Android resource: @strings/mallorca
 msgid "Mallorca"
 msgstr "Maiorca"
 
+#. Android resource: @strings/galicia
 msgid "Galicia"
 msgstr "Galicia"
 
+#. Android resource: @strings/scandinavia
 msgid "Scandinavia"
 msgstr "Escandinávia"
 
+#. Android resource: @strings/england
 msgid "England"
 msgstr "Inglaterra"
 
+#. Android resource: @strings/buckinghamshire
 msgid "Buckinghamshire"
 msgstr "Condado de Buckingham"
 
+#. Android resource: @strings/cambridgeshire
 msgid "Cambridgeshire"
 msgstr "Condado de Cambridge"
 
+#. Android resource: @strings/cumbria
 msgid "Cumbria"
 msgstr "Cumbria"
 
+#. Android resource: @strings/east_yorkshire_with_hull
 msgid "East yorkshire with hull"
 msgstr "Condado de York a leste do Hull"
 
+#. Android resource: @strings/essex
 msgid "Essex"
 msgstr "Essex"
 
+#. Android resource: @strings/herefordshire
 msgid "Herefordshire"
 msgstr "Condado de Hereford"
 
+#. Android resource: @strings/kent
 msgid "Kent"
 msgstr "Kent"
 
+#. Android resource: @strings/lancashire
 msgid "Lancashire"
 msgstr "condado de Lanca"
 
+#. Android resource: @strings/leicestershire
 msgid "Leicestershire"
 msgstr "Condado de Leichester"
 
+#. Android resource: @strings/norfolk
 msgid "Norfolk"
 msgstr "Norfolk"
 
+#. Android resource: @strings/nottinghamshire
 msgid "Nottinghamshire"
 msgstr "Condado de Nottinham"
 
+#. Android resource: @strings/oxfordshire
 msgid "Oxfordshire"
 msgstr "Condado de Oxford"
 
+#. Android resource: @strings/shropshire
 msgid "Shropshire"
 msgstr "Condado de Shrop"
 
+#. Android resource: @strings/somerset
 msgid "Somerset"
 msgstr "Somerset"
 
+#. Android resource: @strings/south_yorkshire
 msgid "South yorkshire"
 msgstr "Condado York do Sul"
 
+#. Android resource: @strings/suffolk
 msgid "Suffolk"
 msgstr "Suffolk"
 
+#. Android resource: @strings/surrey
 msgid "Surrey"
 msgstr "Surrey"
 
+#. Android resource: @strings/wiltshire
 msgid "Wiltshire"
 msgstr "condado de Wilt"
 
+#. Android resource: @strings/scotland
 msgid "Scotland"
 msgstr "Escócia"
 
+#. Android resource: @strings/wales
 msgid "Wales"
 msgstr "País de Gales"
 
+#. Android resource: @strings/crete
 msgid "Crete"
 msgstr "Creta"
 
+#. Android resource: @strings/north_america
 msgid "North America"
 msgstr "América do Norte"
 
+#. Android resource: @strings/alaska
 msgid "Alaska"
 msgstr "Alasca"
 
+#. Android resource: @strings/hawaii
 msgid "Hawaii"
 msgstr "Havaí"
 
+#. Android resource: @strings/usa
 msgid "USA"
 msgstr "EUA"
 
-msgid " (except Alaska and Hawaii)"
-msgstr " (exceto Alasca e Havaí)"
+#. Android resource: @strings/except_alaska_and_hawaii
+msgid "(except Alaska and Hawaii)"
+msgstr "(exceto Alasca e Havaí)"
 
+#. Android resource: @strings/midwest
 msgid "Midwest"
 msgstr "Meio Oeste"
 
+#. Android resource: @strings/michigan
 msgid "Michigan"
 msgstr "Michigan"
 
+#. Android resource: @strings/ohio
 msgid "Ohio"
 msgstr "Ohio"
 
+#. Android resource: @strings/northeast
 msgid "Northeast"
 msgstr "Nordeste"
 
+#. Android resource: @strings/massachusetts
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
+#. Android resource: @strings/vermont
 msgid "Vermont"
 msgstr "Vermont"
 
+#. Android resource: @strings/pacific
 msgid "Pacific"
 msgstr "Pacífico"
 
+#. Android resource: @strings/south
 msgid "South"
 msgstr "Sul"
 
+#. Android resource: @strings/arkansas
 msgid "Arkansas"
 msgstr "Arkansas"
 
+#. Android resource: @strings/district_of_columbia
 msgid "District of Columbia"
 msgstr "Distrito de Columbia"
 
+#. Android resource: @strings/florida
 msgid "Florida"
 msgstr "Flórida"
 
+#. Android resource: @strings/louisiana
 msgid "Louisiana"
 msgstr "Luisiana"
 
+#. Android resource: @strings/maryland
 msgid "Maryland"
 msgstr "Maryland"
 
+#. Android resource: @strings/mississippi
 msgid "Mississippi"
 msgstr "Mississippi"
 
+#. Android resource: @strings/oklahoma
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
+#. Android resource: @strings/texas
 msgid "Texas"
 msgstr "Texas"
 
+#. Android resource: @strings/virginia
 msgid "Virginia"
 msgstr "Virginia"
 
+#. Android resource: @strings/west_virginia
 msgid "West Virginia"
 msgstr "Virgínia Ocidental"
 
+#. Android resource: @strings/west
 msgid "West"
 msgstr "Oeste"
 
+#. Android resource: @strings/arizona
 msgid "Arizona"
 msgstr "Arizona"
 
+#. Android resource: @strings/california
 msgid "California"
 msgstr "Califórnia"
 
+#. Android resource: @strings/colorado
 msgid "Colorado"
 msgstr "Colorado"
 
+#. Android resource: @strings/idaho
 msgid "Idaho"
 msgstr "Idaho"
 
+#. Android resource: @strings/montana
 msgid "Montana"
 msgstr "Montana"
 
+#. Android resource: @strings/new_mexico
 msgid "New Mexico"
 msgstr "Novo México"
 
+#. Android resource: @strings/nevada
 msgid "Nevada"
 msgstr "Nevada"
 
+#. Android resource: @strings/oregon
 msgid "Oregon"
 msgstr "Oregon"
 
+#. Android resource: @strings/utah
 msgid "Utah"
 msgstr "Utah"
 
+#. Android resource: @strings/washington_state
 msgid "Washington State"
 msgstr "Washington"
 
+#. Android resource: @strings/south_middle_america
 msgid "South+Middle America"
 msgstr "Sul + América Central"
 
+#. Android resource: @strings/guyane_francaise
 msgid "Guyane Francaise"
 msgstr "Guiana Francesa"
 
-msgid "downloading"
-msgstr "baixando"
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr "pronto"
-
-msgid "Media selected for map storage is not available"
-msgstr ""
-
-#. Android resource: @strings/map_download_not_enough_free_space
-msgid "Not enough free space"
-msgstr "Não há espaço livre suficiente"
-
-msgid "Error downloading map!"
-msgstr "Erro ao baixar o mapa!"
-
-msgid "Error writing map!"
-msgstr "Erro escrevendo mapa!"
-
-msgid "Map download aborted!"
-msgstr "Baixa do mapa abortada!"
-
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr "ETA"
-
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr "Baixa do mapa"
-
-msgid "Vehicle Position"
-msgstr "Posição do Veículo"
-
-msgid "Main menu"
-msgstr "Menu principal"
-
-msgid ""
-"Show\n"
-"Map"
-msgstr ""
-"Mostrar\n"
-"Mapa"
-
-msgid "Settings"
-msgstr "Configurações"
-
-msgid "Tools"
-msgstr "Ferramentas"
-
-msgid "Route"
-msgstr "Rota"
-
-msgid "About"
-msgstr "Sobre"
-
-msgid "Quit"
-msgstr "Sair"
-
-msgid "Actions"
-msgstr "Ações"
-
-msgid ""
-"Former\n"
-"Destinations"
-msgstr ""
-"Destinos\n"
-"Anteriores"
-
-msgid "Coordinates"
-msgstr "Coordenadas"
-
-msgid ""
-"Stop\n"
-"Navigation"
-msgstr ""
-"Parar\n"
-"Navegação"
-
-msgid "Display"
-msgstr "Exibição"
-
-msgid "Fullscreen"
-msgstr "Tela cheia"
-
-msgid "Window Mode"
-msgstr "Modo de Janela"
-
-msgid "Description"
-msgstr "Descrição"
-
-msgid ""
-"Drop last \n"
-"Waypoint"
-msgstr ""
-"Remover último\n"
-"Ponto"
-
-msgid ""
-"Drop next \n"
-"Waypoint"
-msgstr ""
-"Remover próximo\n"
-"Ponto"
-
-msgid "Satellite Status"
-msgstr "Estado do Satélite"
-
-msgid "NMEA Data"
-msgstr "Dados NMEA"
-
-msgid "car_shortest"
-msgstr "carro_pequeno"
-
-msgid "car_avoid_tolls"
-msgstr "Evitar pedágios"
-
-msgid "car_pedantic"
-msgstr "detalhe do carro"
-
-msgid "horse"
-msgstr "cavalo"
-
-msgid "Truck"
-msgstr "Caminhão"
-
-#. Strings from android/res/values/strings.xml
-#. Android resource: @strings/yes
-msgid "Yes"
-msgstr "Sim"
-
-#. Android resource: @strings/notification_ticker
-msgid "Navit started"
-msgstr "Navit iniciou"
-
-#. Android resource: @strings/notification_event_default
-msgid "Navit running"
-msgstr "Navit rodando"
-
-#. Android resource: @strings/initial_info_box_title
-msgid "Welcome to Navit"
-msgstr "Bem-vindo ao Navit"
-
-#. Android resource: @strings/initial_info_box_message
-msgid ""
-"Thank you for installing Navit!\n"
-"\n"
-"To start, select \"Download maps\" from the menu to download a map. Note: "
-"The map filesize may be large (>50MB) - a wifi connection is recommended.\n"
-"\n"
-"Mapdata: (c) OpenStreetMap contributors\n"
-"\n"
-"Enjoy Navit!"
-msgstr ""
-"Obrigado por instalar Navit!\n"
-"\n"
-"Para começar, selecione \"Importar mapas\" no menu para fazer o download de "
-"um mapa. Nota: O tamanho do arquivo do mapa pode ser grande (> 50MB) - uma "
-"conexão Wi-Fi é recomendada.\n"
-"\n"
-"Mapdata: (c) contribuidores OpenStreetMap\n"
-"\n"
-"Desfrute do Navit!"
-
-#. Android resource: @strings/initial_info_box_OK
-msgid "OK"
-msgstr "OK"
-
-#. Android resource: @strings/initial_info_box_more_info
-msgid "More info"
-msgstr "Mais informações"
-
-#. Android resource: @strings/optionsmenu_zoom_in
-msgid "Zoom in"
-msgstr "Aumentar zoom"
-
-#. Android resource: @strings/optionsmenu_zoom_out
-msgid "Zoom out"
-msgstr "Diminuir zoom"
-
-#. Android resource: @strings/optionsmenu_download_maps
-msgid "Download maps"
-msgstr "Baixar mapas"
-
-#. Android resource: @strings/optionsmenu_toggle_poi
-msgid "Toggle POIs"
-msgstr "Alternar POIs"
-
-#. Android resource: @strings/optionsmenu_exit_navit
-msgid "Exit Navit"
-msgstr "Sair do Navit"
-
-#. Android resource: @strings/optionsmenu_backup_restore
-msgid "Backup / Restore"
-msgstr "Backup / Restauração"
-
-#. Android resource: @strings/optionsmenu_set_map_location
-msgid "Set map location"
-msgstr ""
-
-#. Android resource: @strings/map_delete
-msgid "Delete this map?"
-msgstr "Excluir este mapa?"
-
-#. Android resource: @strings/map_download_downloading
-msgid "Downloading:"
-msgstr "Baixando:"
-
-#. Android resource: @strings/map_download_download_error
-msgid "Error downloading map."
-msgstr "Erro ao baixar mapa."
-
-#. Android resource: @strings/map_download_download_aborted
-msgid "Map download aborted"
-msgstr "Baixa do mapa abortada"
-
-#. Android resource: @strings/map_no_fix
-msgid "No location. Reopen after location fix."
-msgstr "Nenhum local. Reabrir após corrigir localização"
-
-#. Android resource: @strings/maps_for_current_location
-msgid "Maps containing current location"
-msgstr "Mapas contendo localização atual"
-
-#. Android resource: @strings/address_search_title
-msgid "Address search"
-msgstr "Pesquisar endereço"
-
-#. Android resource: @strings/address_enter_destination
-msgid "Enter destination"
-msgstr "Digite o destino"
-
-#. Android resource: @strings/address_partial_match
-msgid "Match partial address"
-msgstr "Combine endereço parcial"
-
-#. Android resource: @strings/address_search_searching
-msgid "Searching..."
-msgstr "Procurando..."
-
-#. Android resource: @strings/address_search_not_found
-msgid "Address not found"
-msgstr "Endereço não encontrado"
-
-#. Android resource: @strings/address_search_getting_results
-msgid "Getting search results"
-msgstr "Obtendo resultados de busca"
-
-#. Android resource: @strings/address_search_loading_results
-msgid "Loading search results"
-msgstr "Carregando resultados da busca"
-
-#. Android resource: @strings/address_search_no_results
-msgid "No results found"
-msgstr "Nenhum resultado encontrado"
+#, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Rota %4.0fkm    TEC %02d:%02d"
 
-#. Android resource: @strings/address_search_no_text_entered
-msgid "No text entered"
-msgstr "Nenhum texto digitado"
+#~ msgid "No config file navit.xml, navit.xml.local found\n"
+#~ msgstr ""
+#~ "Nenhum arquivo de configuração navit.xml, navit.xml.local foi encontrado\n"
 
-#. Android resource: @strings/address_search_set_destination
-msgid "Setting destination to:"
-msgstr "Definir destino para:"
+#, c-format
+#~ msgid "Error parsing config file '%s': %s\n"
+#~ msgstr "Erro ao analizar o arquivo de configuração '%s': %s\n"
 
-#. Android resource: @strings/choose_an_action
-msgid "Choose an action"
-msgstr "Escolha uma ação"
+#, c-format
+#~ msgid "Using config file '%s'\n"
+#~ msgstr "Utilizando arquivo de configuração '%s'\n"
 
-#. Android resource: @strings/please_insert_an_sd_card
-msgid "Please insert an SD Card"
-msgstr "Por favor insira um cartão SD"
+#~ msgid ""
+#~ "Internal initialization failed, exiting. Check previous error messages.\n"
+#~ msgstr ""
+#~ "Inicialização interna falhou, finalizando. Verifique mensagens de erro "
+#~ "anteriores.\n"
 
-#. Android resource: @strings/backing_up
-msgid "Backing up..."
-msgstr "Cópia de Segurança em andamento..."
+#~ msgid "Downloaded maps"
+#~ msgstr "Mapas baixados"
 
-#. Android resource: @strings/restoring
-msgid "Restoring..."
-msgstr "Restaurando ..."
+#~ msgid "Map data (c) OpenStreetMap contributors, ODBL"
+#~ msgstr "Dados do mapa (c) colaboradores OpenStreetMap, ODBL"
 
-#. Android resource: @strings/failed_to_create_backup_directory
-msgid "Failed to create backup directory"
-msgstr "Falha ao criar o diretório da cópia de segurança"
+#~ msgid "partial match"
+#~ msgstr "resultado parcial"
 
-#. Android resource: @strings/backup_failed
-msgid "Backup failed"
-msgstr "Cópia de segurança falhou"
+#~ msgid " (except Alaska and Hawaii)"
+#~ msgstr " (exceto Alasca e Havaí)"
 
-#. Android resource: @strings/no_backup_found
-msgid "No backup found"
-msgstr "Não encontrou a cópia de segurança"
+#~ msgid "Error downloading map!"
+#~ msgstr "Erro ao baixar o mapa!"
 
-#. Android resource: @strings/failed_to_restore
-msgid "Failed to restore"
-msgstr "Falha ao restaurar"
+#~ msgid "Map download aborted!"
+#~ msgstr "Baixa do mapa abortada!"
 
-#. Android resource: @strings/backup_successful
-msgid "Backup successful"
-msgstr "Cópia de segurança bem-sucedida"
+#, c-format
+#~ msgid "Error: No configuration found in config file '%s'\n"
+#~ msgstr "Erro: Nenhuma configuração encontrada no arquivo '%s'\n"
 
-#. Android resource: @strings/restore_successful_please_restart_navit
-msgid ""
-"Restore Successful\n"
-"Please restart Navit"
-msgstr ""
-"Restauração bem-sucedida\n"
-"Por favor, reinicie Navit"
+#~ msgid "Distance from screen center (km)"
+#~ msgstr "Distância do centro da tela (km)"
 
-#. Android resource: @strings/backup_not_found
-msgid "Backup not found"
-msgstr "Cópia de segurança não encontrada"
+#, c-format
+#~ msgid "Set destination to %ld, %ld \n"
+#~ msgstr "Definir destino para %ld, %ld \n"
 
-#. Android resource: @strings/restore_failed
-msgid "Restore failed"
-msgstr "Falha na restauração"
+#, c-format
+#~ msgid "Set next visit to %ld, %ld \n"
+#~ msgstr "Definir próxima parada parao %ld, %ld \n"
 
-#. Android resource: @strings/select_backup
-msgid "Select backup"
-msgstr "Selecione a cópia de segurança"
+#, c-format
+#~ msgid "Set map to %ld, %ld \n"
+#~ msgstr "Definir mapa para o %ld, %ld \n"
 
-#. Android resource: @strings/backup
-msgid "Backup"
-msgstr "Cópia de segurança"
+#~ msgid "Select a distance to look for (km)"
+#~ msgstr "Selecione a distância para pesquisar (km)"
 
-#. Android resource: @strings/restore
-msgid "Restore"
-msgstr "Restaurar"
+#~ msgid "Distance(m)"
+#~ msgstr "Distância (m)"
 
-#. Android resource: @strings/TTS_title_data_missing
-msgid "System text to speech engine data is missing"
-msgstr ""
+#~ msgid ""
+#~ "Drop last \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Remover último\n"
+#~ "Ponto"
 
-#. Android resource: @strings/TTS_qery_install_data
-msgid ""
-"Navit can use any text to speech engine installed on your device. The "
-"currently selected engine reports it is unable to speak in your language. "
-"Should we ask the system to show voice download dialog?"
-msgstr ""
+#~ msgid ""
+#~ "Drop next \n"
+#~ "Waypoint"
+#~ msgstr ""
+#~ "Remover próximo\n"
+#~ "Ponto"
 
 #, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "então deixe a rotatória na %1$s %2$s"
+
+#~ msgid "filenamePath"
+#~ msgstr "nome do aquivoPath"
+
+#~ msgid ""
+#~ "New location set to %s\n"
+#~ "Restart Navit to apply the changes."
+#~ msgstr ""
+#~ "Nova localização definida como %s\n"
+#~ "Reinicie o Navit para aplicar as alterações."
+
+#~ msgid ""
+#~ "Current map location %s is not available\n"
+#~ "Please restart Navit after you attach an SD card or select a different map "
+#~ "location."
+#~ msgstr ""
+#~ "O atual localização %s não está disponível no mapa \n"
+#~ "Reinicie o Navit depois de plugar um cartão SD ou selecione outra "
+#~ "localização no mapa."
diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh
index b9ba8d30a..993c0273f 100644
--- a/scripts/build_win32.sh
+++ b/scripts/build_win32.sh
@@ -1,10 +1,17 @@
 #!/usr/bin/env bash
 set -e
-apt-get update && apt-get install -y mingw32 mingw32-binutils mingw32-runtime default-jdk nsis libsaxonb-java
+
+apt-get update && apt-get install -y mingw-w64 mingw-w64-tools  \
+  default-jdk nsis libsaxonb-java curl
 
 mkdir win32
 pushd win32
-cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make -j $(nproc --all)  && make -j $(nproc --all) package
+
+cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \
+  -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ..
+make -j $(nproc --all)
+make -j $(nproc --all) package
+
 popd
 
 cp win32/*.exe $CIRCLE_ARTIFACTS/
diff --git a/scripts/build_wince.sh b/scripts/build_wince.sh
index 7206979e7..20eb5036e 100644
--- a/scripts/build_wince.sh
+++ b/scripts/build_wince.sh
@@ -9,6 +9,7 @@ test -d output && rm -rf output
 mkdir output
 cp navit/navit.exe output/
 cp navit/navit.xml output/
+cp navit/navit_layout*.xml output/
 cp -r locale/ output/
 cp -r navit/icons/ output/
 cp -r ../navit/support/espeak/espeak-data/ output/
diff --git a/scripts/import_translation.sh b/scripts/import_translation.sh
index d1d1f3a6c..fc4117847 100644
--- a/scripts/import_translation.sh
+++ b/scripts/import_translation.sh
@@ -56,6 +56,9 @@ for i in po/import_queue/*.po; do
         mv po/${po}.header po/${po}.in
         sed '1,/msgid ""/ d' ${i} >> po/${po}.in
 
+        # We remove extra whitespaces to make the sanity checks happy
+        sed -i -e 's/ *$//' po/${po}.in
+
 	git status
 	git add po/${po}.in && rm $i
 	git commit -m "Update:i18n:Updated ${lname} translation from launchpad" po/${po}.in
diff --git a/scripts/setup_14.04_requirements.list b/scripts/setup_14.04_requirements.list
new file mode 100644
index 000000000..efa122c7e
--- /dev/null
+++ b/scripts/setup_14.04_requirements.list
@@ -0,0 +1,2 @@
+wget unzip cmake build-essential gettext librsvg2-bin util-linux git ssh
+sed astyle libprotobuf-c0-dev protobuf-c-compiler bash
diff --git a/scripts/setup_common_requirements.sh b/scripts/setup_common_requirements.sh
index 0ca000fa8..0506fff7c 100644
--- a/scripts/setup_common_requirements.sh
+++ b/scripts/setup_common_requirements.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
 set -e
 
-apt-get update && apt-get install -y wget unzip cmake build-essential gettext librsvg2-bin util-linux git ssh sed astyle libxml2-utils
+apt-get update && apt-get install -y wget unzip cmake build-essential \
+  gettext librsvg2-bin util-linux git ssh sed astyle \
+  libprotobuf-c-dev protobuf-c-compiler
diff --git a/scripts/update_download_center.sh b/scripts/update_download_center.sh
index 9b59b457e..8e4359717 100644
--- a/scripts/update_download_center.sh
+++ b/scripts/update_download_center.sh
@@ -69,7 +69,7 @@ cd $UUID/_data/$JOB_NAME
 #############################################
 
 echo "Download metadata of this build"
-wget --no-check-certificate $URL_BUILD_ARTIFACTS -O ${BUILD_NUM}.json
+wget --no-check-certificate $URL_BUILD_ARTIFACTS -O $(printf "%010d" ${BUILD_NUM}).json
 RC=$?
 if [ $RC -ne 0 ]; then
     echo "wget artifacts download failed"
@@ -82,7 +82,7 @@ echo "Push update to ${NAVIT_DOWNLOAD_CENTER_REPO}"
 git config --global push.default simple
 git config user.name "Circle CI"
 git config user.email "circleci@navit-project.org"
-git add ${BUILD_NUM}.json
+git add $(printf "%010d" ${BUILD_NUM}).json
 git commit -m "add:artifacts:Add artifacts for build #${BUILD_NUM} with SHA1:${CIRCLE_SHA1}"
 git push
 RC=$?