Merge branch 'trunk' into traffic

38 files changed, 834 insertions, 1701 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fbde5d317..4ab1b0dc6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,10 +98,14 @@ jobs:
             bash ci/update_download_center.sh
   build_wince:
     docker:
-      - image: navit/wince:8.04
+      - image: navit/dockerfiles:wince
     steps:
       - checkout
       - run:
+          name: Prepare the WinCE build environment
+          command: |
+            bash ci/setup_wince.sh
+      - run:
           name: Build for Windows CE
           command: bash ci/build_wince.sh
       - store_artifacts:
diff --git a/README.md b/README.md
index 152419378..8cd281814 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ destination by assigning a value to each point directly connected to
 destination point. The value represents the estimated time needed to
 pass this distance.
 
-Now the point with the lowest value is choosen using the Fibonacci
+Now the point with the lowest value is chosen using the Fibonacci
 heap and a value is assigned to connected points whos are
 unevaluated or whos current value ist greater than the new one.
 
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 483128558..f84d247af 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -11,13 +11,16 @@ pushd $BUILD_PATH
 
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
 	# If we are building the official trunk code, push an update to coverity
-	wget --progress=dot:giga -c -O /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz
+	curl \
+	    -X POST --data "token=${COVERITY_TOKEN}&project=${CIRCLE_PROJECT_USERNAME}" \
+	    -o /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz -s \
+	    https://scan.coverity.com/download/linux64
+
 	tar xfz /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz --no-same-owner -C /usr/local/share/
 	export PATH=/usr/local/share/cov-analysis-linux64-${COVERITY_VERSION}/bin:$PATH
 	
-	cov-build --dir cov-int cmake ${cmake_opts} ../
-	cov-build --dir cov-int make -j $(nproc --all) || exit -1
-	cov-build --dir cov-int make -j $(nproc --all) package || exit -1
+	cmake ${cmake_opts} ../
+	cov-build --dir cov-int make -j $(nproc --all)
 	tar czvf navit.tgz cov-int
 	
 	curl --form token=$COVERITY_TOKEN \
@@ -27,15 +30,17 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
   --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
   https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME
 
+        make package
+
 	# Then update the translation template on launchpad
 	sed -i '/INTEGER/d' po/navit.pot
 	cp po/navit.pot $CIRCLE_ARTIFACTS/
 	curl "https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -H "$lp_cookie" -H "Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -F file=@po/navit.pot | grep title
 
 else
-	cmake ${cmake_opts} ../ || exit -1
-	make -j $(nproc --all) || exit -1
-	make package || exit -1
+	cmake ${cmake_opts} ../
+	make -j $(nproc --all)
+	make package
 fi
 
 if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
diff --git a/ci/build_win32.sh b/ci/build_win32.sh
index cb05c9b49..6ac301449 100644
--- a/ci/build_win32.sh
+++ b/ci/build_win32.sh
@@ -2,7 +2,7 @@ apt-get update && apt-get install -y mingw32 mingw32-binutils mingw32-runtime de
 
 mkdir win32
 pushd win32
-cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=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/ci/build_wince.sh b/ci/build_wince.sh
index 270583513..a10b2a680 100644
--- a/ci/build_wince.sh
+++ b/ci/build_wince.sh
@@ -12,6 +12,10 @@ cp -r navit/icons/ output
 mkdir output/maps
 cp navit/maps/*.bin output/maps
 cp navit/maps/*.xml output/maps
+rm -rf output/icons/CMakeFiles/ icons/cmake_install.cmake
 
-cd ..
+cd output/
+zip -r navit.zip  .
+
+cd ../..
 bash ./navit/script/cabify.sh wince/output/navit.cab wince/
diff --git a/ci/setup_wince.sh b/ci/setup_wince.sh
new file mode 100644
index 000000000..0169c447c
--- /dev/null
+++ b/ci/setup_wince.sh
@@ -0,0 +1,6 @@
+#/bin/bash
+set -e
+
+mkdir -p /var/lib/apt/lists/partial
+apt-get update
+apt-get install -y git-core
diff --git a/ci/update_download_center.sh b/ci/update_download_center.sh
index cec11808d..34d4a95de 100644
--- a/ci/update_download_center.sh
+++ b/ci/update_download_center.sh
@@ -23,7 +23,7 @@ fi
 if [ -z $CIRCLECI ];then
     echo "This Script needs to be run on CircleCI"
 fi
-if [[ "${CIRCLE_PROJECT_USERNAME}" != "navit-gps" && "${CIRCLE_BRANCH}" != "trunk" ]]; then
+if [[ "${CIRCLE_PROJECT_USERNAME}" != "navit-gps" || "${CIRCLE_BRANCH}" != "trunk" ]]; then
     echo "Only trunk on navit-gps may upload to the Download Center"
     exit 0
 fi
@@ -59,7 +59,7 @@ echo "Init Git Repo"
 export GIT_TERMINAL_PROMPT=0 
 cd $TMP_DIR
 mkdir -p ~/.ssh/
-ssh-keyscan github.com >> ~/.ssh/known_hosts
+ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 git clone $NAVIT_DOWNLOAD_CENTER_REPO $UUID
 if [ ! -d $UUID/_data/$JOB_NAME ]; then
     mkdir -p $UUID/_data/$JOB_NAME
diff --git a/cmake/version.cmake b/cmake/version.cmake
index 41c654d33..e87806c54 100755
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -12,23 +12,22 @@ if (GIT_EXECUTABLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_STRIP_TRAILING_WHITESPACE
    )
-   if(NOT GIT_OUTPUT_DATE)
+   if(GIT_ERROR)
       message(STATUS "Cannot determine current git commit - git error: '${GIT_ERROR}'")
       set(GIT_OUTPUT_DATE "0000000000")
-   else()
-      EXECUTE_PROCESS(
-         COMMAND ${GIT_EXECUTABLE} log "--format='%h'"
-         WORKING_DIRECTORY "${SOURCE_DIR}"
-         OUTPUT_VARIABLE GIT_OUTPUT_HASH
-         ERROR_VARIABLE GIT_ERROR
-         OUTPUT_STRIP_TRAILING_WHITESPACE
-         ERROR_STRIP_TRAILING_WHITESPACE
-      )
-      if(NOT GIT_OUTPUT_HASH)
-         message(STATUS "Cannot determine current git commit - git error: '${GIT_ERROR}'")
-         set(GIT_OUTPUT_HASH "xdevxgitxnotxfound")
-      endif(NOT GIT_OUTPUT_HASH)
-   endif(NOT GIT_OUTPUT_DATE)
+   endif(GIT_ERROR)
+   EXECUTE_PROCESS(
+    COMMAND ${GIT_EXECUTABLE} log "--format='%h'"
+    WORKING_DIRECTORY "${SOURCE_DIR}"
+    OUTPUT_VARIABLE GIT_OUTPUT_HASH
+    ERROR_VARIABLE GIT_ERROR_HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE
+   )
+   if(GIT_ERROR_HASH)
+      message(STATUS "Cannot determine current git hash - git error: '${GIT_ERROR}'")
+      set(GIT_OUTPUT_HASH "xdevxgitxnotxfound")
+   endif(GIT_ERROR_HASH)
 else()
    message(STATUS "git not found, cannot record git commit")
    set(GIT_OUTPUT_DATE "0000000000") # To match length of android versionCode
@@ -37,6 +36,8 @@ endif(GIT_EXECUTABLE)
 
 string(REGEX MATCH "^[0-9]+" VERSION_NUM ${GIT_OUTPUT_DATE} )
 
+set(VERSION ${GIT_OUTPUT_HASH})
+
 EXECUTE_PROCESS(
    COMMAND ${DATE_EXECUTABLE} "+%y%m%d%H%M" "-d \@${VERSION_NUM}" # output as unix timestamp
    WORKING_DIRECTORY "${SOURCE_DIR}"
diff --git a/man/navit.1 b/man/navit.1
index 5deed88d6..df1f0a33d 100644
--- a/man/navit.1
+++ b/man/navit.1
@@ -23,7 +23,7 @@ destination, but also generates directions and even speaks to you.
 
 Navit is translated in more than 40 languages currently, please see https://translations.launchpad.net/navit/trunk
 
-For more informations, please refer to our wiki :
+For more information, please refer to our wiki :
  http://wiki.navit-project.org
 
 You can also try our mailing lists :
diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake
index 7aa882bb8..b5bd757cb 100644
--- a/navit/android/AndroidManifest.xml.cmake
+++ b/navit/android/AndroidManifest.xml.cmake
@@ -37,15 +37,5 @@
         <activity android:name=".NavitDownloadSelectMapActivity"></activity>
         <activity android:name=".NavitAddressResultListActivity"></activity>
         <activity android:name=".FileBrowserActivity"></activity>
-        <activity
-                android:name="org.acra.dialog.CrashReportDialog"
-                android:theme="@android:style/Theme.Dialog"
-                android:launchMode="singleInstance"
-                android:excludeFromRecents="true"
-                android:finishOnTaskLaunch="true"/>
-        <service
-                android:name="org.acra.sender.SenderService"
-                android:exported="false"
-                android:process=":acra" />
     </application>
 </manifest> 
diff --git a/navit/android/android_layout_default_new.xml b/navit/android/android_layout_default_new.xml
index d36659f1e..8433ad6a2 100644
--- a/navit/android/android_layout_default_new.xml
+++ b/navit/android/android_layout_default_new.xml
@@ -834,7 +834,7 @@
 					<icon src="danger_16_16.png"/>
 				</itemgra>
 				<itemgra item_types="poi_forbidden_area" order="13-">
-					<icon src="forbiden_area.png"/>
+					<icon src="forbidden_area.png"/>
 				</itemgra>
 				<itemgra item_types="poi_tunnel" order="12-">
 					<icon src="tunnel.png"/>
diff --git a/navit/android/libs/acra-4.8.5.jar b/navit/android/libs/acra-4.8.5.jar
deleted file mode 100644
index f0044ece8..000000000
--- a/navit/android/libs/acra-4.8.5.jar
+++ /dev/null
diff --git a/navit/android/src/org/navitproject/navit/NavitAppConfig.java b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
index 13ccc9bb4..1a1a61f94 100755
--- a/navit/android/src/org/navitproject/navit/NavitAppConfig.java
+++ b/navit/android/src/org/navitproject/navit/NavitAppConfig.java
@@ -8,13 +8,7 @@ import org.navitproject.navit.NavitAddressSearchActivity.NavitAddress;
 import android.app.Application;

 import android.content.SharedPreferences;

 import android.util.Log;

-import org.acra.*;

-import org.acra.annotation.*;

 

-//@ReportsCrashes(formKey = "dGlrNVRIOVVKYjB0UGVoLUZPanlzWFE6MQ")

-@ReportsCrashes(mailTo = "android@navit-project.org",

-		mode = ReportingInteractionMode.TOAST,

-                resToastText = R.string.app_name)

 

 public class NavitAppConfig extends Application {

 

@@ -27,19 +21,6 @@ public class NavitAppConfig extends Application {
 

 	@Override

 	public void onCreate() {

-		// call ACRA.init(this) as reflection, because old ant may forgot to include it

-		try {

-			Class<?> acraClass = Class.forName("org.acra.ACRA");

-			Class<?> partypes[] = new Class[1];

-			partypes[0] = Application.class;

-			java.lang.reflect.Method initMethod = acraClass.getMethod("init", partypes);

-			Object arglist[] = new Object[1];

-			arglist[0] = this;

-			initMethod.invoke(null, arglist);

-		} catch (Exception e1) {

-			Log.e(TAG, "Could not init ACRA crash reporter");

-		}

-

 		mSettings = getSharedPreferences(Navit.NAVIT_PREFS, MODE_PRIVATE);

 		super.onCreate();

 	}

diff --git a/navit/android/src/org/navitproject/navit/NavitVehicle.java b/navit/android/src/org/navitproject/navit/NavitVehicle.java
index 313502b96..e1a9c70f1 100644
--- a/navit/android/src/org/navitproject/navit/NavitVehicle.java
+++ b/navit/android/src/org/navitproject/navit/NavitVehicle.java
@@ -20,11 +20,12 @@
 package org.navitproject.navit;
 
 import java.util.List;
-
+import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.location.Criteria;
 import android.location.GpsSatellite;
 import android.location.GpsStatus;
@@ -33,6 +34,9 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.util.Log;
+import android.support.v4.content.ContextCompat;
+
+
 
 public class NavitVehicle {
 	
@@ -76,6 +80,11 @@ public class NavitVehicle {
 		 * Called when the status of the GPS changes.
 		 */
 		public void onGpsStatusChanged (int event) {
+			if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.ACCESS_FINE_LOCATION)
+				!= PackageManager.PERMISSION_GRANTED) {
+			// Permission is not granted
+			return;
+			}
 			GpsStatus status = sLocationManager.getGpsStatus(null);
 			int satsInView = 0;
 			int satsUsed = 0;
@@ -110,6 +119,11 @@ public class NavitVehicle {
 	 * {@code android.location.GPS_FIX_CHANGE} is received, indicating a change in GPS fix status
 	 */
 	NavitVehicle (Context context, int pcbid, int scbid, int fcbid) {
+		if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.ACCESS_FINE_LOCATION)
+				!= PackageManager.PERMISSION_GRANTED) {
+			// Permission is not granted
+			return;
+		}
 		this.context = context;
 		sLocationManager = (LocationManager)context.getSystemService(Context.LOCATION_SERVICE);
 		preciseLocationListener = new NavitLocationListener();
diff --git a/navit/attr.c b/navit/attr.c
index 24b6cbe6a..18ad79f64 100644
--- a/navit/attr.c
+++ b/navit/attr.c
@@ -605,7 +605,8 @@ attr_generic_get_attr(struct attr **attrs, struct attr **def_attrs, enum attr_ty
  * contain an attribute whose type matches that of the new one, the new
  * attribute is inserted into the list.
  *
- * @param attrs Points to the array of attribute pointers to be updated
+ * @param attrs Points to the array of attribute pointers to be updated (if NULL, this function will
+ * create a new list containing only the new attribute)
  * @param attr The new attribute.
  * @return Pointer to the updated attribute list
  */
@@ -689,6 +690,19 @@ attr_generic_prepend_attr(struct attr **attrs, struct attr *attr)
 	return curr;
 }
 
+/**
+ * @brief Removes an attribute from an attribute list.
+ *
+ * If `attrs` contains `attr`, a new attribute list is created (which contains all attributes, except
+ * for `attr`) and both `attrs` (the original attribute list) and `attr` are freed.
+ *
+ * If `attrs` does not contain `attr`, this function is a no-op.
+ *
+ * @param attrs The attribute list
+ * @param attr The attribute to remove from the list
+ *
+ * @return The new attribute list
+ */
 struct attr **
 attr_generic_remove_attr(struct attr **attrs, struct attr *attr)
 {
@@ -889,6 +903,15 @@ attr_dup(struct attr *attr)
 	return ret;
 }
 
+/**
+ * @brief Frees a list of attributes.
+ *
+ * This frees the pointer array as well as the attributes referenced by the pointers.
+ *
+ * It is safe to call this function with a NULL argument; doing so is a no-op.
+ *
+ * @param attrs The attribute list to free
+ */
 void
 attr_list_free(struct attr **attrs)
 {
@@ -899,6 +922,17 @@ attr_list_free(struct attr **attrs)
 	g_free(attrs);
 }
 
+/**
+ * @brief Duplicates a list of attributes.
+ *
+ * This creates a deep copy, i.e. the attributes in the list are copied as well.
+ *
+ * It is safe to call this function with a NULL argument; in this case, NULL will be returned.
+ *
+ * @param attrs The attribute list to copy
+ *
+ * @return The copy of the attribute list
+ */
 struct attr **
 attr_list_dup(struct attr **attrs)
 {
diff --git a/navit/attr_def.h b/navit/attr_def.h
index 987c0072e..c91b2fb75 100644
--- a/navit/attr_def.h
+++ b/navit/attr_def.h
@@ -433,6 +433,8 @@ ATTR(text_color)
 ATTR(idle_color)
 ATTR(background_color2)
 ATTR(text_background)
+ATTR(destination_dir_color)
+ATTR(north_color)
 ATTR2(0x0007ffff,type_color_end)
 ATTR2(0x00080000,type_object_begin)
 ATTR(navit)
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index cf8fe2384..ddeb3e8bb 100644
--- a/navit/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
@@ -1405,12 +1405,6 @@ request_navit_zoom(DBusConnection *connection, DBusMessage *message)
 
 }
 
-/**
- * @brief Exports the current route as a GPX file
- * @param connection The DBusConnection object through which a message arrived
- * @param message The DBusMessage including the 'filename' parameter
- * @returns An empty reply if everything went right, otherwise DBUS_HANDLER_RESULT_NOT_YET_HANDLED
- */
 static DBusHandlerResult
 request_navit_zoom_to_route(DBusConnection *connection, DBusMessage *message)
 {
@@ -1430,6 +1424,13 @@ request_navit_zoom_to_route(DBusConnection *connection, DBusMessage *message)
 
 }
 
+/**
+ * @brief Exports the current route as a GPX file.
+ *
+ * @param connection The DBusConnection object through which a message arrived
+ * @param message The DBusMessage including the `filename` parameter
+ * @returns An empty reply if everything went right, otherwise `DBUS_HANDLER_RESULT_NOT_YET_HANDLED`
+ */
 static DBusHandlerResult
 request_navit_route_export_gpx(DBusConnection *connection, DBusMessage *message)
 {
diff --git a/navit/command.c b/navit/command.c
index 4208c575c..3a7d8b154 100644
--- a/navit/command.c
+++ b/navit/command.c
@@ -621,7 +621,7 @@ result_op(struct context *ctx, enum op_type op_type, const char *op, struct resu
 	default:
 		break;
 	}
-	dbg(lvl_error,"Unkown op %d %s\n",op_type,op);
+	dbg(lvl_error,"Unknown op %d %s\n",op_type,op);
 	ctx->error=internal;
 }
 
diff --git a/navit/fib-1.1/configure b/navit/fib-1.1/configure
deleted file mode 100755
index 62eaa3d01..000000000
--- a/navit/fib-1.1/configure
+++ /dev/null
@@ -1,1045 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=fib.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:529: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 544 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 561 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 578 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:609: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 614 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 639 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 657 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 678 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-for ac_hdr in limits.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:716: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 721 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:754: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 761 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@CPP@%$CPP%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/navit/fib-1.1/configure.in b/navit/fib-1.1/configure.in
deleted file mode 100644
index 827015270..000000000
--- a/navit/fib-1.1/configure.in
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(fib.c)
-
-dnl Checks for programs.
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(limits.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-
-dnl Checks for library functions.
-
-AC_OUTPUT(Makefile)
diff --git a/navit/graphics.c b/navit/graphics.c
index f89a4f89d..378f177fb 100644
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -1829,7 +1829,19 @@ clip_line(struct wpoint *p1, struct wpoint *p2, struct point_rect *clip_rect)
 	return ret;
 }
 
-static void
+/**
+ * @brief Draw polyline on the display
+ *
+ * Polylines are a serie of lines connected to each other.
+ *
+ * @param gra The graphics instance on which to draw
+ * @param gc The color to use for the drawing
+ * @param[in] pin An array of points forming the polygon
+ * @param count_in The number of elements inside @p pin
+ * @param[in] width An array of width matching the line starting from the corresponding @p pa (if all equal, all lines will have the same width)
+ * @param poly A boolean indicating whether the polyline should be closed to form a polygon (only the contour of this polygon will be drawn)
+ */
+void
 graphics_draw_polyline_clipped(struct graphics *gra, struct graphics_gc *gc, struct point *pa, int count, int *width, int poly)
 {
 	struct point *points_to_draw=g_alloca(sizeof(struct point)*(count+1));
@@ -1937,7 +1949,15 @@ poly_intersection(struct point *p1, struct point *p2, struct point_rect *r, int
 	}
 }
 
-static void
+/**
+ * @brief Draw a plain polygon on the display
+ *
+ * @param gra The graphics instance on which to draw
+ * @param gc The color to use for the drawing
+ * @param[in] pin An array of points forming the polygon
+ * @param count_in The number of elements inside @p pin
+ */
+void
 graphics_draw_polygon_clipped(struct graphics *gra, struct graphics_gc *gc, struct point *pin, int count_in)
 {
 	struct point_rect r=gra->r;
diff --git a/navit/graphics.h b/navit/graphics.h
index 2ffbd9ab0..befeb8e2b 100644
--- a/navit/graphics.h
+++ b/navit/graphics.h
@@ -282,6 +282,8 @@ void graphics_remove_selection(struct graphics *gra, struct item *item, enum ite
 void graphics_clear_selection(struct graphics *gra, struct displaylist *dl);
 int graphics_show_native_keyboard (struct graphics *this_, struct graphics_keyboard *kbd);
 int graphics_hide_native_keyboard (struct graphics *this_, struct graphics_keyboard *kbd);
+void graphics_draw_polygon_clipped(struct graphics *gra, struct graphics_gc *gc, struct point *pin, int count_in);
+void graphics_draw_polyline_clipped(struct graphics *gra, struct graphics_gc *gc, struct point *pa, int count, int *width, int poly);
 
 /* end of prototypes */
 #ifdef __cplusplus
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index 0a62ae010..a571a827c 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -634,7 +634,7 @@ gui_internal_cmd_insert_destination_do(struct gui_priv *this, struct widget *wm,
  * function passed as {@code cmd} will be called.
  *
  * Widget passed as wm parameter of the called cmd function will have item set to user chosen waypoint item. Its data will be set
- *  to zero-based choosen waypoint number, counting from the route end. Coordinates to wm->c will be copied from wm_->c if wm_ is not null. Otherwise,
+ *  to zero-based chosen waypoint number, counting from the route end. Coordinates to wm->c will be copied from wm_->c if wm_ is not null. Otherwise,
  *  waypoint coordinates will be copied to wm->c.
  *
  * @param this gui context
diff --git a/navit/icons/forbiden_area.svg b/navit/icons/forbidden_area.svg
index bc1f96028..1daf0aa0d 100644
--- a/navit/icons/forbiden_area.svg
+++ b/navit/icons/forbidden_area.svg
@@ -13,11 +13,11 @@
    id="svg2"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="forbiden_area.svg"
+   sodipodi:docname="forbidden_area.svg"
    sodipodi:version="0.32"
    version="1.0"
    width="200"
-   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\forbiden_area.png"
+   inkscape:export-filename="C:\Users\jeremy\Pictures\svg\forbidden_area.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96">
   <defs
diff --git a/navit/icons/goverment_building.svg b/navit/icons/government_building.svg
index d01f4842b..f12adf04b 100644
--- a/navit/icons/goverment_building.svg
+++ b/navit/icons/government_building.svg
@@ -13,7 +13,7 @@
    id="svg2"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="goverment_building.svg"
+   sodipodi:docname="government_building.svg"
    sodipodi:version="0.32"
    version="1.0"
    width="200">
diff --git a/navit/icons/status_position_wait_bk.svg b/navit/icons/status_position_wait_bk.svg
index 9d1b7ca33..ac2096a99 100644
--- a/navit/icons/status_position_wait_bk.svg
+++ b/navit/icons/status_position_wait_bk.svg
@@ -57,11 +57,26 @@
        id="grid4140" />
   </sodipodi:namedview>
   <path
-     d="M 24 0 C 14.712 0 7.1992187 7.5127812 7.1992188 16.800781 C 7.1992188 29.400781 24 48 24 48 C 24 48 40.800781 29.400781 40.800781 16.800781 C 40.800781 7.5127812 33.288 2.3684758e-15 24 0 z M 24 4 C 31.131238 4 36.800781 9.6695427 36.800781 16.800781 C 36.800781 21.323004 33.110977 28.921035 29.085938 34.886719 C 26.543988 38.654253 25.528858 39.652618 24 41.476562 C 22.471142 39.652618 21.456012 38.654253 18.914062 34.886719 C 14.889022 28.921035 11.199219 21.323004 11.199219 16.800781 C 11.199219 9.6695427 16.868761 4 24 4 z "
+     d="M 24,0 C 14.712,0 7.1992188,7.5127812 7.1992188,16.800781 c 0,6.3 4.2001952,9.099414 8.4003902,15.324219 C 19.799805,38.349805 24,48 24,48 c 0,0 4.200195,-9.650195 8.40039,-15.875 4.200196,-6.224804 8.400391,-9.024219 8.400391,-15.324219 C 40.800781,7.5127812 33.288,0 24,0 Z m 0,4 C 31.131238,4 36.800781,9.6695427 36.800781,16.800781 36.736982,22 35.172,22.774 31.086,27.887 27,33 26,37.000219 24,40.476781 22,37.000219 20.828,32.774 16.914,27.887 13,23 11.199219,22 11.199219,16.800781 11.199219,9.6695427 16.868761,4 24,4 Z"
      transform="scale(0.5,0.5)"
-     id="path4" />
+     id="path4"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssscssssczczcs" />
   <path
      d="M0 0h24v24H0z"
      fill="none"
      id="path6" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 9.2741765,7 C 9.2741765,7 10,5 12,5 c 2,0 3,1.2462169 3,3 0,1.7537831 -2.293761,2 -3,3 0,1.23884 0,2.5 0,2.5"
+     id="path4137"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="czzcc" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 12,14.716639 12,16"
+     id="path4139"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
 </svg>
diff --git a/navit/icons/status_position_wait_wh.svg b/navit/icons/status_position_wait_wh.svg
index 8bce336df..8dacc2e65 100644
--- a/navit/icons/status_position_wait_wh.svg
+++ b/navit/icons/status_position_wait_wh.svg
@@ -57,12 +57,26 @@
        id="grid4140" />
   </sodipodi:namedview>
   <path
-     d="M 24 0 C 14.712 0 7.1992187 7.5127812 7.1992188 16.800781 C 7.1992188 29.400781 24 48 24 48 C 24 48 40.800781 29.400781 40.800781 16.800781 C 40.800781 7.5127812 33.288 2.3684758e-15 24 0 z M 24 4 C 31.131238 4 36.800781 9.6695427 36.800781 16.800781 C 36.800781 21.323004 33.110977 28.921035 29.085938 34.886719 C 26.543988 38.654253 25.528858 39.652618 24 41.476562 C 22.471142 39.652618 21.456012 38.654253 18.914062 34.886719 C 14.889022 28.921035 11.199219 21.323004 11.199219 16.800781 C 11.199219 9.6695427 16.868761 4 24 4 z "
+     d="M 24,0 C 14.712,0 7.1992188,7.5127812 7.1992188,16.800781 c 0,6.3 4.2001952,9.099414 8.4003902,15.324219 C 19.799805,38.349805 24,48 24,48 c 0,0 4.200195,-9.650195 8.40039,-15.875 4.200196,-6.224804 8.400391,-9.024219 8.400391,-15.324219 C 40.800781,7.5127812 33.288,0 24,0 Z m 0,4 C 31.131238,4 36.800781,9.6695427 36.800781,16.800781 36.736982,22 35.172,22.774 31.086,27.887 27,33 26,37.000219 24,40.476781 22,37.000219 20.828,32.774 16.914,27.887 13,23 11.199219,22 11.199219,16.800781 11.199219,9.6695427 16.868761,4 24,4 Z"
      transform="scale(0.5,0.5)"
      id="path4"
-     style="fill:#ffffff" />
+     style="fill:#ffffff"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssscssssczczcs" />
   <path
      d="M0 0h24v24H0z"
      fill="none"
      id="path6" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 9.2741765,7 C 9.2741765,7 10,5 12,5 c 2,0 3,1.2462169 3,3 0,1.7537831 -2.293761,2 -3,3 0,1.23884 0,2.5 0,2.5"
+     id="path4137"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="czzcc" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 12,14.716639 12,16"
+     id="path4139"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
 </svg>
diff --git a/navit/linguistics.c b/navit/linguistics.c
index 549f90e17..82513b016 100644
--- a/navit/linguistics.c
+++ b/navit/linguistics.c
@@ -317,7 +317,7 @@ linguistics_casefold(const char *in)
 	}
 	*dest=0;
 	if(*src)
-		dbg(lvl_error,"Casefolded string for '%s' needs extra space, result is trucated to '%s'.\n",in,ret);
+		dbg(lvl_error,"Casefolded string for '%s' needs extra space, result is truncated to '%s'.\n",in,ret);
 	return ret;
 }
 
diff --git a/navit/map/csv/csv.c b/navit/map/csv/csv.c
index 2726e8ab9..0477f7fdf 100644
--- a/navit/map/csv/csv.c
+++ b/navit/map/csv/csv.c
@@ -131,7 +131,7 @@ save_map_csv(struct map_priv *m)
 							tmpstr=g_strdup("");
 						}
 					} else {
-						dbg(lvl_debug,"No value defined for the atribute %s, assuming empty string\n",attr_to_name(*at));
+						dbg(lvl_debug,"No value defined for the attribute %s, assuming empty string\n",attr_to_name(*at));
 						tmpstr=g_strdup("");
 					}
 				}
diff --git a/navit/map/garmin/garmintypes.txt b/navit/map/garmin/garmintypes.txt
index ce8b0d495..f8a49c532 100644
--- a/navit/map/garmin/garmintypes.txt
+++ b/navit/map/garmin/garmintypes.txt
@@ -46,7 +46,7 @@ POINT
 0, 0x2000-0x203F = highway_exit, Exit
 0, 0x2100-0x213F = highway_exit, Exit with Services
 0, 0x2200-0x223F = highway_exit, Exit with Restroom
-0, 0x2300-0x233F = highway_exit, Exit with Convinience Store
+0, 0x2300-0x233F = highway_exit, Exit with Convenience Store
 0, 0x2400-0x243F = highway_exit, Exit with Weight Station
 0, 0x2500-0x253F = highway_exit, Exit with Toolbooth Booth
 0, 0x2600-0x263F = highway_exit, Exit with Information
@@ -155,7 +155,7 @@ POINT
 0, 0x3004 = poi_justice, Justice
 0, 0x3005 = poi_concert, Concert hall(point)
 0, 0x3006 = poi_border_station, Border Station(point)
-0, 0x3007 = poi_goverment_building, Goverment Building
+0, 0x3007 = poi_government_building, Government Building
 0, 0x3008 = poi_firebrigade, FireFighters Station
 
 0, 0x4000-0x403F = poi_golf, Golf
@@ -181,7 +181,7 @@ POINT
 0, 0x5400-0x543F = poi_swimming, Swimming
 0, 0x5500-0x553F = poi_dam, Dam
 
-0, 0x5600-0x563F = poi_forbidden_area, Forbiden Area
+0, 0x5600-0x563F = poi_forbidden_area, Forbidden Area
 0, 0x5700-0x573F = poi_danger_area, Danger Area
 0, 0x5800-0x583F = poi_restricted_area, Restricted Area
 
@@ -438,7 +438,7 @@ POINT
 1, 0x100b = poi_car_parking, Parking
 1, 0x100d = poi_car_dealer_parts, Car Dealer(point)
 1, 0x100e = poi_car_wash, Car Wash
-1, 0x1011 = poi_bussines_service, Business Service
+1, 0x1011 = poi_business_service, Business Service
 1, 0x1012 = poi_communication, Communication
 1, 0x1013 = poi_repair_service, Repair Service 
 1, 0x1014 = poi_social_service, Social Service
@@ -464,7 +464,7 @@ POINT
 1, 0x140c = town_label_1e0, Village (100-200)
 1, 0x140d = town_label_0e0, Village (0-100)
 1, 0x1500 = poi_personal_service, Personal Service
-1, 0x1501 = poi_bussines_service, Bussines Service
+1, 0x1501 = poi_business_service, Business Service
 
 
 POLYLINE
diff --git a/navit/maptool/tile.c b/navit/maptool/tile.c
index 76469376c..d9b1e004a 100644
--- a/navit/maptool/tile.c
+++ b/navit/maptool/tile.c
@@ -405,19 +405,18 @@ write_aux_tiles(struct zip_info *zip_info)
 		assert(buffer != NULL);
 		f=fopen(at->filename,"rb");
 		assert(f != NULL);
-		
-	        if (fread(buffer, at->size, 1, f) == 0){
+
+		if (fread(buffer, at->size, 1, f) == 0){
 			dbg(lvl_warning, "fread failed");
 			fclose(f);
-		}
-		else{
+		} else {
 			fclose(f);
 			write_zipmember(zip_info, at->name, zip_get_maxnamelen(zip_info), buffer, at->size);
-			free(buffer);
 			count++;
 			l=g_list_next(l);
 			zip_add_member(zip_info);
 		}
+		free(buffer);
 	}
 	return count;
 }
@@ -513,9 +512,14 @@ load_tilesdir(FILE *in)
 #if 0
 			printf("subtile '%s'\n",subtile);
 #endif
-			th=realloc(th, sizeof(struct tile_head)+(th->num_subtiles+1)*sizeof(char*));
-			*th_get_subtile( th, th->num_subtiles ) = string_hash_lookup(subtile);
-			th->num_subtiles++;
+			struct tile_head *th_tmp=realloc(th, sizeof(struct tile_head)+(th->num_subtiles+1)*sizeof(char*));
+			if (th_tmp == NULL) {
+				printf("Memory allocation failure, unable to load subtiles\n");
+			} else {
+				th = th_tmp;
+				*th_get_subtile( th, th->num_subtiles ) = string_hash_lookup(subtile);
+				th->num_subtiles++;
+			}
 		}
 		*last=th;
 		last=&th->next;
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 680308df0..3a645fbc2 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -2021,7 +2021,7 @@ Waypoint</text></img>
 					<icon src="bus_stop.png"/>
 				</itemgra>
 				<itemgra item_types="poi_business_service" order="12-">
-					<icon src="bussines_service.xpm"/>
+					<icon src="business_service.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_car_rent" order="12-">
 					<icon src="car_rent.png"/>
@@ -2117,7 +2117,7 @@ Waypoint</text></img>
 					<icon src="fish.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_forbidden_area" order="12-">
-					<icon src="forbiden_area.xpm"/>
+					<icon src="forbidden_area.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_shop_bicycle" order="12-">
 				<icon src="bicycle_shop.png"/>
@@ -2129,7 +2129,7 @@ Waypoint</text></img>
 					<icon src="golf.png"/>
 				</itemgra>
 				<itemgra item_types="poi_government_building" order="12-">
-					<icon src="goverment_building.xpm"/>
+					<icon src="government_building.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_height" order="12-">
 					<icon src="height.xpm"/>
@@ -3760,7 +3760,7 @@ Waypoint</text></img>
 					<icon src="bus_stop.png"/>
 				</itemgra>
 				<itemgra item_types="poi_business_service" order="0-">
-					<icon src="bussines_service.xpm"/>
+					<icon src="business_service.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_car_rent" order="11-">
 					<icon src="car_rent.png"/>
@@ -3856,7 +3856,7 @@ Waypoint</text></img>
 					<icon src="fish.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_forbidden_area" order="0-">
-					<icon src="forbiden_area.xpm"/>
+					<icon src="forbidden_area.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_shop_gps" order="0-">
 					<icon src="garmin.xpm"/>
@@ -3865,7 +3865,7 @@ Waypoint</text></img>
 					<icon src="golf.png"/>
 				</itemgra>
 				<itemgra item_types="poi_government_building" order="0-">
-					<icon src="goverment_building.xpm"/>
+					<icon src="government_building.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_height" order="0-">
 					<icon src="height.xpm"/>
@@ -5032,7 +5032,7 @@ Waypoint</text></img>
           <icon src="danger_16_16.png" />
         </itemgra>
         <itemgra item_types="poi_forbidden_area" order="13-">
-          <icon src="forbiden_area.png" />
+          <icon src="forbidden_area.png" />
         </itemgra>
         <itemgra item_types="poi_tunnel" order="12-">
           <icon src="tunnel.png" />
@@ -5146,7 +5146,7 @@ Waypoint</text></img>
           <icon src="bus_stop.png" />
         </itemgra>
         <itemgra item_types="poi_business_service" order="12-">
-          <icon src="bussines_service.png" />
+          <icon src="business_service.png" />
         </itemgra>
         <itemgra item_types="poi_car_rent" order="12-">
           <icon src="car_rent.png" />
@@ -5245,7 +5245,7 @@ Waypoint</text></img>
           <icon src="fish.png" />
         </itemgra>
         <itemgra item_types="poi_forbidden_area" order="12-">
-          <icon src="forbiden_area.png" />
+          <icon src="forbidden_area.png" />
         </itemgra>
         <itemgra item_types="poi_shop_gps" order="15-">
           <icon src="garmin.png" />
@@ -5254,7 +5254,7 @@ Waypoint</text></img>
           <icon src="golf.png" />
         </itemgra>
         <itemgra item_types="poi_government_building" order="12-">
-          <icon src="goverment_building.png" />
+          <icon src="government_building.png" />
         </itemgra>
         <itemgra item_types="poi_height" order="12-">
           <icon src="height.png" />
@@ -6802,6 +6802,9 @@ Waypoint</text></img>
 					<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"/>
diff --git a/navit/osd.c b/navit/osd.c
index a0c9183d1..f2ac701d1 100644
--- a/navit/osd.c
+++ b/navit/osd.c
@@ -292,7 +292,7 @@ osd_std_reconfigure(struct osd_item *item, struct command_saved *cs)
 	dbg(lvl_debug, "enter, item=%p, cs=%p\n", item, cs);
 	if (!command_saved_error(cs)) {
 		item->configured = !! command_saved_get_int(cs);
-		if (item->gr && !(item->flags & 16)) 
+		if (item->gr && !(item->flags & DISABLE_OVERLAY)) 
 			graphics_overlay_disable(item->gr, !item->configured);
 	} else {
 		err = command_error_to_text(command_saved_error(cs));
@@ -305,7 +305,6 @@ void
 osd_set_std_attr(struct attr **attrs, struct osd_item *item, int flags)
 {
 	struct attr *attr;
-
 	item->flags=flags;
 	item->osd_configuration=-1;
 	item->color_fg.r = 0xffff;
@@ -316,7 +315,8 @@ osd_set_std_attr(struct attr **attrs, struct osd_item *item, int flags)
 	item->text_color.g = 0xffff;
 	item->text_color.b = 0xffff;
 	item->text_color.a = 0xffff;
-	if (flags & 1) {
+
+	if (flags & TRANSPARENT_BG) {
 		item->color_bg.r = 0x0808;
 		item->color_bg.g = 0x0808;
 		item->color_bg.b = 0xf8f8;
@@ -404,7 +404,8 @@ osd_std_config(struct osd_item *item, struct navit *navit)
 			attr.u.num=-1;
 		item->configured = !!(attr.u.num & item->osd_configuration);
 	}
-	if (item->gr && !(item->flags & 16)) 
+
+	if (item->gr && !(item->flags & DISABLE_OVERLAY)) 
 		graphics_overlay_disable(item->gr, !item->configured);
 }
 
@@ -475,7 +476,7 @@ osd_set_std_graphic(struct navit *nav, struct osd_item *item, struct osd_priv *p
 	item->graphic_fg = graphics_gc_new(item->gr);
 	graphics_gc_set_foreground(item->graphic_fg, &item->color_fg);
 
-	if (item->flags & 2) {
+	if (item->flags & ITEM_HAS_TEXT) {
 		item->font = graphics_named_font_new(item->gr, item->font_name, item->font_size, 1);
 		item->graphic_fg_text = graphics_gc_new(item->gr);
 		graphics_gc_set_foreground(item->graphic_fg_text, &item->text_color);
diff --git a/navit/osd.h b/navit/osd.h
index 38fa0e5ff..8694bcd05 100644
--- a/navit/osd.h
+++ b/navit/osd.h
@@ -23,6 +23,10 @@
 struct osd_priv;
 struct attr;
 
+#define TRANSPARENT_BG 1
+#define ITEM_HAS_TEXT 2
+#define DISABLE_OVERLAY 4
+
 struct osd_methods {
 	void (*osd_destroy)(struct osd_priv *osd);
 	int (*set_attr)(struct osd_priv *osd, struct attr* attr);
diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c
index d336d36f6..aca868f1d 100644
--- a/navit/osd/core/osd_core.c
+++ b/navit/osd/core/osd_core.c
@@ -92,11 +92,21 @@ static int b_commandtable_added = 0;
 
 
 struct compass {
-	int width;
-	struct graphics_gc *green;
-	struct callback *click_cb;
+	int width;	/*!< Width of the compass in pixels */
+	struct color destination_dir_color;	/*!< Color definition of the destination direction arrow */
+	struct color north_color;	/*!< Color definition of north handle of the compass */
+	struct graphics_gc *destination_dir_gc;	/*!< graphics_gc context used to draw the destination direction arrow */
+	struct graphics_gc *north_gc; /*!< graphics_gc context used to draw the north handle of the compass */
+	struct callback *click_cb;	/*!< A callback to execute when clicking on the compass */
 };
 
+/**
+ * @brief Rotate a group of points around a @p center
+ * @param center The coordinates of the center of the rotation to apply
+ * @param angle The angle of the rotation
+ * @param[in,out] p An array of points to rotate
+ * @param count The number of points stored inside @p p
+ */
 static void
 transform_rotate(struct point *center, int angle, struct point *p,
 		 int count)
@@ -115,27 +125,121 @@ transform_rotate(struct point *center, int angle, struct point *p,
 	}
 }
 
+/**
+ * @brief Move a group of points in a direction (adding @p dx and @p dy to their x and y coordinates)
+ * @param dx The shift to perform to the x axis
+ * @param dy The shift to perform to the y axis
+ * @param[in,out] p An array of points to move
+ * @param count The number of points stored inside @p p
+ */
 static void
-handle(struct graphics *gr, struct graphics_gc *gc, struct point *p, int r,
-       int dir)
+transform_move(int dx, int dy, struct point *p,
+		 int count)
+{
+	int i;
+	for (i = 0; i < count; i++) {
+		p->x += dx;
+		p->y += dy;
+		p++;
+	}
+}
+
+/**
+ * @brief Draw a compass handle of length @p r, centered at point @p p, pointing to direction @p dir
+ *
+ * @param gr The graphics instance on which to draw
+ * @param gc_n The color to use for the north half of the compass
+ * @param gc_s The color to use for the south half of the compass
+ * @param p The center of the compass
+ * @param r The radius of the compass (around the center point @p p)
+ * @param dir The direction the compass points to (0 being up, value is in degrees counter-clockwise)
+ */
+static void
+draw_compass(struct graphics *gr, struct graphics_gc *gc_n, struct graphics_gc *gc_s, struct point *p, int r,
+             int dir)
 {
 	struct point ph[3];
-	int l = r * 0.4;
+	int wh[3] = { 1, 1, 1 };	/* Width of each line of the polygon to draw */
+	int l = r * 0.25;
 
-	ph[0].x = 0;
-	ph[0].y = r;
+	ph[0].x = -l;
+	ph[0].y = 0;
 	ph[1].x = 0;
 	ph[1].y = -r;
-	transform_rotate(p, dir, ph, 2);
-	graphics_draw_lines(gr, gc, ph, 2);
+	ph[2].x = l;
+	ph[2].y = 0;
+	transform_rotate(p, dir, ph, 3); /* Rotate to the correct direction */
+	graphics_draw_polygon_clipped(gr, gc_n, ph, 3);	/* Draw north half */
+
 	ph[0].x = -l;
+	ph[0].y = 0;
+	ph[1].x = 0;
+	ph[1].y = r;
+	ph[2].x = l;
+	ph[2].y = 0;
+	transform_rotate(p, dir, ph, 3); /* Rotate to the correct direction */
+	graphics_draw_polyline_clipped(gr, gc_s, ph, 3, wh, 0);	/* Draw south half */
+}
+
+/**
+ * @brief Draw an arrow of length @p r, centered at point @p p, with color @p gc, pointing to direction @p dir
+ *
+ * @param gr The graphics instance on which to draw
+ * @param gc The color to draw the arrow
+ * @param p The center of the compass
+ * @param r The radius of the compass (around the center point @p p)
+ * @param dir The direction the arrow points to (0 being up, value is in degrees counter-clockwise)
+ */
+static void
+draw_handle(struct graphics *gr, struct graphics_gc *gc, struct point *p, int r,
+       int dir)
+{
+	struct point ph[6];
+	int l = r * 0.4;
+	int s = l * 0.4;
+
+	ph[0].x = 0; /* Compute details for the body of the arrow */
+	ph[0].y = r - l;
+	ph[1].x = 0;
+	ph[1].y = -r;
+	transform_rotate(p, dir, ph, 2); /* Rotate to the correct direction */
+	graphics_draw_lines(gr, gc, ph, 2); /* Draw the body */
+
+	ph[0].x = -l; /* Compute details for the head of the arrow */
 	ph[0].y = -r + l;
 	ph[1].x = 0;
 	ph[1].y = -r;
 	ph[2].x = l;
 	ph[2].y = -r + l;
-	transform_rotate(p, dir, ph, 3);
-	graphics_draw_lines(gr, gc, ph, 3);
+	transform_rotate(p, dir, ph, 3); /* Rotate to the correct direction */
+	graphics_draw_lines(gr, gc, ph, 3); /* Draw the head */
+
+	ph[0].x = -s; /* Compute details for the tail of the arrow */
+	ph[0].y = r - l + s;
+	ph[1].x = 0;
+	ph[1].y = r - l;
+	ph[2].x = s;
+	ph[2].y = r - l + s;
+	ph[3]=ph[0]; /* Save these 3 points for future re-use */
+	ph[4]=ph[1];
+	ph[5]=ph[2];
+	transform_rotate(p, dir, ph, 3); /* Rotate to the correct direction */
+	graphics_draw_lines(gr, gc, ph, 3); /* Draw the tail */
+	ph[0]=ph[3];	/* Restore saved points */
+	ph[1]=ph[4];
+	ph[2]=ph[5];
+	transform_move(0, s, ph, 3);
+	ph[3]=ph[0]; /* Save these 3 points for future re-use */
+	ph[4]=ph[1];
+	ph[5]=ph[2];
+	transform_rotate(p, dir, ph, 3); /* Rotate to the correct direction */
+	graphics_draw_lines(gr, gc, ph, 3); /* Draw the tail */
+	ph[0]=ph[3];	/* Restore saved points */
+	ph[1]=ph[4];
+	ph[2]=ph[5];
+	transform_move(0, s, ph, 3);
+	transform_rotate(p, dir, ph, 3); /* Rotate to the correct direction */
+	graphics_draw_lines(gr, gc, ph, 3); /* Draw the tail */
 }
 
 /**
@@ -435,7 +539,8 @@ osd_route_guard_new(struct navit *nav, struct osd_methods *meth,
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_route_guard_draw);
 	meth->set_attr = set_std_osd_attr;
-	osd_set_std_attr(attrs, &opc->osd_item, 2);
+
+	osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
 
 	attr = attr_search(attrs, NULL, attr_min_dist);
 	if (attr) {
@@ -1049,7 +1154,7 @@ osd_odometer_new(struct navit *nav, struct osd_methods *meth,
 	if (attr)
 		this->align=attr->u.num;
 
-	osd_set_std_attr(attrs, &opc->osd_item, 2);
+	osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
 	attr = attr_search(attrs, NULL, attr_width);
 	this->width=attr ? attr->u.num : 2;
 	attr = attr_search(attrs, NULL, attr_idle_color);
@@ -1230,7 +1335,7 @@ osd_cmd_interface_new(struct navit *nav, struct osd_methods *meth,
 	opc->spec_set_attr_func = osd_cmd_interface_set_attr;
 	meth->set_attr = set_std_osd_attr;
 
-	osd_set_std_attr(attrs, &opc->osd_item, 2);
+	osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
 
 	attr = attr_search(attrs, NULL, attr_width);
 	this->width=attr ? attr->u.num : 2;
@@ -1394,7 +1499,7 @@ osd_stopwatch_new(struct navit *nav, struct osd_methods *meth,
 	this->sum_time = 0;
 	this->last_click_time = 0;
 
-	osd_set_std_attr(attrs, &opc->osd_item, 2);
+	osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
 	attr = attr_search(attrs, NULL, attr_width);
 	this->width=attr ? attr->u.num : 2;
 	attr = attr_search(attrs, NULL, attr_idle_color);
@@ -1409,7 +1514,13 @@ osd_stopwatch_new(struct navit *nav, struct osd_methods *meth,
 	return (struct osd_priv *) opc;
 }
 
-
+/**
+ * @brief Draw the compass on the OSD (includes north and destination direction)
+ *
+ * @param opc A contextual private data pointer (see struct osd_priv_common)
+ * @param nav The global navit object
+ * @param v The current vehicle
+ */
 static void
 osd_compass_draw(struct osd_priv_common *opc, struct navit *nav,
 		 struct vehicle *v)
@@ -1435,7 +1546,7 @@ osd_compass_draw(struct osd_priv_common *opc, struct navit *nav,
 	if (v) {
 		if (vehicle_get_attr(v, attr_position_direction, &attr_dir, NULL)) {
 			vdir = *attr_dir.u.numd;
-			handle(opc->osd_item.gr, opc->osd_item.graphic_fg, &p, opc->osd_item.w/3, -vdir);
+			draw_compass(opc->osd_item.gr, this->north_gc, opc->osd_item.graphic_fg, &p, opc->osd_item.w/3, -vdir); /* Draw a compass */
 		}
 
 		if (navit_get_attr(nav, attr_destination, &destination_attr, NULL)
@@ -1446,12 +1557,12 @@ osd_compass_draw(struct osd_priv_common *opc, struct navit *nav,
 			c2.y = destination_attr.u.pcoord->y;
 			dir = atan2(c2.x - c1.x, c2.y - c1.y) * 180.0 / M_PI;
 			dir -= vdir;
-			handle(opc->osd_item.gr, this->green, &p, opc->osd_item.w/3, dir);
+			draw_handle(opc->osd_item.gr, this->destination_dir_gc, &p, opc->osd_item.w/3, dir); /* Draw the green arrow pointing to the destination */
 			buffer=format_distance(transform_distance(pro, &c1, &c2),"",imperial);
 			graphics_get_text_bbox(opc->osd_item.gr, opc->osd_item.font, buffer, 0x10000, 0, bbox, 0);
 			p.x=(opc->osd_item.w-bbox[2].x)/2;
 			p.y = opc->osd_item.h-opc->osd_item.h/10;
-			graphics_draw_text(opc->osd_item.gr, this->green, NULL, opc->osd_item.font, buffer, &p, 0x10000, 0);
+			graphics_draw_text(opc->osd_item.gr, this->destination_dir_gc, NULL, opc->osd_item.font, buffer, &p, 0x10000, 0);
 			g_free(buffer);
 		}
 	}
@@ -1463,19 +1574,20 @@ osd_compass_draw(struct osd_priv_common *opc, struct navit *nav,
 static void
 osd_compass_init(struct osd_priv_common *opc, struct navit *nav)
 {
-	struct color c;
-
 	struct compass *this = (struct compass *)opc->data;
 
 	osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc);
 
-	this->green = graphics_gc_new(opc->osd_item.gr);
-	c.r = 0;
-	c.g = 65535;
-	c.b = 0;
-	c.a = 65535;
-	graphics_gc_set_foreground(this->green, &c);
-	graphics_gc_set_linewidth(this->green, this->width);
+	this->destination_dir_gc = graphics_gc_new(opc->osd_item.gr);
+	graphics_gc_set_foreground(this->destination_dir_gc, &this->destination_dir_color);
+	graphics_gc_set_linewidth(this->destination_dir_gc, this->width);
+
+	this->north_gc = graphics_gc_new(opc->osd_item.gr);
+	graphics_gc_set_foreground(this->north_gc, &this->north_color);
+	graphics_gc_set_linewidth(this->north_gc, this->width);
+
+	opc->osd_item.graphic_fg = graphics_gc_new(opc->osd_item.gr);
+	graphics_gc_set_foreground(opc->osd_item.graphic_fg, &opc->osd_item.text_color);
 	graphics_gc_set_linewidth(opc->osd_item.graphic_fg, this->width);
 
 	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_compass_draw), attr_position_coord_geo, opc));
@@ -1492,6 +1604,8 @@ osd_compass_new(struct navit *nav, struct osd_methods *meth,
 	struct compass *this = g_new0(struct compass, 1);
 	struct osd_priv_common *opc = g_new0(struct osd_priv_common,1);
 	struct attr *attr;
+	struct color green_color={0x0400,0xffff,0x1000,0xffff};
+	struct color red_color={0xffff,0x0400,0x0400,0xffff};
 
 	opc->data = (void*)this;
 	opc->osd_item.rel_x = 20;
@@ -1502,9 +1616,14 @@ osd_compass_new(struct navit *nav, struct osd_methods *meth,
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_compass_draw);
 	meth->set_attr = set_std_osd_attr;
-	osd_set_std_attr(attrs, &opc->osd_item, 2);
+	osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
 	attr = attr_search(attrs, NULL, attr_width);
 	this->width=attr ? attr->u.num : 2;
+	attr = attr_search(attrs, NULL, attr_destination_dir_color);
+	this->destination_dir_color=attr ? *attr->u.color : green_color; /* Pick destination color from configuration, default to green if unspecified */
+	attr = attr_search(attrs, NULL, attr_north_color);
+	this->north_color=attr ? *attr->u.color : red_color; /* Pick north handle color from configuration, default to red if unspecified */
+
 	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_compass_init), attr_graphics_ready, opc));
 	return (struct osd_priv *) opc;
 }
@@ -1702,7 +1821,8 @@ osd_button_new(struct navit *nav, struct osd_methods *meth,
 	attr=attr_search(attrs, NULL, attr_use_overlay);
 	if (attr)
 		this->use_overlay=attr->u.num;
-	osd_set_std_attr(attrs, &opc->osd_item, this->use_overlay ? 1:(1|16));
+
+	osd_set_std_attr(attrs, &opc->osd_item, this->use_overlay ? TRANSPARENT_BG:(TRANSPARENT_BG|DISABLE_OVERLAY));
 
 	if (!opc->osd_item.command) {
 		dbg(lvl_error, "no command\n");
@@ -1760,7 +1880,7 @@ osd_image_init(struct osd_priv_common *opc, struct navit *nav)
 		graphics_draw_mode(opc->osd_item.gr, draw_mode_end);
 		graphics_image_free(opc->osd_item.gr, img);
 	} else {
-		opc->osd_item.configured=1;
+		osd_set_std_config(nav, &opc->osd_item);
 		opc->osd_item.gr=gra;
 		opc->osd_item.graphic_bg=graphics_gc_new(opc->osd_item.gr);
 		graphics_add_callback(gra, this->draw_cb=callback_new_attr_2(callback_cast(osd_button_draw), attr_postdraw, opc, nav));
@@ -1785,11 +1905,13 @@ osd_image_new(struct navit *nav, struct osd_methods *meth,
 	meth->set_attr = set_std_osd_attr;
 	opc->spec_set_attr_func = osd_button_set_attr;
 
-	osd_set_std_attr(attrs, &opc->osd_item, 1);
-
 	attr=attr_search(attrs, NULL, attr_use_overlay);
 	if (attr)
 		this->use_overlay=attr->u.num;
+		
+
+	osd_set_std_attr(attrs, &opc->osd_item, this->use_overlay ? TRANSPARENT_BG:(TRANSPARENT_BG|DISABLE_OVERLAY));
+
 	attr = attr_search(attrs, NULL, attr_src);
 	if (!attr) {
 		dbg(lvl_error, "no src\n");
@@ -2120,6 +2242,7 @@ osd_nav_next_turn_new(struct navit *nav, struct osd_methods *meth,
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_nav_next_turn_draw);
 	meth->set_attr = set_std_osd_attr;
+
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	this->icon_w = -1;
@@ -2548,7 +2671,7 @@ osd_speed_cam_new(struct navit *nav, struct osd_methods *meth, struct attr **att
   opc->osd_item.meth.draw = osd_draw_cast(osd_speed_cam_draw);
   meth->set_attr = set_std_osd_attr;
 
-  osd_set_std_attr(attrs, &opc->osd_item, 2);
+  osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
   attr = attr_search(attrs, NULL, attr_width);
   this->width=attr ? attr->u.num : 2;
   attr = attr_search(attrs, NULL, attr_idle_color);
@@ -2846,7 +2969,8 @@ osd_speed_warner_new(struct navit *nav, struct osd_methods *meth, struct attr **
 		this->announce_on = attr->u.num;
 	else
 		this->announce_on = 1;    //announce by default
-	osd_set_std_attr(attrs, &opc->osd_item, 2);
+	
+	osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
 	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_speed_warner_init), attr_graphics_ready, opc));
 	return (struct osd_priv *) opc;
 }
@@ -3486,7 +3610,7 @@ osd_text_new(struct navit *nav, struct osd_methods *meth,
 	opc->osd_item.meth.draw = osd_draw_cast(osd_text_draw);
 	meth->set_attr = set_std_osd_attr;
 	opc->spec_set_attr_func = osd_text_set_attr;
-	osd_set_std_attr(attrs, &opc->osd_item, 2);
+	osd_set_std_attr(attrs, &opc->osd_item, ITEM_HAS_TEXT);
 
 	this->active = -1;
 	this->last = NULL;
@@ -3599,6 +3723,7 @@ osd_gps_status_new(struct navit *nav, struct osd_methods *meth,
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_gps_status_draw);
 	meth->set_attr = set_std_osd_attr;
+
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	this->icon_w = -1;
@@ -3709,6 +3834,7 @@ osd_volume_new(struct navit *nav, struct osd_methods *meth,
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_volume_draw);
 	meth->set_attr = set_std_osd_attr;
+
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	this->icon_w = -1;
@@ -3783,14 +3909,12 @@ osd_scale_draw(struct osd_priv_common *opc, struct navit *nav)
 
 	if (!navit_get_attr(nav, attr_transformation, &transformation, NULL))
 		return;
-	if (this->use_overlay) {
-		graphics_draw_mode(opc->osd_item.gr, draw_mode_begin);
-		item_pos.x=0;
-		item_pos.y=0;
-		graphics_draw_rectangle(opc->osd_item.gr, opc->osd_item.graphic_bg, &item_pos, opc->osd_item.w, opc->osd_item.h);
-	} else {
-		item_pos=opc->osd_item.p;
-	}
+
+	graphics_draw_mode(opc->osd_item.gr, draw_mode_begin);
+	item_pos.x=0;
+	item_pos.y=0;
+	graphics_draw_rectangle(opc->osd_item.gr, opc->osd_item.graphic_bg, &item_pos, opc->osd_item.w, opc->osd_item.h);
+
 	scale_line_start=item_pos;
 	scale_line_start.y+=opc->osd_item.h/2;
 	scale_line_start.x+=(opc->osd_item.w-width_reduced)/2;
@@ -3825,14 +3949,14 @@ osd_scale_draw(struct osd_priv_common *opc, struct navit *nav)
 	graphics_draw_rectangle(opc->osd_item.gr, opc->osd_item.graphic_fg, p+6, 4,opc->osd_item.h/5+4);
 	graphics_draw_rectangle(opc->osd_item.gr, opc->osd_item.graphic_fg, p+7, p[1].x-p[0].x, 4);
 	graphics_draw_rectangle(opc->osd_item.gr, opc->osd_item.graphic_fg, p+8, 4,opc->osd_item.h/5+4);
-	graphics_draw_lines(opc->osd_item.gr, this->black, p, 2);
-	graphics_draw_lines(opc->osd_item.gr, this->black, p+2, 2);
-	graphics_draw_lines(opc->osd_item.gr, this->black, p+4, 2);
+	graphics_draw_lines(opc->osd_item.gr, opc->osd_item.graphic_fg_text, p, 2);
+	graphics_draw_lines(opc->osd_item.gr, opc->osd_item.graphic_fg_text, p+2, 2);
+	graphics_draw_lines(opc->osd_item.gr, opc->osd_item.graphic_fg_text, p+4, 2);
 	text=format_distance(scale_length_on_map, "", imperial);
 	graphics_get_text_bbox(opc->osd_item.gr, opc->osd_item.font, text, 0x10000, 0, bbox, 0);
 	p[0].x=(opc->osd_item.w-bbox[2].x)/2+item_pos.x;
 	p[0].y=item_pos.y+opc->osd_item.h-opc->osd_item.h/10;
-	graphics_draw_text(opc->osd_item.gr, this->black, opc->osd_item.graphic_fg, opc->osd_item.font, text, &p[0], 0x10000, 0);
+	graphics_draw_text(opc->osd_item.gr, opc->osd_item.graphic_fg_text, opc->osd_item.graphic_fg, opc->osd_item.font, text, &p[0], 0x10000, 0);
 	g_free(text);
 	if (this->use_overlay)
 		graphics_draw_mode(opc->osd_item.gr, draw_mode_end);
@@ -3843,19 +3967,25 @@ osd_scale_init(struct osd_priv_common *opc, struct navit *nav)
 {
 	struct osd_scale *this = (struct osd_scale *)opc->data;
 
-	struct color color_black={COLOR_BLACK_};
 	struct graphics *gra = navit_get_graphics(nav);
-	dbg(lvl_debug, "enter\n");
-	if (this->use_overlay) {
-		osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc);
-	} else {
-		opc->osd_item.configured=1;
-		opc->osd_item.gr=gra;
-		opc->osd_item.font = graphics_font_new(opc->osd_item.gr, opc->osd_item.font_size, 1);
-		opc->osd_item.graphic_fg=graphics_gc_new(opc->osd_item.gr);
+	
+	struct color transparent = {0,0,0,0};
+	
+	opc->osd_item.color_fg.r = 0xffff-opc->osd_item.text_color.r;
+	opc->osd_item.color_fg.g = 0xffff-opc->osd_item.text_color.g;
+	opc->osd_item.color_fg.b = 0xffff-opc->osd_item.text_color.b;
+	opc->osd_item.color_fg.a = 0xffff-opc->osd_item.text_color.a;
+	
+	
+	if(COLOR_IS_SAME(opc->osd_item.color_fg, transparent)){
+		opc->osd_item.color_fg.r = 0x1111;
+		opc->osd_item.color_fg.g = 0x1111;
+		opc->osd_item.color_fg.b = 0x1111;
+		opc->osd_item.color_fg.a = 0x1111;
 	}
-	this->black=graphics_gc_new(opc->osd_item.gr);
-	graphics_gc_set_foreground(this->black, &color_black);
+
+	osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc);
+	
 	graphics_add_callback(gra, this->draw_cb=callback_new_attr_2(callback_cast(osd_scale_draw), attr_postdraw, opc, nav));
 	if (navit_get_ready(nav) == 3)
 		osd_scale_draw(opc, nav);
@@ -3870,17 +4000,13 @@ osd_scale_new(struct navit *nav, struct osd_methods *meth,
 	struct attr *attr;
 
 	opc->data = (void*)this;
-
+	opc->osd_item.font_size = 200;
 	opc->osd_item.navit = nav;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_scale_draw);
 	meth->set_attr = set_std_osd_attr;
 
-	osd_set_std_attr(attrs, &opc->osd_item, 3);
-
-	attr=attr_search(attrs, NULL, attr_use_overlay);
-	if (attr)
-		this->use_overlay=attr->u.num;
-
+	osd_set_std_attr(attrs, &opc->osd_item, TRANSPARENT_BG | ITEM_HAS_TEXT);
+	
 	navit_add_callback(nav, this->navit_init_cb = callback_new_attr_1(callback_cast (osd_scale_init), attr_graphics_ready, opc));
 
 	return (struct osd_priv *) opc;
@@ -3990,6 +4116,7 @@ osd_auxmap_new(struct navit *nav, struct osd_methods *meth, struct attr **attrs)
 	opc->osd_item.rel_h = 40;
 	opc->osd_item.font_size = 200;
 	meth->set_attr = set_std_osd_attr;
+
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_auxmap_init), attr_navit, opc));
diff --git a/navit/script/osm/Geo/OSM/Planet.pm b/navit/script/osm/Geo/OSM/Planet.pm
index bedfdffc8..25c533eb7 100644
--- a/navit/script/osm/Geo/OSM/Planet.pm
+++ b/navit/script/osm/Geo/OSM/Planet.pm
@@ -196,7 +196,7 @@ sub mirror_planet(){
     $current_file = $files[0];
     
     if ( $DEBUG) {
-	print STDERR "Choosen File: $current_file\n";
+	print STDERR "Chosen File: $current_file\n";
     }
     
     return undef unless $current_file;
diff --git a/navit/vehicle/file/vehicle_file.c b/navit/vehicle/file/vehicle_file.c
index 5a3be743a..868af4f57 100644
--- a/navit/vehicle/file/vehicle_file.c
+++ b/navit/vehicle/file/vehicle_file.c
@@ -842,7 +842,7 @@ vehicle_file_destroy(struct vehicle_priv *priv)
 * @param type Attribute type called
 * @param attr Structure to return the attribute value
 *
-* @return 1 if ok, 0 for unkown or invalid attribute
+* @return 1 if ok, 0 for unknown or invalid attribute
 */
 static int
 vehicle_file_position_attr_get(struct vehicle_priv *priv,
@@ -920,7 +920,7 @@ vehicle_file_position_attr_get(struct vehicle_priv *priv,
 * @param type Attribute type called
 * @param attr Structure to return the attribute value
 *
-* @return 1 if ok, 0 for unkown attribute
+* @return 1 if ok, 0 for unknown attribute
 */
 static int
 vehicle_file_sat_attr_get(void *priv_data, enum attr_type type, struct attr *attr)
diff --git a/po/ar.po.in b/po/ar.po.in
index 51655456e..b1f8011b4 100644
--- a/po/ar.po.in
+++ b/po/ar.po.in
@@ -1,9 +1,10 @@
 # Arabic 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
 # Magd Addin M. Almuntaser https://launchpad.net/~ttmtt-team
+# abed alkareem alnatsheh https://launchpad.net/~abedalkareem
 # dargirov https://launchpad.net/~dargirov
 # drsaudi https://launchpad.net/~mon7b6
 # metehyi https://launchpad.net/~metehyi
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-19 03:57+0000\n"
-"Last-Translator: dargirov <dargirov@mail.ru>\n"
+"PO-Revision-Date: 2018-02-05 13:00+0000\n"
+"Last-Translator: abed alkareem alnatsheh <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,7 +94,7 @@ msgstr "بعد %d.%d أميال"
 #, c-format
 msgid "one mile"
 msgid_plural "%d miles"
-msgstr[0] "مايل واحد"
+msgstr[0] "ميل واحد"
 msgstr[1] "%d أميال"
 msgstr[2] "%d أميال"
 msgstr[3] "%d أميال"
@@ -103,7 +104,7 @@ msgstr[5] "%d أميال"
 #, c-format
 msgid "in one mile"
 msgid_plural "in %d miles"
-msgstr[0] "بعد مايل واحد"
+msgstr[0] "بعد ميل واحد"
 msgstr[1] "بعد %d أميال"
 msgstr[2] "بعد %d أميال"
 msgstr[3] "بعد %d أميال"
@@ -129,12 +130,12 @@ msgstr "بعد %d%d كلم"
 #, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
-msgstr[0] "كلم واحد"
-msgstr[1] "%d كلم"
-msgstr[2] "%d كلم"
-msgstr[3] "%d كلم"
-msgstr[4] "%d كلم"
-msgstr[5] "%d كلم"
+msgstr[0] "كيلومتر واحد"
+msgstr[1] "%d كيلومتر"
+msgstr[2] "%d كيلومتر"
+msgstr[3] "%d كيلومتر"
+msgstr[4] "%d كيلومتر"
+msgstr[5] "%d كيلومتر"
 
 #, c-format
 msgid "in one kilometer"
@@ -173,7 +174,7 @@ msgstr ""
 
 #. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway.
 msgid "onto the motorway ramp"
-msgstr ""
+msgstr "على الطريق السريع المنحدر"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #, c-format
@@ -201,12 +202,12 @@ msgid "%sinto the %s"
 msgstr "%s إلى داخل %s"
 
 msgid "When possible, please turn around"
-msgstr "حيث ممكن الرجاء اللف"
+msgstr "عند الإمكانية , انعطف رجاء"
 
 #. TRANSLATORS: the argument is the destination to follow
 #, c-format
 msgid "towards %s"
-msgstr "تجاه %s"
+msgstr "إتجاه %s"
 
 #, c-format
 msgid "Follow the road for the next %s"
@@ -218,10 +219,10 @@ msgstr "قريباً الدخول إلى المستديرة"
 #. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
 msgid "Enter the roundabout %s"
-msgstr ""
+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
@@ -235,12 +236,12 @@ msgid "now"
 msgstr "الآن"
 
 msgid "then"
-msgstr ""
+msgstr "ثم"
 
 #. 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 "ثم اندمج %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
@@ -258,10 +259,10 @@ 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
@@ -275,10 +276,10 @@ msgstr ""
 
 #. 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
@@ -345,7 +346,7 @@ msgstr "حوّل %1$s%2$s %3$s%4$s"
 
 #. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|left"
-msgstr ""
+msgstr "ثم انعطف يوترن يسارا"
 
 #. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
@@ -354,7 +355,7 @@ msgstr ""
 
 #. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
 msgid "then make a U-turn|right"
-msgstr ""
+msgstr "ثم انعطف يوترن يمينا"
 
 #. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
@@ -374,7 +375,7 @@ msgstr ""
 #. *
 #. 
 msgid "follow"
-msgstr ""
+msgstr "اتبع"
 
 msgid "then you have reached your destination."
 msgstr "و بعدها تكون قد وصلت إلى هدفك"
@@ -401,9 +402,15 @@ msgstr "الأمر"
 msgid "Length"
 msgstr "الطول"
 
+msgid "mi"
+msgstr "ميل"
+
 msgid "km"
 msgstr "كلم"
 
+msgid "feet"
+msgstr "قدم"
+
 msgid "m"
 msgstr "م."
 
@@ -1616,6 +1623,9 @@ msgstr ""
 msgid "_Lock on Road"
 msgstr "إقفال على الطريق"
 
+msgid "_Follow Vehicle"
+msgstr ""
+
 msgid "_Keep orientation to the North"
 msgstr "_حافظ على الإتجاه شمالا"
 
@@ -1772,8 +1782,8 @@ msgid "OT"
 msgstr "OT"
 
 #, c-format
-msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr "Route %4.0fكلم    %02d:%02d ETA"
+msgid "Route %4.1f%s    %02d:%02d ETA"
+msgstr ""
 
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "الطريك 0000كلم  0+00:00 ETA"
@@ -1995,6 +2005,9 @@ msgstr "وصف الطريق"
 msgid "Show Locale"
 msgstr "أعرض المحليات"
 
+msgid "Network info"
+msgstr ""
+
 msgid "Former Destinations"
 msgstr "الأهداف السابقة"
 
@@ -2033,443 +2046,9 @@ msgstr "إنتبه ! آلة تصوير"
 msgid "Please decrease your speed"
 msgstr "ألرجاء خفض سرعتك"
 
-msgid "partial match"
-msgstr "تطابق جزئي"
-
-#. Android resource: @strings/address_search_button
-msgid "Search"
-msgstr "إبحث"
-
-#. Android resource: @strings/address_search_towns
-msgid "Towns"
-msgstr "البلدات"
-
-msgid "Map data (c) OpenStreetMap contributors, ODBL"
-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."
-msgstr ""
-
-msgid "Downloaded maps"
-msgstr "الخرائط المنزلة"
-
-msgid ""
-"Sorry, we currently do not support maps above 3.8G on Android, please select "
-"a smaller one."
-msgstr ""
-
-#. Android resource: @strings/position_popup_drive_here
-msgid "Route to here"
-msgstr "الطريق إلى هنا"
-
-msgid "Cancel"
-msgstr "إلغاء"
-
 msgid "filenamePath"
 msgstr ""
 
-msgid ""
-"New location set to %s\n"
-"Restart Navit to apply the changes."
-msgstr ""
-
-msgid "Whole Planet"
-msgstr "كامل القرة الأرضية"
-
-msgid "Africa"
-msgstr "إفريقيا"
-
-msgid "Canary Islands"
-msgstr "جزر الكناري"
-
-msgid "Asia"
-msgstr "آسيا"
-
-msgid "Korea"
-msgstr "كوريا"
-
-msgid "Taiwan"
-msgstr "تايوان"
-
-msgid "UAE+Other"
-msgstr "الإمارت العرية المتحدة و أخرى"
-
-msgid "Oceania"
-msgstr "أوقيانيا"
-
-msgid "Tasmania"
-msgstr "تسمانيا"
-
-msgid "Victoria"
-msgstr "فيكتوريا"
-
-msgid "New South Wales"
-msgstr "نيو ساوث ويلز"
-
-msgid "Europe"
-msgstr "أوروبا"
-
-msgid "Western Europe"
-msgstr "أوروبا الغربية"
-
-msgid "Azores"
-msgstr "جزر الأزور"
-
-msgid "BeNeLux"
-msgstr "بلجيكا هولاندة اللكسمبرغ"
-
-msgid "Alsace"
-msgstr "الألزاس"
-
-msgid "Aquitaine"
-msgstr ""
-
-msgid "Auvergne"
-msgstr ""
-
-msgid "Basse-Normandie"
-msgstr ""
-
-msgid "Bourgogne"
-msgstr ""
-
-msgid "Bretagne"
-msgstr ""
-
-msgid "Centre"
-msgstr "الوسط"
-
-msgid "Champagne-Ardenne"
-msgstr ""
-
-msgid "Corse"
-msgstr "كورسيكا"
-
-msgid "Franche-Comte"
-msgstr ""
-
-msgid "Haute-Normandie"
-msgstr ""
-
-msgid "Ile-de-France"
-msgstr "عاصمة فرنسا و ضواحيها"
-
-msgid "Languedoc-Roussillon"
-msgstr ""
-
-msgid "Limousin"
-msgstr ""
-
-msgid "Lorraine"
-msgstr ""
-
-msgid "Midi-Pyrenees"
-msgstr ""
-
-msgid "Nord-pas-de-Calais"
-msgstr ""
-
-msgid "Pays-de-la-Loire"
-msgstr ""
-
-msgid "Picardie"
-msgstr "بيكاردي"
-
-msgid "Poitou-Charentes"
-msgstr "بواتو شارانت"
-
-msgid "Provence-Alpes-Cote-d-Azur"
-msgstr ""
-
-msgid "Rhone-Alpes"
-msgstr "رون-جبال الألب"
-
-msgid "Baden-Wuerttemberg"
-msgstr "بادن فورتمبيرغ"
-
-msgid "Bayern"
-msgstr "بافاريا"
-
-msgid "Mittelfranken"
-msgstr "فرانكن الوسطى"
-
-msgid "Niederbayern"
-msgstr "بافاريا السفلى"
-
-msgid "Oberbayern"
-msgstr "بافاريا العليا"
-
-msgid "Oberfranken"
-msgstr "فرانكن العليا"
-
-msgid "Oberpfalz"
-msgstr "بفالز العليا"
-
-msgid "Schwaben"
-msgstr "شفابن"
-
-msgid "Unterfranken"
-msgstr "فرانكن السفلى"
-
-msgid "Berlin"
-msgstr "برلين"
-
-msgid "Brandenburg"
-msgstr "براندنبورغ"
-
-msgid "Bremen"
-msgstr "بريمن"
-
-msgid "Hamburg"
-msgstr "هامبرغ"
-
-msgid "Hessen"
-msgstr "هسن"
-
-msgid "Mecklenburg-Vorpommern"
-msgstr "مكليمبورغ-فوربومرن"
-
-msgid "Niedersachsen"
-msgstr "نيدرزاكسن"
-
-msgid "Nordrhein-westfalen"
-msgstr "نوردراين-فيستفالن"
-
-msgid "Rheinland-Pfalz"
-msgstr "راينلاند-بفالز"
-
-msgid "Saarland"
-msgstr "زارلاند"
-
-msgid "Sachsen-Anhalt"
-msgstr "زاكسن-أنهلت"
-
-msgid "Sachsen"
-msgstr "ساكسونيا"
-
-msgid "Schleswig-Holstein"
-msgstr "شليسفيغ - هولشتاين"
-
-msgid "Thueringen"
-msgstr "تورينغن"
-
-msgid "Mallorca"
-msgstr "مايوركا"
-
-msgid "Galicia"
-msgstr "غاليسيا"
-
-msgid "Scandinavia"
-msgstr "سكندينافيا"
-
-msgid "England"
-msgstr "بريطانيا"
-
-msgid "Buckinghamshire"
-msgstr "باكينجهامشير"
-
-msgid "Cambridgeshire"
-msgstr "كامبريدجشاير"
-
-msgid "Cumbria"
-msgstr "كمبريا"
-
-msgid "East yorkshire with hull"
-msgstr ""
-
-msgid "Essex"
-msgstr ""
-
-msgid "Herefordshire"
-msgstr "هيريفوردشاير"
-
-msgid "Kent"
-msgstr "كنت"
-
-msgid "Lancashire"
-msgstr "لانكشاير"
-
-msgid "Leicestershire"
-msgstr "لايسسترشاير"
-
-msgid "Norfolk"
-msgstr "نورفولك"
-
-msgid "Nottinghamshire"
-msgstr "نوتينغمشاير"
-
-msgid "Oxfordshire"
-msgstr "أوكسفوردشاير"
-
-msgid "Shropshire"
-msgstr "شروبشاير"
-
-msgid "Somerset"
-msgstr "سومرست"
-
-msgid "South yorkshire"
-msgstr "يوركشاير الجنوبية"
-
-msgid "Suffolk"
-msgstr "سوفولك"
-
-msgid "Surrey"
-msgstr "سورّي"
-
-msgid "Wiltshire"
-msgstr "ويلتشايرر"
-
-msgid "Scotland"
-msgstr "أسكتلندا"
-
-msgid "Wales"
-msgstr "ويلز"
-
-msgid "Crete"
-msgstr "كريتا"
-
-msgid "North America"
-msgstr "أمريكا الشمالية"
-
-msgid "Alaska"
-msgstr "ألاسكا"
-
-msgid "Hawaii"
-msgstr "هاواي"
-
-msgid "USA"
-msgstr "الوﻻيات المتحدة الامريكية"
-
-msgid " (except Alaska and Hawaii)"
-msgstr " (بدون ألاسكا و هاواي)"
-
-msgid "Midwest"
-msgstr "وسط الغرب"
-
-msgid "Michigan"
-msgstr "ميشيغان"
-
-msgid "Ohio"
-msgstr "أوهايو"
-
-msgid "Northeast"
-msgstr "الشمال الشرقي"
-
-msgid "Massachusetts"
-msgstr "ماساتشوستس"
-
-msgid "Vermont"
-msgstr "فيرمونت"
-
-msgid "Pacific"
-msgstr "المحيط الهادئ"
-
-msgid "South"
-msgstr "الجنوب"
-
-msgid "Arkansas"
-msgstr "أركنساس"
-
-msgid "District of Columbia"
-msgstr "مقاطعة كولومبيا"
-
-msgid "Florida"
-msgstr "فلوريدا"
-
-msgid "Louisiana"
-msgstr "لويزيانا"
-
-msgid "Maryland"
-msgstr "ميريلاند"
-
-msgid "Mississippi"
-msgstr "ميسيسيبي"
-
-msgid "Oklahoma"
-msgstr "أوكلاهوما"
-
-msgid "Texas"
-msgstr "تكساس"
-
-msgid "Virginia"
-msgstr "فرجينيا"
-
-msgid "West Virginia"
-msgstr "غرب فيرجينيا"
-
-msgid "West"
-msgstr "الغرب"
-
-msgid "Arizona"
-msgstr "أريزونا"
-
-msgid "California"
-msgstr "كاليفورنيا"
-
-msgid "Colorado"
-msgstr "كولورادو"
-
-msgid "Idaho"
-msgstr "إداهو"
-
-msgid "Montana"
-msgstr "مونتانا"
-
-msgid "New Mexico"
-msgstr "نيو مكسيكو"
-
-msgid "Nevada"
-msgstr "نيفادا"
-
-msgid "Oregon"
-msgstr "أوريغون"
-
-msgid "Utah"
-msgstr "يوتاه"
-
-msgid "Washington State"
-msgstr "ولاية واشنطن"
-
-msgid "South+Middle America"
-msgstr "جنوب و وسط امريكا"
-
-msgid "Guyane Francaise"
-msgstr "غويانا الفرنسية"
-
-msgid "downloading"
-msgstr "يُنزّل"
-
-#. Android resource: @strings/map_download_ready
-msgid "ready"
-msgstr "جاهز"
-
-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 "لا يوجد مجال فارغ كافي"
-
-msgid "Error downloading map!"
-msgstr "خطأ أثناء تنزيل الخريطة!"
-
-msgid "Error writing map!"
-msgstr "خطأ عند كتابة الخريطة!"
-
-msgid "Map download aborted!"
-msgstr "تم إجهاض عملية التنزيل للخريطة !"
-
-#. Android resource: @strings/map_download_eta
-msgid "ETA"
-msgstr "زمن الوصول المتوقع"
-
-#. Android resource: @strings/map_download_title
-msgid "Map download"
-msgstr "تنزيل الخريطة"
-
 msgid "Vehicle Position"
 msgstr "موقع وسيلة التنقل"
 
@@ -2525,9 +2104,18 @@ msgstr "ملء الشاشة"
 msgid "Window Mode"
 msgstr "نمط النافذة"
 
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Manual zoom"
+msgstr ""
+
 msgid "Layers"
 msgstr ""
 
+msgid "Zoom to route"
+msgstr ""
+
 msgid "Description"
 msgstr "الوصف"
 
@@ -2627,14 +2215,30 @@ msgstr "النسخ الاحتياطي والاستعادة"
 msgid "Set map location"
 msgstr ""
 
+#. Android resource: @strings/position_popup_drive_here
+msgid "Route to here"
+msgstr "الطريق إلى هنا"
+
 #. Android resource: @strings/map_delete
 msgid "Delete this map?"
 msgstr "حذف هذه الخريطة ؟"
 
+#. Android resource: @strings/map_download_title
+msgid "Map download"
+msgstr "تنزيل الخريطة"
+
 #. Android resource: @strings/map_download_downloading
 msgid "Downloading:"
 msgstr "جاري التنزيل:"
 
+#. Android resource: @strings/map_download_eta
+msgid "ETA"
+msgstr "زمن الوصول المتوقع"
+
+#. Android resource: @strings/map_download_ready
+msgid "ready"
+msgstr "جاهز"
+
 #. Android resource: @strings/map_download_download_error
 msgid "Error downloading map."
 msgstr "خطأ عند تنزيل الخريطة."
@@ -2643,6 +2247,10 @@ msgstr "خطأ عند تنزيل الخريطة."
 msgid "Map download aborted"
 msgstr "تم إجهاض عملية تنزيل الخريطة"
 
+#. Android resource: @strings/map_download_not_enough_free_space
+msgid "Not enough free space"
+msgstr "لا يوجد مجال فارغ كافي"
+
 #. Android resource: @strings/map_no_fix
 msgid "No location. Reopen after location fix."
 msgstr ""
@@ -2663,6 +2271,10 @@ msgstr "أدخل الهدف"
 msgid "Match partial address"
 msgstr ""
 
+#. Android resource: @strings/address_search_button
+msgid "Search"
+msgstr "إبحث"
+
 #. Android resource: @strings/address_search_searching
 msgid "Searching..."
 msgstr "جاري البحث..."
@@ -2691,6 +2303,10 @@ msgstr "لم يتم إدخال أي نص"
 msgid "Setting destination to:"
 msgstr "جاري تعيين الإتجاه إلى:"
 
+#. Android resource: @strings/address_search_towns
+msgid "Towns"
+msgstr "البلدات"
+
 #. Android resource: @strings/choose_an_action
 msgid "Choose an action"
 msgstr "اختر فعلاَ"
@@ -2764,6 +2380,353 @@ msgid ""
 "Should we ask the system to show voice download dialog?"
 msgstr ""
 
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
+msgstr ""
+
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
+msgstr ""
+
+#, c-format
+#~ msgid "Route %4.0fkm    %02d:%02d ETA"
+#~ msgstr "Route %4.0fكلم    %02d:%02d ETA"
+
+#~ msgid "Downloaded maps"
+#~ msgstr "الخرائط المنزلة"
+
+#~ msgid "partial match"
+#~ msgstr "تطابق جزئي"
+
+#~ msgid "Taiwan"
+#~ msgstr "تايوان"
+
+#~ msgid "Asia"
+#~ msgstr "آسيا"
+
+#~ msgid "Canary Islands"
+#~ msgstr "جزر الكناري"
+
+#~ msgid "Africa"
+#~ msgstr "إفريقيا"
+
+#~ msgid "Korea"
+#~ msgstr "كوريا"
+
+#~ msgid "BeNeLux"
+#~ msgstr "بلجيكا هولاندة اللكسمبرغ"
+
+#~ msgid "Alsace"
+#~ msgstr "الألزاس"
+
+#~ msgid "Tasmania"
+#~ msgstr "تسمانيا"
+
+#~ msgid "Victoria"
+#~ msgstr "فيكتوريا"
+
+#~ msgid "UAE+Other"
+#~ msgstr "الإمارت العرية المتحدة و أخرى"
+
+#~ msgid "Oceania"
+#~ msgstr "أوقيانيا"
+
+#~ msgid "Western Europe"
+#~ msgstr "أوروبا الغربية"
+
+#~ msgid "New South Wales"
+#~ msgstr "نيو ساوث ويلز"
+
+#~ msgid "Europe"
+#~ msgstr "أوروبا"
+
+#~ msgid "Corse"
+#~ msgstr "كورسيكا"
+
+#~ msgid "Ile-de-France"
+#~ msgstr "عاصمة فرنسا و ضواحيها"
+
+#~ msgid "Bayern"
+#~ msgstr "بافاريا"
+
+#~ msgid "Oberbayern"
+#~ msgstr "بافاريا العليا"
+
+#~ msgid "Niederbayern"
+#~ msgstr "بافاريا السفلى"
+
+#~ msgid "Bremen"
+#~ msgstr "بريمن"
+
+#~ msgid "Hamburg"
+#~ msgstr "هامبرغ"
+
+#~ msgid "Berlin"
+#~ msgstr "برلين"
+
+#~ msgid "Sachsen"
+#~ msgstr "ساكسونيا"
+
+#~ msgid "England"
+#~ msgstr "بريطانيا"
+
+#~ msgid "Scandinavia"
+#~ msgstr "سكندينافيا"
+
+#~ msgid "Oxfordshire"
+#~ msgstr "أوكسفوردشاير"
+
+#~ msgid "Norfolk"
+#~ msgstr "نورفولك"
+
+#~ msgid "Crete"
+#~ msgstr "كريتا"
+
+#~ msgid "North America"
+#~ msgstr "أمريكا الشمالية"
+
+#~ msgid "South yorkshire"
+#~ msgstr "يوركشاير الجنوبية"
+
+#~ msgid "Suffolk"
+#~ msgstr "سوفولك"
+
+#~ msgid "Shropshire"
+#~ msgstr "شروبشاير"
+
+#~ msgid "Somerset"
+#~ msgstr "سومرست"
+
+#~ msgid "Ohio"
+#~ msgstr "أوهايو"
+
+#~ msgid " (except Alaska and Hawaii)"
+#~ msgstr " (بدون ألاسكا و هاواي)"
+
+#~ msgid "USA"
+#~ msgstr "الوﻻيات المتحدة الامريكية"
+
+#~ msgid "Hawaii"
+#~ msgstr "هاواي"
+
+#~ msgid "Alaska"
+#~ msgstr "ألاسكا"
+
+#~ msgid "Northeast"
+#~ msgstr "الشمال الشرقي"
+
+#~ msgid "Michigan"
+#~ msgstr "ميشيغان"
+
+#~ msgid "Midwest"
+#~ msgstr "وسط الغرب"
+
+#~ msgid "Vermont"
+#~ msgstr "فيرمونت"
+
+#~ msgid "Massachusetts"
+#~ msgstr "ماساتشوستس"
+
+#~ msgid "Pacific"
+#~ msgstr "المحيط الهادئ"
+
+#~ msgid "South"
+#~ msgstr "الجنوب"
+
+#~ msgid "Arkansas"
+#~ msgstr "أركنساس"
+
+#~ msgid "District of Columbia"
+#~ msgstr "مقاطعة كولومبيا"
+
+#~ msgid "Florida"
+#~ msgstr "فلوريدا"
+
+#~ msgid "Maryland"
+#~ msgstr "ميريلاند"
+
+#~ msgid "Oklahoma"
+#~ msgstr "أوكلاهوما"
+
+#~ msgid "Louisiana"
+#~ msgstr "لويزيانا"
+
+#~ msgid "Mississippi"
+#~ msgstr "ميسيسيبي"
+
+#~ msgid "Texas"
+#~ msgstr "تكساس"
+
+#~ msgid "Nevada"
+#~ msgstr "نيفادا"
+
+#~ msgid "New Mexico"
+#~ msgstr "نيو مكسيكو"
+
+#~ msgid "West Virginia"
+#~ msgstr "غرب فيرجينيا"
+
+#~ msgid "Virginia"
+#~ msgstr "فرجينيا"
+
+#~ msgid "Arizona"
+#~ msgstr "أريزونا"
+
+#~ msgid "West"
+#~ msgstr "الغرب"
+
+#~ msgid "California"
+#~ msgstr "كاليفورنيا"
+
+#~ msgid "Montana"
+#~ msgstr "مونتانا"
+
+#~ msgid "Idaho"
+#~ msgstr "إداهو"
+
+#~ msgid "Colorado"
+#~ msgstr "كولورادو"
+
+#~ msgid "Error downloading map!"
+#~ msgstr "خطأ أثناء تنزيل الخريطة!"
+
+#~ msgid "downloading"
+#~ msgstr "يُنزّل"
+
+#~ msgid "Washington State"
+#~ msgstr "ولاية واشنطن"
+
+#~ msgid "South+Middle America"
+#~ msgstr "جنوب و وسط امريكا"
+
+#~ msgid "Oregon"
+#~ msgstr "أوريغون"
+
+#~ msgid "Utah"
+#~ msgstr "يوتاه"
+
+#~ msgid "Error writing map!"
+#~ msgstr "خطأ عند كتابة الخريطة!"
+
+#~ msgid "Map download aborted!"
+#~ msgstr "تم إجهاض عملية التنزيل للخريطة !"
+
+#~ msgid "Whole Planet"
+#~ msgstr "كامل القرة الأرضية"
+
+#~ msgid "Azores"
+#~ msgstr "جزر الأزور"
+
+#~ msgid "Cancel"
+#~ msgstr "إلغاء"
+
+#~ msgid "Centre"
+#~ msgstr "الوسط"
+
+#~ msgid "Mittelfranken"
+#~ msgstr "فرانكن الوسطى"
+
+#~ msgid "Baden-Wuerttemberg"
+#~ msgstr "بادن فورتمبيرغ"
+
+#~ msgid "Rhone-Alpes"
+#~ msgstr "رون-جبال الألب"
+
+#~ msgid "Oberpfalz"
+#~ msgstr "بفالز العليا"
+
+#~ msgid "Oberfranken"
+#~ msgstr "فرانكن العليا"
+
+#~ msgid "Picardie"
+#~ msgstr "بيكاردي"
+
+#~ msgid "Poitou-Charentes"
+#~ msgstr "بواتو شارانت"
+
+#~ msgid "Unterfranken"
+#~ msgstr "فرانكن السفلى"
+
+#~ msgid "Schwaben"
+#~ msgstr "شفابن"
+
+#~ msgid "Niedersachsen"
+#~ msgstr "نيدرزاكسن"
+
+#~ msgid "Nordrhein-westfalen"
+#~ msgstr "نوردراين-فيستفالن"
+
+#~ msgid "Hessen"
+#~ msgstr "هسن"
+
+#~ msgid "Mecklenburg-Vorpommern"
+#~ msgstr "مكليمبورغ-فوربومرن"
+
+#~ msgid "Brandenburg"
+#~ msgstr "براندنبورغ"
+
+#~ msgid "Rheinland-Pfalz"
+#~ msgstr "راينلاند-بفالز"
+
+#~ msgid "Saarland"
+#~ msgstr "زارلاند"
+
+#~ msgid "Sachsen-Anhalt"
+#~ msgstr "زاكسن-أنهلت"
+
+#~ msgid "Cumbria"
+#~ msgstr "كمبريا"
+
+#~ msgid "Herefordshire"
+#~ msgstr "هيريفوردشاير"
+
+#~ msgid "Thueringen"
+#~ msgstr "تورينغن"
+
+#~ msgid "Schleswig-Holstein"
+#~ msgstr "شليسفيغ - هولشتاين"
+
+#~ msgid "Galicia"
+#~ msgstr "غاليسيا"
+
+#~ msgid "Mallorca"
+#~ msgstr "مايوركا"
+
+#~ msgid "Cambridgeshire"
+#~ msgstr "كامبريدجشاير"
+
+#~ msgid "Buckinghamshire"
+#~ msgstr "باكينجهامشير"
+
+#~ msgid "Guyane Francaise"
+#~ msgstr "غويانا الفرنسية"
+
+#~ msgid "Nottinghamshire"
+#~ msgstr "نوتينغمشاير"
+
+#~ msgid "Lancashire"
+#~ msgstr "لانكشاير"
+
+#~ msgid "Kent"
+#~ msgstr "كنت"
+
+#~ msgid "Leicestershire"
+#~ msgstr "لايسسترشاير"
+
+#~ msgid "Scotland"
+#~ msgstr "أسكتلندا"
+
+#~ msgid "Wales"
+#~ msgstr "ويلز"
+
+#~ msgid "Surrey"
+#~ msgstr "سورّي"
+
+#~ msgid "Wiltshire"
+#~ msgstr "ويلتشايرر"
+
 #, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "ثم أخرج من المستديرة عند الــ%1$s %2$s"