Merge branch 'master' of ssh://github.com/osmandapp/Osmand

.gitignore

@@ -6,3 +6,4 @@ h_*.png
 g_*.png
 mm_*.png
 mx_*.png
+*.class

.tx/config

@@ -0,0 +1,14 @@
+[main]
+host = https://www.transifex.com
+
+[osmand.stringsxml]
+file_filter = OsmAnd/res/values-<lang>/strings.xml
+source_file = OsmAnd/res/values/strings.xml
+source_lang = en
+lang_map = zh-CN:zh-rCN, zh-TW:zh-rTW
+
+[osmand.bidforfixxml]
+file_filter = OsmAnd/res/values-<lang>/bidforfix.xml
+source_file = OsmAnd/res/values/bidforfix.xml
+source_lang = en
+lang_map = zh-CN:zh-rCN, zh-TW:zh-rTW

OsmAnd-java/.gitignore

@@ -1,2 +1,4 @@
 bin
+c-src
 OsmAnd-core.jar
+src/net/osmand/core/jni/*

OsmAnd-java/Android.mk

@@ -0,0 +1,28 @@
+include $(CLEAR_VARS)
+
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true)
+    LOCAL_MODULE := OsmAndJNI
+else
+    LOCAL_MODULE := OsmAndJNI_neon
+    LOCAL_ARM_NEON := true
+endif
+
+ifeq ($(LOCAL_ARM_NEON),true)
+    OSMAND_BINARY_SUFFIX := _neon
+else
+    OSMAND_BINARY_SUFFIX :=
+endif
+
+LOCAL_STATIC_LIBRARIES := OsmAndCore$(OSMAND_BINARY_SUFFIX)
+
+ifneq ($(OSMAND_USE_PREBUILT),true)
+    LOCAL_SRC_FILES := src/swig.c
+
+    include $(BUILD_SHARED_LIBRARY)
+else
+    LOCAL_SRC_FILES := \
+        $(OSMAND_ANDROID_PREBUILT_ROOT)/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
+    include $(PREBUILT_SHARED_LIBRARY)
+endif

OsmAnd-java/CMakeLists.txt

@@ -0,0 +1,59 @@
+project(OsmAndJNI)
+
+set(target_specific_private_includes "")
+set(target_specific_public_libraries "")
+if(CMAKE_TARGET_OS STREQUAL "windows")
+	set(target_specific_private_includes ${target_specific_private_includes}
+		"$ENV{JAVA_HOME}/include/win32"
+	)
+elseif(CMAKE_TARGET_OS STREQUAL "darwin")
+	set(target_specific_private_includes ${target_specific_private_includes}
+		"$ENV{JAVA_HOME}/include/darwin"
+	)
+elseif(CMAKE_TARGET_OS STREQUAL "linux")
+	set(target_specific_private_includes ${target_specific_private_includes}
+		"$ENV{JAVA_HOME}/include/linux"
+	)
+	set(target_specific_public_libraries ${target_specific_public_libraries}
+		rt
+	)
+endif()
+
+if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET)
+	add_library(OsmAndJNI SHARED
+		"c-src/swig.cpp"
+	)
+	target_compile_definitions(OsmAndJNI
+		PRIVATE
+			-DOSMAND_CORE_EXPORTS
+	)
+	target_include_directories(OsmAndJNI
+		PRIVATE
+			"$ENV{JAVA_HOME}/include"
+			${target_specific_private_includes}
+	)
+
+	if(CMAKE_STATIC_LIBS_ALLOWED_ON_TARGET)
+		add_dependencies(OsmAndJNI
+			OsmAndCore_static
+			OsmAndCoreUtils_static
+		)
+		target_link_libraries(OsmAndJNI
+			LINK_PUBLIC
+				OsmAndCore_static
+				OsmAndCoreUtils_static
+				${target_specific_public_libraries}
+		)
+	else()
+		add_dependencies(OsmAndJNI
+			OsmAndCore_shared
+			OsmAndCoreUtils_shared
+		)
+		target_link_libraries(OsmAndJNI
+			LINK_PUBLIC
+				OsmAndCore_shared
+				OsmAndCoreUtils_shared
+				${target_specific_public_libraries}
+		)
+	endif()
+endif()

OsmAnd-java/collect_libs.sh

@@ -1,27 +1,42 @@
 #!/bin/bash
+
+set -e
+
 SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT_LOC="$SCRIPT_LOC/../.."
+
+if [[ "$(uname -a)" =~ Linux ]]; then
+	if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then
+		OSMAND_BUILD_CPU_CORES_NUM=`nproc`
+	fi
+fi
+if [[ "$(uname -a)" =~ Darwin ]]; then
+	if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then
+		OSMAND_BUILD_CPU_CORES_NUM=`sysctl hw.ncpu | awk '{print $2}'`
+	fi
+fi
+
 function copyLibs {
 	if [ -d "$ROOT_LOC/binaries/$1/$2" ]; then 
 		echo "Copy binaries $1 $2";
 		cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndJNI.$4 bin/OsmAndJNI-$1-$3.lib
-		cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndCoreUtils.$4 bin/OsmAndCoreUtils-$1-$3.lib
-		cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndCore.$4 bin/OsmAndCore-$1-$3.lib
-		cp "$ROOT_LOC"/core/externals/qtbase-desktop/upstream.patched.$1.$2/lib/libQt5Core.$4.5.0.2 bin/Qt5Core-$1-$3.lib
 	fi
 }
 
 function compile {
-	"$ROOT_LOC/core/externals/configure.sh"
+	OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glew glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-desktop skia zlib)
-	"$ROOT_LOC/core/externals/qtbase-desktop/build.sh"
+	"$ROOT_LOC/core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]}
-	if [ ! -d "$ROOT_LOC/baked/amd64-linux-gcc-amd64-linux-gcc" ]; then 
+	"$ROOT_LOC/core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]}
-		"$ROOT_LOC/build/amd64-linux-gcc.sh"
+	"$ROOT_LOC/tools/map-viewer/externals/configure.sh"
+	"$ROOT_LOC/android/OsmAnd-java/generate-swig.sh"
+	if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then 
+		"$ROOT_LOC/build/amd64-linux-gcc.sh" release
 	fi
-	(cd "$ROOT_LOC/baked/amd64-linux-gcc-amd64-linux-gcc" && make -j`nproc`)
+	(cd "$ROOT_LOC/baked/amd64-linux-gcc-release.makefile" && make -j$OSMAND_BUILD_CPU_CORES_NUM OsmAndJNI)
-	if [ ! -d "$ROOT_LOC/baked/i686-linux-gcc-i686-linux-gcc" ]; then 
+	if [ ! -d "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" ]; then 
-		"$ROOT_LOC/build/i686-linux-gcc.sh"
+		"$ROOT_LOC/build/i686-linux-gcc.sh" release
 	fi
-	(cd "$ROOT_LOC/baked/i686-linux-gcc-i686-linux-gcc" && make -j`nproc`)
+	(cd "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" && make -j$OSMAND_BUILD_CPU_CORES_NUM OsmAndJNI)
 }
 
 compile

OsmAnd-java/generate-swig.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SRCLOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+rm -rf "$SRCLOC/src/net/osmand/core/jni"
+mkdir -p "$SRCLOC/src/net/osmand/core/jni"
+
+rm -rf "$SRCLOC/c-src"
+mkdir -p "$SRCLOC/c-src"
+
+swig -java -package net.osmand.core.jni -outdir "$SRCLOC/src/net/osmand/core/jni" -o "$SRCLOC/c-src/swig.cpp" -I"$SRCLOC/../../core/include" -c++ -v "$SRCLOC/../../core/core.swig"

OsmAnd-java/jni.cmake

@@ -0,0 +1,3 @@
+# OsmAnd JNI
+add_subdirectory("${OSMAND_ROOT}/android/OsmAnd-java" "jni")
+add_dependencies(OsmAndJNI OsmAndCore)

OsmAnd-java/src/net/osmand/NativeLibrary.java

@@ -230,6 +230,12 @@ public class NativeLibrary {
 		return b;
 	}
 	
+	public static boolean loadOldLib(String path) {
+		boolean b = true;
+		b &= load("osmand", path);
+		return b;
+	}
+
 	public static boolean load(String libBaseName, String path) {
 		// look for a pre-installed library
 		if (path != null) {

OsmAnd-java/src/net/osmand/binary/BinaryInspector.java

@@ -465,7 +465,7 @@ public class BinaryInspector {
 				int size = index.preloadStreets(c, null);
 				List<Street> streets = new ArrayList<Street>(c.getStreets());
 				print(MessageFormat.format("\t\t''{0}'' [{1,number,#}], {2,number,#} street(s) size {3,number,#} bytes",
-						new Object[]{c.getEnName(), c.getId(), Integer.valueOf(streets.size()), Integer.valueOf(size)}));
+						new Object[]{c.getEnName(), c.getId(), streets.size(), size}));
 				if(!verbose.vstreets)
 		        {
 					println("");
@@ -483,7 +483,7 @@ public class BinaryInspector {
 					final List<Street> intersections = t.getIntersectedStreets();
 				
 					println(MessageFormat.format("\t\t\t''{0}'' [{1,number,#}], {2,number,#} building(s), {3,number,#} intersections(s)",
-							new Object[]{t.getEnName(), t.getId(), Integer.valueOf(buildings.size()), Integer.valueOf(intersections.size())}));
+							new Object[]{t.getEnName(), t.getId(), buildings.size(), intersections.size()}));
 					
 					if (buildings != null && !buildings.isEmpty() && verbose.vbuildings) {
 						println("\t\t\t\tBuildings:");

OsmAnd-java/src/net/osmand/binary/BinaryInspectorNative.java

@@ -5,8 +5,6 @@ import java.io.IOException;
 import java.util.Collections;
 
 import net.osmand.NativeLibrary;
-import net.osmand.bridge.ObfInspector;
-import net.osmand.bridge.StringVector;
 
 public class BinaryInspectorNative {
 	
@@ -21,9 +19,9 @@ public class BinaryInspectorNative {
 		args = new String[]{"-vmap", "-bbox=11.3,47.1,11.6,47", "/home/victor/projects/OsmAnd/data/osm-gen/Austria_2.obf"};
 		// test cases show info
 		NativeLibrary.loadAllLibs(null);
-		StringVector vector = new StringVector();
+//		StringVector vector = new StringVector();
-        Collections.addAll(vector, args);
+//        Collections.addAll(vector, args);
-		ObfInspector.inspector(vector);
+//		ObfInspector.inspector(vector);
 	}
 	
 	public static void printUsage(String warning) {

OsmAnd-java/src/net/osmand/bridge/CoreOsmAnd.java

@@ -1,56 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package net.osmand.bridge;
-
-public class CoreOsmAnd {
-  public static int get31TileNumberX(double longitude) {
-    return CoreOsmAndJNI.get31TileNumberX(longitude);
-  }
-
-  public static int get31TileNumberY(double latitude) {
-    return CoreOsmAndJNI.get31TileNumberY(latitude);
-  }
-
-  public static double get31LongitudeX(int x) {
-    return CoreOsmAndJNI.get31LongitudeX(x);
-  }
-
-  public static double get31LatitudeY(int y) {
-    return CoreOsmAndJNI.get31LatitudeY(y);
-  }
-
-  public static double getTileNumberX(float zoom, double longitude) {
-    return CoreOsmAndJNI.getTileNumberX(zoom, longitude);
-  }
-
-  public static double getTileNumberY(float zoom, double latitude) {
-    return CoreOsmAndJNI.getTileNumberY(zoom, latitude);
-  }
-
-  public static double checkLatitude(double latitude) {
-    return CoreOsmAndJNI.checkLatitude(latitude);
-  }
-
-  public static double checkLongitude(double longitude) {
-    return CoreOsmAndJNI.checkLongitude(longitude);
-  }
-
-  public static double getPowZoom(float zoom) {
-    return CoreOsmAndJNI.getPowZoom(zoom);
-  }
-
-  public static double getLongitudeFromTile(float zoom, double x) {
-    return CoreOsmAndJNI.getLongitudeFromTile(zoom, x);
-  }
-
-  public static double getLatitudeFromTile(float zoom, double y) {
-    return CoreOsmAndJNI.getLatitudeFromTile(zoom, y);
-  }
-
-}

OsmAnd-java/src/net/osmand/bridge/CoreOsmAndJNI.java

@@ -1,37 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package net.osmand.bridge;
-
-public class CoreOsmAndJNI {
-  public final static native long new_StringVector__SWIG_0();
-  public final static native long new_StringVector__SWIG_1(long jarg1);
-  public final static native long StringVector_size(long jarg1, StringVector jarg1_);
-  public final static native long StringVector_capacity(long jarg1, StringVector jarg1_);
-  public final static native void StringVector_reserve(long jarg1, StringVector jarg1_, long jarg2);
-  public final static native boolean StringVector_isEmpty(long jarg1, StringVector jarg1_);
-  public final static native void StringVector_clear(long jarg1, StringVector jarg1_);
-  public final static native void StringVector_add(long jarg1, StringVector jarg1_, String jarg2);
-  public final static native String StringVector_get(long jarg1, StringVector jarg1_, int jarg2);
-  public final static native void StringVector_set(long jarg1, StringVector jarg1_, int jarg2, String jarg3);
-  public final static native void delete_StringVector(long jarg1);
-  public final static native int ObfInspector_inspector(long jarg1, StringVector jarg1_);
-  public final static native long new_ObfInspector();
-  public final static native void delete_ObfInspector(long jarg1);
-  public final static native int get31TileNumberX(double jarg1);
-  public final static native int get31TileNumberY(double jarg1);
-  public final static native double get31LongitudeX(int jarg1);
-  public final static native double get31LatitudeY(int jarg1);
-  public final static native double getTileNumberX(float jarg1, double jarg2);
-  public final static native double getTileNumberY(float jarg1, double jarg2);
-  public final static native double checkLatitude(double jarg1);
-  public final static native double checkLongitude(double jarg1);
-  public final static native double getPowZoom(float jarg1);
-  public final static native double getLongitudeFromTile(float jarg1, double jarg2);
-  public final static native double getLatitudeFromTile(float jarg1, double jarg2);
-}

OsmAnd-java/src/net/osmand/bridge/ObfInspector.java

@@ -1,46 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package net.osmand.bridge;
-
-public class ObfInspector {
-  private long swigCPtr;
-  protected boolean swigCMemOwn;
-
-  protected ObfInspector(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  protected static long getCPtr(ObfInspector obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-
-  protected void finalize() {
-    delete();
-  }
-
-  public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        CoreOsmAndJNI.delete_ObfInspector(swigCPtr);
-      }
-      swigCPtr = 0;
-    }
-  }
-
-  public static int inspector(StringVector argv) {
-    return CoreOsmAndJNI.ObfInspector_inspector(StringVector.getCPtr(argv), argv);
-  }
-
-  public ObfInspector() {
-    this(CoreOsmAndJNI.new_ObfInspector(), true);
-  }
-
-}

OsmAnd-java/src/net/osmand/bridge/StringVector.java

@@ -1,84 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package net.osmand.bridge;
-
-import java.util.AbstractList;
-import java.util.List;
-
-public class StringVector extends AbstractList<String> {
-  private long swigCPtr;
-  protected boolean swigCMemOwn;
-
-  protected StringVector(long cPtr, boolean cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = cPtr;
-  }
-
-  protected static long getCPtr(StringVector obj) {
-    return (obj == null) ? 0 : obj.swigCPtr;
-  }
-
-  protected void finalize() {
-    delete();
-  }
-
-  public synchronized void delete() {
-    if (swigCPtr != 0) {
-      if (swigCMemOwn) {
-        swigCMemOwn = false;
-        CoreOsmAndJNI.delete_StringVector(swigCPtr);
-      }
-      swigCPtr = 0;
-    }
-  }
-
-  public StringVector() {
-    this(CoreOsmAndJNI.new_StringVector__SWIG_0(), true);
-  }
-
-  public StringVector(long n) {
-    this(CoreOsmAndJNI.new_StringVector__SWIG_1(n), true);
-  }
-
-  public int size() {
-    return (int) CoreOsmAndJNI.StringVector_size(swigCPtr, this);
-  }
-
-  public long capacity() {
-    return CoreOsmAndJNI.StringVector_capacity(swigCPtr, this);
-  }
-
-  public void reserve(long n) {
-    CoreOsmAndJNI.StringVector_reserve(swigCPtr, this, n);
-  }
-
-  public boolean isEmpty() {
-    return CoreOsmAndJNI.StringVector_isEmpty(swigCPtr, this);
-  }
-
-  public void clear() {
-    CoreOsmAndJNI.StringVector_clear(swigCPtr, this);
-  }
-
-  public boolean add(String x) {
-    CoreOsmAndJNI.StringVector_add(swigCPtr, this, x);
-    return true;
-  }
-
-  public String get(int i) {
-    return CoreOsmAndJNI.StringVector_get(swigCPtr, this, i);
-  }
-
-  public String set(int i, String val) {
-	  String prev = CoreOsmAndJNI.StringVector_get(swigCPtr, this, i);
-    CoreOsmAndJNI.StringVector_set(swigCPtr, this, i, val);
-    return prev;
-  }
-
-}

OsmAnd-java/src/net/osmand/data/AmenityType.java

@@ -43,13 +43,14 @@ public enum AmenityType {
 		this.defaultTag = defaultTag;	
 	}
 	
-	public static AmenityType fromString(String s){
+	public static AmenityType fromString(String s) {
-		try {
+		for (AmenityType t : values()) {
-			return AmenityType.valueOf(s.toUpperCase());
+			if (t.name().equalsIgnoreCase(s)) {
-		} catch (IllegalArgumentException e) {
+				return t;
-			return AmenityType.OTHER;
 			}
 		}
+		return OTHER;
+	}
 	
 	public String getDefaultTag() {
 		return defaultTag;

OsmAnd-java/src/net/osmand/map/TileSourceManager.java

@@ -288,7 +288,7 @@ public class TileSourceManager {
 					String fileName = file.getName();
 					if (fileName.endsWith(".tile")) {
 						String substring = fileName.substring(0, fileName.length() - ".tile".length());
-						int extInt = substring.lastIndexOf(".");
+						int extInt = substring.lastIndexOf('.');
 						if (extInt != -1) {
 							return substring.substring(extInt, substring.length());
 						}

OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java

@@ -248,7 +248,7 @@ public class MapRenderingTypes {
 			rtype.value = null;
 		}
 		if (poiParentCategory != null) {
-			rtype.poiCategory = AmenityType.valueOf(poiParentCategory.toUpperCase());
+			rtype.poiCategory = AmenityType.fromString(poiParentCategory);
 			rtype.poiSpecified = true;
 		}
 		if (poiParentPrefix != null) {
@@ -305,7 +305,7 @@ public class MapRenderingTypes {
 		String tag = parser.getAttributeValue("","poi_tag");
 		if (tag != null) {
 			AmenityRuleType rtype = new AmenityRuleType();
-			rtype.poiCategory = AmenityType.valueOf(poiParentCategory.toUpperCase());
+			rtype.poiCategory = AmenityType.fromString(poiParentCategory);
 			rtype.poiSpecified = true;
 			rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation"));
 			rtype.poiPrefix = poiParentPrefix;

OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java

@@ -18,6 +18,7 @@ public class RenderingRuleStorageProperties {
 	
 	public static final String TEXT_LENGTH = "textLength";
 	public static final String NAME_TAG = "nameTag";
+	public static final String NAME_TAG2 = "nameTag2";
 	public static final String TEXT_SHIELD = "textShield";
 	public static final String SHADOW_RADIUS = "shadowRadius";
 	public static final String SHADOW_COLOR = "shadowColor";
@@ -76,6 +77,7 @@ public class RenderingRuleStorageProperties {
 	public RenderingRuleProperty R_ATTR_STRING_VALUE;
 	public RenderingRuleProperty R_TEXT_LENGTH;
 	public RenderingRuleProperty R_NAME_TAG;
+	public RenderingRuleProperty R_NAME_TAG2;
 	public RenderingRuleProperty R_TEXT_SHIELD;
 	public RenderingRuleProperty R_SHADOW_RADIUS;
 	public RenderingRuleProperty R_SHADOW_COLOR;
@@ -159,6 +161,7 @@ public class RenderingRuleStorageProperties {
 		
 		R_TEXT_LENGTH = registerRuleInternal(RenderingRuleProperty.createInputIntProperty(TEXT_LENGTH));
 		R_NAME_TAG = registerRuleInternal(RenderingRuleProperty.createInputStringProperty(NAME_TAG));
+		R_NAME_TAG2 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty(NAME_TAG2));
 
 		R_DISABLE = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(DISABLE));
 		R_ATTR_INT_VALUE = registerRuleInternal(RenderingRuleProperty.createOutputIntProperty(ATTR_INT_VALUE));

OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java

@@ -20,9 +20,9 @@ import org.apache.commons.logging.Log;
 
 public class BinaryRoutePlanner {
 	
-	private final int REVERSE_WAY_RESTRICTION_ONLY = 1024;
+	private static final int REVERSE_WAY_RESTRICTION_ONLY = 1024;
-	/*private*/ final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 220;
+	/*private*/ static final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 220;
-	/*private */final int STANDARD_ROAD_VISITED_OVERHEAD = 150;
+	/*private*/ static final int STANDARD_ROAD_VISITED_OVERHEAD = 150;
 	
 	protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class);
 	

OsmAnd-java/src/net/osmand/router/BinaryRoutePlannerOld.java

@@ -21,8 +21,8 @@ import org.apache.commons.logging.Log;
 public class BinaryRoutePlannerOld {
 	
 	public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = true;
-	private final int REVERSE_WAY_RESTRICTION_ONLY = 1024;
+	private static final int REVERSE_WAY_RESTRICTION_ONLY = 1024;
-	private final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 900;
+	private static final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 900;
 	
 	protected static final Log log = PlatformUtil.getLog(BinaryRoutePlannerOld.class);
 	

OsmAnd-java/src/net/osmand/util/MapAlgorithms.java

@@ -16,7 +16,7 @@ public class MapAlgorithms {
 		}
 
 		// calculate middle Y
-		long mask = 0xffffffffl;
+		long mask = 0xffffffffL;
 		long middleY = 0;
 		for (int i = 0; i < c.size(); i++) {
 			middleY =  middleY +  (long)(c.get(i) & mask);
@@ -188,7 +188,7 @@ public class MapAlgorithms {
 			by = outy;
 			//return (((long) bx) << 32) | ((long) by);
 		}
-		return -1l;
+		return -1L;
 	}
 	
 	/**

OsmAnd-java/src/net/osmand/util/MapUtils.java

@@ -124,13 +124,13 @@ public class MapUtils {
 	
 	public static int get31TileNumberX(double longitude){
 		longitude = checkLongitude(longitude);
-		long l = 1l << 31;
+		long l = 1L << 31;
 		return (int)((longitude + 180d)/360d * l);
 	}
 	public static int get31TileNumberY( double latitude){
 		latitude = checkLatitude(latitude);
 		double eval = Math.log( Math.tan(toRadians(latitude)) + 1/Math.cos(toRadians(latitude)) );
-		long l = 1l << 31;
+		long l = 1L << 31;
 		if(eval > Math.PI){
 			eval = Math.PI;
 		}
@@ -270,8 +270,8 @@ public class MapUtils {
 	}
 
 	public static String createShortLocString(double latitude, double longitude, int zoom) {
-		long lat = (long) (((latitude + 90d)/180d)*(1l << 32));
+		long lat = (long) (((latitude + 90d)/180d)*(1L << 32));
-		long lon = (long) (((longitude + 180d)/360d)*(1l << 32));
+		long lon = (long) (((longitude + 180d)/360d)*(1L << 32));
 		long code = interleaveBits(lon, lat);
 		String str = "";
 	    // add eight to the zoom level, which approximates an accuracy of one pixel in a tile.
@@ -321,8 +321,8 @@ public class MapUtils {
 		x <<= (32 - z);
 		y <<= (32 - z);
 //		int zoom = z - 8 - ((3 + z_offset) % 3);
-		double dlat = (180d * (y) / ((double)(1l << 32))) - 90d;
+		double dlat = (180d * (y) / ((double)(1L << 32))) - 90d;
-		double dlon = (360d * (x)/ ((double)(1l << 32))) - 180d;
+		double dlon = (360d * (x)/ ((double)(1L << 32))) - 180d;
 		return new LatLon(dlat, dlon);
 	}
 	

OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java

@@ -1,4 +1,5 @@
 package net.osmand.util;
+/* Has to be commented out in order to run the main function and test the package? */
 
 
 
@@ -337,7 +338,7 @@ public class OpeningHoursParser {
 		@Override
 		public String toRuleString() {
 			StringBuilder b = new StringBuilder(25);
-            { // Month
+			// Month
 			boolean dash  = false;
 			boolean first = true;
 			for (int i = 0; i < 12; i++) {
@@ -360,12 +361,11 @@ public class OpeningHoursParser {
 			}
 			if (b.length() != 0) {
 				b.append(": ");
-                }
 			}
 			// Day
-			boolean dash = false;
-			boolean first = true;
 			boolean open24_7 = true;
+			dash  = false;
+			first = true;
 			for (int i = 0; i < 7; i++) {
 				if (days[i]) {
 					if (i > 0 && days[i - 1] && i < 6 && days[i + 1]) {
@@ -453,7 +453,7 @@ public class OpeningHoursParser {
 		int previousDay   = -1;
 		int startMonth    = -1;
 		int previousMonth = -1;
-		int k = 0;
+		int k             = 0; // Position in opening_hours string
 
 		BasicOpeningHourRule basic = new BasicOpeningHourRule();
 		boolean[] days   = basic.getDays();
@@ -623,15 +623,16 @@ public class OpeningHoursParser {
 	public static OpeningHours parseOpenedHours(String format){
 		// split the OSM string in multiple rules
 		String[] rules = format.split(";"); //$NON-NLS-1$
+		// FIXME: What if the semicolon is inside a quoted string?
 		OpeningHours rs = new OpeningHours();
 		for(String r : rules){
 			r = r.trim();
-			if(r.length() == 0){
+			if (r.length() == 0) {
 				continue;
 			}
 			// check if valid
 			boolean rule = parseRule(r, rs);
-			if(!rule){
+			if (!rule) {
 				return null;
 			}
 		}
@@ -640,50 +641,64 @@ public class OpeningHoursParser {
 	
 	
 	private static void formatTime(int h, int t, StringBuilder b){
-		if(h < 10){
+		if (h < 10) {
 			b.append("0"); //$NON-NLS-1$
 		}
 		b.append(h).append(":"); //$NON-NLS-1$
-		if(t < 10){
+		if (t < 10) {
 			b.append("0"); //$NON-NLS-1$
 		}
 		b.append(t);
 	}
 	
 	
+	/**
+	 * test if the calculated opening hours are what you expect
+	 * @param time the time to test in the format "dd.MM.yyyy HH:mm"
+	 * @param hours the OpeningHours object
+	 * @param expected the expected state
+	 */
 	private static void testOpened(String time, OpeningHours hours, boolean expected) throws ParseException {
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(new SimpleDateFormat("dd.MM.yyyy HH:mm").parse(time));
-		System.out.println("Expected " + time+": " + expected +" = " + hours.isOpenedForTime(cal));
+		boolean calculated = hours.isOpenedForTime(cal);
+		System.out.printf("  %sok: Expected %s: %b = %b\n",
+			((calculated != expected) ? "NOT " : ""), time, expected, calculated);
 	}
 	
 	public static void main(String[] args) throws ParseException {
 
-		
+		// Test basic case
-		//Test basic case
 		OpeningHours hours = parseOpenedHours("Mo-Fr 08:30-14:40" ); //$NON-NLS-1$
 		System.out.println(hours);
 		testOpened("09.08.2012 11:00", hours, true);
 		testOpened("09.08.2012 16:00", hours, false);
+
 		// two time and date ranges
 		hours = parseOpenedHours("Mo-We, Fr 08:30-14:40,15:00-19:00"); //$NON-NLS-1$
 		System.out.println(hours);
 		testOpened("08.08.2012 14:00", hours, true);
-		testOpened("10.08.2012 15:00", hours, true);
 		testOpened("08.08.2012 14:50", hours, false);
+		testOpened("10.08.2012 15:00", hours, true);
+
 		// test exception on general schema
 		hours = parseOpenedHours("Mo-Sa 08:30-14:40; Tu 08:00 - 14:00"); //$NON-NLS-1$
 		System.out.println(hours);
 		testOpened("07.08.2012 14:20", hours, false);
+
 		// test off value
 		hours = parseOpenedHours("Mo-Sa 09:00-18:25; Th off"); //$NON-NLS-1$
 		System.out.println(hours);
 		testOpened("08.08.2012 12:00", hours, true);
 		testOpened("09.08.2012 12:00", hours, false);
+
 		//test 24/7
 		hours = parseOpenedHours("24/7"); //$NON-NLS-1$
 		System.out.println(hours);
 		testOpened("08.08.2012 23:59", hours, true);
+		testOpened("08.08.2012 12:23", hours, true);
+		testOpened("08.08.2012 06:23", hours, true);
+
 		// some people seem to use the following syntax:
 		hours = parseOpenedHours("Sa-Su 24/7");
 		System.out.println(hours);

OsmAnd/full-ndk-build.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+if [ ! -d "$ANDROID_SDK" ]; then
+	echo "ANDROID_SDK is not set"
+	exit
+fi
+if [ ! -d "$ANDROID_NDK" ]; then
+	echo "ANDROID_NDK is not set"
+	exit
+fi
+
+SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [ -z "$OSMAND_ARCHITECTURES_SET" ]; then
+	OSMAND_ARCHITECTURES_SET=(x86 mips arm armv5 armv7 armv7-neon)
+	export OSMAND_ARCHITECTURES_SET
+fi
+
+if [[ "$(uname -a)" =~ Linux ]]; then
+	if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then
+		OSMAND_BUILD_CPU_CORES_NUM=`nproc`
+	fi
+fi
+if [[ "$(uname -a)" =~ Darwin ]]; then
+	if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then
+		OSMAND_BUILD_CPU_CORES_NUM=`sysctl hw.ncpu | awk '{print $2}'`
+	fi
+fi
+
+OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-android skia)
+"$SCRIPT_LOC/../../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]}
+"$SCRIPT_LOC/../../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]}
+"$SCRIPT_LOC/../../jni/generate.sh"
+(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j$OSMAND_BUILD_CPU_CORES_NUM)

OsmAnd/jni/Android.mk

@@ -4,12 +4,18 @@ $(info OsmAnd root: $(ROOT_PATH))
 
 include $(CLEAR_VARS)
 
+ifdef BUILD_ONLY_OLD_LIB
+OSMAND_MAKEFILES := $(call all-makefiles-under,$(LOCAL_PATH)/) \
+    $(call all-makefiles-under,$(ROOT_PATH)/core/targets/android)
+$(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
+else 
 OSMAND_MAKEFILES := \
     $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \
     $(ROOT_PATH)/core/Android.mk \
-    $(all-subdir-makefiles) \
+    $(call all-makefiles-under,$(LOCAL_PATH)/) \
     $(ROOT_PATH)/jni/Android.mk
 $(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
+endif
 
 # Protect from previous builds
 ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)

OsmAnd/jni/Application.mk

@@ -1,10 +1,10 @@
 APP_STL := gnustl_shared
 APP_CPPFLAGS := -std=c++11 -fexceptions -frtti
 
-ifeq ($(wildcard $(ANDROID_NDK/toolchains/*-4.8)),) 
+ifeq ($(wildcard $(ANDROID_NDK)/toolchains/*-4.7),)
-    NDK_TOOLCHAIN_VERSION := 4.7
-else 
     NDK_TOOLCHAIN_VERSION := 4.8
+else
+    NDK_TOOLCHAIN_VERSION := 4.7
 endif
 
 APP_ABI :=

OsmAnd/old-ndk-build.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+NAME=$(basename $(dirname "${BASH_SOURCE[0]}") )
+
+
+if [ ! -d "$ANDROID_SDK" ]; then
+	echo "ANDROID_SDK is not set"
+	exit
+fi
+if [ ! -d "$ANDROID_NDK" ]; then
+	echo "ANDROID_NDK is not set"
+	exit
+fi
+export ANDROID_SDK_ROOT=$ANDROID_SDK
+export ANDROID_NDK_ROOT=$ANDROID_NDK
+export ANDROID_NDK_TOOLCHAIN_VERSION=4.7
+
+if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then
+	export OSMAND_ARCHITECTURES_SET='arm x86 mips'
+	echo "BUILD_ALL set to true"
+fi
+export BUILD_ONLY_OLD_LIB=1
+"$SCRIPT_LOC/../../core/externals/configure.sh"
+(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`)

OsmAnd/res/layout-land/menu.xml

@@ -12,7 +12,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName" 
 				android:layout_marginLeft="3dp" android:layout_marginTop="3dp" 
 				android:text="@string/app_name" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
-				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"
+				<TextView android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1"
 				android:layout_marginLeft="12dp" android:layout_marginTop="3dp" android:layout_marginBottom="3dp" android:text="@string/app_version" android:gravity="right"
 				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="13sp"/> 
 				<ImageView android:src="@drawable/help_icon" android:id="@+id/HelpButton" android:layout_marginTop="7dp"
@@ -29,7 +29,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 	 		<TableRow android:layout_height = "wrap_content" android:layout_marginTop = "10dp">
 	 			<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_left" android:clickable="true"
 	 			android:layout_weight="1" android:layout_height="112dp" android:focusable="true">
-	 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+	 				<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_gravity="center_vertical|left" android:layout_marginLeft="15dp"
 					android:text="@string/map_Button" android:textColor="#000000" android:typeface="serif"
 					android:layout_weight="1"
@@ -48,7 +48,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 					android:layout_gravity="center|left"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
-					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+					<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_gravity="center_vertical|right"
 					android:layout_weight="1"
 					android:layout_marginRight="15dp"
@@ -59,7 +59,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 			<TableRow android:layout_height = "wrap_content" android:layout_marginTop = "10dp">
 				<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_left" 
 				android:layout_weight="1" android:layout_height="112dp" android:focusable="true" android:clickable="true">
-					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+					<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_marginLeft="15dp" android:layout_gravity="center_vertical|left"
 					android:text="@string/favorites_Button" android:textColor="#000000" android:typeface="serif"
 					android:layout_weight="1" android:textSize="16sp"/>
@@ -77,7 +77,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 					android:layout_gravity="center|left"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
-					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+					<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_gravity="center_vertical|right"
 					android:layout_weight="1"
 					android:layout_marginRight="15dp"

OsmAnd/res/layout-large-land/menu.xml

@@ -12,7 +12,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName" 
 				android:layout_marginLeft="4dp" android:layout_marginTop="8dp" 
 				android:text="@string/app_name" android:textColor="#000000" android:typeface="serif" android:textSize="30sp"/>
-				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"
+				<TextView android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1"
 				android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/app_version" android:gravity="right"
 				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="18sp"/> 
 				<ImageView android:src="@drawable/help_icon" android:id="@+id/HelpButton" android:layout_marginTop="9dp"
@@ -30,7 +30,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 	 			<LinearLayout android:id="@+id/MapButton" android:background="@drawable/bg_left" 
 	 			android:focusable="true" android:clickable="true"
 	 			android:layout_weight="1" android:layout_height="165dp">
-	 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+	 				<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_gravity="center_vertical|left" 
 					android:layout_marginLeft="15dp" android:text="@string/map_Button" android:textColor="#000000"
 					android:typeface="serif" android:layout_weight="1" android:textSize="24sp"/>
@@ -49,7 +49,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 					android:layout_gravity="center|left"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>	
-					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+					<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_gravity="center_vertical|right"
 					android:layout_weight="1"
 					android:layout_marginRight="15dp"
@@ -61,7 +61,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/bg_left"
 				android:focusable="true" android:clickable="true" 
 				android:layout_weight="1" android:layout_height="165dp">
-					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+					<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_marginLeft="15dp" android:layout_gravity="center_vertical|left"
 					android:text="@string/favorites_Button" android:textColor="#000000" android:typeface="serif"
 					android:layout_weight="1" android:textSize="24sp"/>
@@ -80,7 +80,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 					android:layout_gravity="center|left"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>		
-					<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
+					<TextView android:layout_height="wrap_content" android:layout_width="0dp"
 					android:layout_gravity="center_vertical|right"
 					android:layout_weight="1"
 					android:layout_marginRight="15dp"

OsmAnd/res/layout-large/menu.xml

@@ -12,7 +12,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName" 
 				android:layout_marginLeft="3dp" android:layout_marginTop="8dp" 
 				android:text="@string/app_name" android:textColor="#000000" android:typeface="serif" android:textSize="22sp"/>
-				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"
+				<TextView android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1"
 				android:layout_marginLeft="24dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:text="@string/app_version" android:gravity="right"
 				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="20sp"/>
 				<ImageView android:id="@+id/HelpButton" android:layout_marginRight="0dp" android:layout_marginTop="9dp"
@@ -31,7 +31,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 	 			android:focusable="true" android:clickable="true" android:layout_weight="3" android:layout_height="250dp">
 	 				<ImageView
 					android:src="@drawable/button_icon_map" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="27sp" 
@@ -43,7 +43,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				android:focusable="true" android:clickable="true" android:layout_weight="3" android:layout_height="250dp">
 					<ImageView
 					android:src="@drawable/button_icon_search" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">	
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="27sp"					
@@ -56,7 +56,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 	 			android:focusable="true" android:clickable="true" android:layout_weight="3" android:layout_height="250dp">
 	 				<ImageView
 					android:src="@drawable/button_icon_favorites" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="27sp" 
@@ -68,7 +68,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				android:focusable="true" android:clickable="true" android:layout_weight="3" android:layout_height="250dp">
 					<ImageView
 					android:src="@drawable/button_icon_settings" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="27sp"					

OsmAnd/res/layout-large/route_info_list_item.xml

@@ -6,7 +6,7 @@
 	<TextView android:text="" android:id="@+id/distance" android:layout_marginLeft ="5dp" android:textSize="23sp" 
 		android:layout_width="70dp" android:layout_height="wrap_content"></TextView>
 	<TextView android:text="" android:id="@+id/description" android:layout_weight="1" android:textSize="23sp"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
+		android:layout_width="0dp" android:layout_height="wrap_content"></TextView>
 	<TextView android:text="" android:id="@+id/time" android:layout_marginLeft ="5dp" 
 		android:layout_width="65dp" android:layout_height="wrap_content" android:textSize="23sp"></TextView>
 

OsmAnd/res/layout/change_order_item.xml

@@ -8,11 +8,12 @@
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip"
     android:weightSum="1" android:background="@color/color_white">
+
 	<ImageButton android:src="@drawable/av_download" android:id="@+id/down" android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"/>
     <TextView
         android:id="@+id/title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:text="@string/layer_poi"

OsmAnd/res/layout/download_build_list_item.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
 	android:layout_height="wrap_content">
 
-	<TextView android:id="@+id/download_tag" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+	<TextView android:id="@+id/download_tag" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
 		 android:layout_weight="1" android:textSize="19sp"></TextView>
 
 	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp"

OsmAnd/res/layout/download_index.xml

@@ -65,7 +65,7 @@
             <ProgressBar
                 android:id="@+id/DeterminateProgressBar"
                 style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1" />
 

OsmAnd/res/layout/download_index_list_item.xml

@@ -6,7 +6,7 @@
 		<CheckBox android:id="@+id/check_download_item" android:layout_width="wrap_content" android:layout_height="wrap_content"
 			android:gravity="center_vertical" android:focusable="false" />
 	</LinearLayout>
-	<TextView android:id="@+id/download_item" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+	<TextView android:id="@+id/download_item" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
 		android:maxLines="7" android:layout_weight="1" style="@style/ListText.Small"></TextView>
 
 	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="right" android:layout_width="wrap_content"

OsmAnd/res/layout/editing_poi.xml

@@ -206,8 +206,8 @@
 <TextView android:text="@string/poi_dialog_other_tags_message" android:id="@+id/TextView" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
 <LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" 
 	android:gravity="bottom|center">
-    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_commit" android:id="@+id/Commit"></Button>
     <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel" android:id="@+id/Cancel"></Button>
+    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_commit" android:id="@+id/Commit"></Button>
 </LinearLayout>
 </LinearLayout>
 </ScrollView>

OsmAnd/res/layout/favourites_list.xml

@@ -10,7 +10,7 @@
     <ExpandableListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginLeft="0dp"
         android:layout_marginRight="0dp"
         android:layout_marginTop="0dp"

OsmAnd/res/layout/layers_list_activity_item.xml

@@ -7,9 +7,10 @@
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip"
     android:background="@color/color_white">
+
     <TextView
         android:id="@+id/title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dip"
     	android:layout_marginBottom="4dip"
@@ -21,6 +22,7 @@
     <LinearLayout android:layout_width="wrap_content"
         android:layout_height="fill_parent">
 
+
     <CheckBox
         android:id="@+id/check_item"
         android:layout_width="wrap_content"

OsmAnd/res/layout/list_menu_item.xml

@@ -7,9 +7,10 @@
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip"
     android:background="@color/color_white">
+
     <TextView
         android:id="@+id/title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dip"
         android:layout_marginTop="12dip"
@@ -22,6 +23,7 @@
     <LinearLayout android:layout_width="wrap_content"
         android:layout_height="fill_parent">
 
+
     <CheckBox
         android:id="@+id/check_item"
         android:layout_width="wrap_content"

OsmAnd/res/layout/list_menu_item_native.xml

@@ -7,9 +7,10 @@
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip">
 
+
     <TextView
         android:id="@+id/title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="12dip"
         android:layout_marginTop="12dip"
@@ -21,6 +22,7 @@
 
     <LinearLayout android:layout_width="wrap_content"
         android:layout_height="fill_parent">
+
 <!-- android:button="@drawable/ic_btn_wocheckbox" -->
     <CheckBox
         android:id="@+id/check_item"

OsmAnd/res/layout/local_index.xml

@@ -11,7 +11,7 @@
 <ExpandableListView
     android:id="@android:id/list"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="0dp"
     android:layout_marginLeft="0dp"
     android:layout_marginRight="0dp"
     android:layout_marginTop="0dp"

OsmAnd/res/layout/local_index_list_item.xml

@@ -7,7 +7,7 @@
 			<CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content"
 				android:gravity="center_vertical" android:focusable="false" />
 		</LinearLayout>
-		<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="0dp" android:layout_height="wrap_content"
 			android:layout_weight="1" style="@style/ListText.Small"></TextView>
 		<TextView android:id="@+id/local_index_size" android:layout_marginLeft="3dp" android:gravity="right" android:layout_width="wrap_content"
 			android:layout_height="wrap_content" style="@style/ListText.Small"></TextView>

OsmAnd/res/layout/local_openstreetmap_list_item.xml

@@ -2,6 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"   android:layout_width="fill_parent"	android:layout_height="wrap_content" 
 android:orientation="vertical">
 
-	<TextView android:id="@+id/local_openstreetmap_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+	<TextView android:id="@+id/local_openstreetmap_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="0dp"
 		android:layout_weight="1" style="@style/ListText.Small" android:layout_marginLeft="8dp"></TextView>
 </LinearLayout>

OsmAnd/res/layout/menu.xml

@@ -12,7 +12,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
   				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
   				android:layout_marginLeft="2dp" android:layout_marginTop="3dp" 
 				android:text="@string/app_name" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
-				<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"
+				<TextView android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1"
 				android:layout_marginLeft="12dp" android:layout_marginTop="3dp" android:layout_marginBottom="3dp" android:text="@string/app_version" android:gravity="right"
 				android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion" android:textSize="13sp"/> 
 				<ImageView android:id="@+id/HelpButton" android:clickable="true" android:layout_marginTop="7dp" android:layout_marginLeft="4dp" 
@@ -31,7 +31,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 	 			android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
 	 				<ImageView
 					android:src="@drawable/button_icon_map" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="18sp" 
@@ -43,7 +43,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
 					<ImageView
 					android:src="@drawable/button_icon_search" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="18sp"		
@@ -56,7 +56,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 	 			android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
 	 				<ImageView
 					android:src="@drawable/button_icon_favorites" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="18sp" 
@@ -68,7 +68,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b
 				android:layout_weight="3" android:layout_height="175dp" android:focusable="true">
 					<ImageView
 					android:src="@drawable/button_icon_settings" android:scaleType="center" android:layout_gravity="center"
-					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+					android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/>
 					<LinearLayout  android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center">
 						<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" 
 						android:layout_gravity="center_horizontal|top" android:textSize="18sp"

OsmAnd/res/layout/navigate_point.xml

@@ -4,7 +4,7 @@
     android:layout_width="fill_parent" android:layout_height="fill_parent" >
 <LinearLayout
   android:layout_width="fill_parent"
-  android:layout_height="fill_parent" android:orientation="vertical" android:gravity="center_horizontal">
+  android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal">
 <net.osmand.view.ExpandableLinearLayout custom:maxVisibleWidth="800dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" >
 <TextView android:id="@+id/TextView" android:textSize="16sp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:text="@string/navigate_point_top_text"></TextView>
 

OsmAnd/res/layout/open_hours_list_item.xml

@@ -3,7 +3,7 @@
 	android:layout_width="fill_parent" android:layout_height="wrap_content"
 	android:orientation="horizontal">
 
-	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="wrap_content"
+	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="0dp"
 		android:layout_height="wrap_content" android:textSize="20sp" />
 		
 	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" 

OsmAnd/res/layout/plugins.xml

@@ -6,6 +6,6 @@
   
 <TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/select_plugin_to_activate"></TextView>
 
-<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
+<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="0dp"
 		android:layout_marginTop="10dp"></ListView>
 </LinearLayout>

OsmAnd/res/layout/route_info_list_item.xml

@@ -6,7 +6,7 @@
 	<TextView android:text="" android:id="@+id/distance" android:layout_marginLeft ="5dp" 
 		android:layout_width="50dp" android:layout_height="wrap_content"></TextView>
 	<TextView android:text="" android:id="@+id/description" android:layout_weight="1"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
+		android:layout_width="0dp" android:layout_height="wrap_content"></TextView>
 	<TextView android:text="" android:id="@+id/time" android:layout_marginLeft ="5dp" 
 		android:layout_width="45dp" android:layout_height="wrap_content"></TextView>
 

OsmAnd/res/layout/save_directions_dialog.xml

@@ -10,7 +10,7 @@
 </LinearLayout>
 <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal" 
 	android:gravity="bottom|center" android:layout_marginTop="5dp">
-    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_save" android:id="@+id/Save"></Button>
     <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel" android:id="@+id/Cancel"></Button>
+    <Button android:layout_width="125dp" android:layout_height="wrap_content" android:text="@string/default_buttons_save" android:id="@+id/Save"></Button>
 </LinearLayout>
 </LinearLayout>

OsmAnd/res/layout/search_address_offline.xml

@@ -8,7 +8,7 @@
         android:id="@android:id/list"
         style="@style/OsmandListView"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_weight="1" >
     </ListView>
 

OsmAnd/res/layout/search_address_online.xml

@@ -20,7 +20,7 @@
 
         <EditText
             android:id="@+id/SearchText"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:hint="@string/hint_search_online"
@@ -39,7 +39,7 @@
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_weight="1"
         style="@style/OsmandListView">
     </ListView>

OsmAnd/res/layout/search_history_list_item.xml

@@ -7,7 +7,7 @@
     <TextView
         android:id="@+id/label"
         style="@style/ListText"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="3dp"
         android:layout_marginRight="3dp"

OsmAnd/res/layout/search_transport.xml

@@ -19,7 +19,7 @@
 
         <Button
             android:id="@+id/SearchTransportLevelButton"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" >
         </Button>

OsmAnd/res/layout/search_transport_route_item.xml

@@ -6,7 +6,7 @@
 <!-- 	<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
 		android:layout_width="80dp" android:layout_height="fill_parent" android:gravity="left"
 		android:textSize="20sp"/>  -->
-	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="wrap_content"
+	<TextView android:id="@+id/label" android:layout_weight="1" android:layout_width="0dp"
 		android:layout_height="wrap_content" style="@style/ListText" />
 		
 	<ImageButton android:id="@+id/remove" android:layout_width="wrap_content" android:background="?attr/reset_image" 

OsmAnd/res/layout/searchpoifolder_list.xml

@@ -8,7 +8,7 @@
 	<ImageView android:id="@+id/folder_icon" android:layout_width="37dip"
 		android:paddingLeft="8dp" android:paddingRight="8dp"
 		android:paddingTop="2dp" android:layout_height="fill_parent" />
-	<TextView android:id="@+id/folder_label" android:layout_width="wrap_content" android:layout_weight="1"
+	<TextView android:id="@+id/folder_label" android:layout_width="0dp" android:layout_weight="1"
 		android:layout_height="wrap_content" style="@style/ListText"/>
 	
 	<ImageView android:id="@+id/folder_edit_icon"

OsmAnd/res/layout/tips_and_tricks.xml

@@ -3,7 +3,7 @@
 	android:layout_height="fill_parent" android:orientation="vertical" >
 
 	<net.osmand.access.ExplorableTextView android:text="" android:id="@+id/TipDescription" android:layout_marginLeft="4dp" android:scrollbars="vertical"
-		android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginRight="4dp" android:layout_weight="1"
+		android:layout_width="fill_parent" android:layout_height="0dp" android:layout_marginRight="4dp" android:layout_weight="1"
 		style="@style/ListText" android:gravity="fill_horizontal"
 		/>
 

OsmAnd/res/values-af/strings.xml

@@ -222,8 +222,8 @@
   <string name="index_name_oceania">Oseanië</string>
   <string name="index_name_other">Wêreldwye en onderwerp kaarte</string>
   <string name="index_name_wiki">Wêreldwye Wikipedia</string>
-  <string name="index_name_voice">Stem pakkette (opgeneem)</string>
+  <string name="index_name_voice">Stem pakkette (opgeneem, beperkte funksies)</string>
-  <string name="index_name_tts_voice">Stem pakkette (TTS)</string>
+  <string name="index_name_tts_voice">Stem pakkette (TTS-sintese, verkies)</string>
   <string name="amenity_type_wikiosm">Wikipedia (aflyn)</string>
   <string name="amenity_type_user_defined">gebruiker gedefinieerde</string>
   <string name="fav_export_confirmation">Lêer met voorheen uitgevoerde gunstelinge bestaan reeds. Wil jy dit vervang?</string>
@@ -247,7 +247,7 @@
   <string name="osmand_service_descr">Gebruik om OsmAnd aan te hou terwyl skerm af is</string>
   <string name="tip_rotation_switching">Kaart oriëntasie</string>
   
-  <string name="binary_map_download_success">Aflaai suksesvol.\n\t\n\tOm te gebruik aktiveer \'Keuselys\' -&gt; \'Definieer uitsig\'-&gt; \'Kaart bron\' -&gt; \'aflyn vektor kaarte.</string>
+  <string name="binary_map_download_success">Aflaai suksesvol.\n\t\n\tOm te gebruik aktiveer \'Keuselys\' -&gt; \'Kaarte\'-&gt; \'Kaart bron\' -&gt; \'aflyn vektor kaarte.</string>
   <string name="tip_day_night_mode">Dag/nag gebruikswyse</string>
   
   <string name="tip_osm_improve">Verbetering van OSM inligting</string>
@@ -377,7 +377,7 @@
   <string name="gpx_option_reverse_route">Keer GPX rigting om</string>
   <string name="gpx_option_destination_point">Gebruik die huidige bestemming</string>
   <string name="gpx_option_from_start_point">Ry oor die hele spoor</string>
-  <string name="switch_to_vector_map_to_see">Aflyn vektor kaart is teenwoordig vir hierdie ligging.\n\t\n\tOm te gebruik aktiveer \'Kieslys\' -&gt; \'Definieer voorkoms\' -&gt; \'Kaartbron...\' -&gt; \'Aflyn vektor kaarte\'.</string>
+  <string name="switch_to_vector_map_to_see">Aflyn vektor kaart is teenwoordig vir hierdie ligging.\n\t\n\tOm te gebruik aktiveer \'Kieslys\' -&gt; \'Kaarte\' -&gt; \'Kaartbron...\' -&gt; \'Aflyn vektor kaarte\'.</string>
   <string name="choose_audio_stream">Stem begeleiding uitset</string>
   <string name="choose_audio_stream_descr">Kies kanaal om stem begeleiding oor te speel (stelsel afhanklik)</string>
   <string name="voice_stream_voice_call">Stem oproep klank</string>
@@ -407,7 +407,7 @@
   <string name="tip_location_sharing_t">\tJy kan kan die ligging van interessante plekke op jou reis met familie of vriende deel.\n\tOm \'n ligging te deel:\n\tGebruik \'Kaart inhoud kieslys\' -&gt; \'Deel ligging\' kieslys.\n\tKies dan \'n manier om jou ligging te deel. Die keuses is: E-pos, SMS (teks), of kopiëer net die koördinate na die knipbord.
 	</string>
   <string name="tip_favorites">Gunsteling punte</string>
-  <string name="tip_favorites_t">\tDikwels gebruikte punte kan geberg word as gunstelinge.\n\tOm `n punt te berg as `n gunsteling, gaan na die kaart inhoud kieslys, Keuse\'Voeg by gunstelinge\' en tik dan \'n naam in daarvoor. Nadat jy \'n gunsteling geberg het,  is dit beskikbaar in \'Hoof Kieslys\' -&gt; \'_gunstelinge\'.\n\tLank druk op \'n gunsteling, in die \'gunstelinge\' kieslys bied keuses om dit as bestemming te stel, te wysig of te skrap.\n\tOm al die gunsteling punte op die kaart te wys, skakel die \'gunstelinge\' vel aan in \'Kaart inhoud kieslys\' -&gt; \'Definieer vertoon\'.
+  <string name="tip_favorites_t">\tDikwels gebruikte punte kan geberg word as gunstelinge.\n\tOm `n punt te berg as `n gunsteling, gaan na die kaart inhoud kieslys, Keuse\'Voeg by gunstelinge\' en tik dan \'n naam in daarvoor. Nadat jy \'n gunsteling geberg het,  is dit beskikbaar in \'Hoof Kieslys\' -&gt; \'_gunstelinge\'.\n\tLank druk op \'n gunsteling, in die \'gunstelinge\' kieslys bied keuses om dit as bestemming te stel, te wysig of te skrap.\n\tOm al die gunsteling punte op die kaart te wys, skakel die \'gunstelinge\' vel aan in \'Kaart inhoud kieslys\' -&gt; \'Kaarte\'.
 	</string>
   <string name="create_poi_link_to_osm_doc">"<u> Aanlyn OSM </u> kaart klassifikasie met prentjies"</string>
   <string name="error_doing_search">Fout het voorgekom tydens aflyn soek</string>
@@ -446,7 +446,7 @@
   <string name="send_location_email_pattern">Om die ligging te sien volg die webskakel %1$s of Android opsetskakel %2$s</string>
   <string name="send_location">Deel ligging</string>
   <string name="context_menu_item_share_location">Deel ligging</string>
-  <string name="add_waypoint_dialog_added">Roetebaken \'\'{0}\'\' was suksesvol bygevoeg</string>
+  <string name="add_waypoint_dialog_added">GPX Roetebaken \'\'{0}\'\' was suksesvol bygevoeg</string>
   <string name="add_waypoint_dialog_title">Voeg roetebaken by tot opgeneemde GPX spoor</string>
   <string name="context_menu_item_add_waypoint">Voeg GPX roetebaken by</string>
   <string name="amenity_type_administrative">Administratief</string>
@@ -528,7 +528,7 @@
   <string name="continuous_rendering_descr">Vertoon deurlopende lewering in plaas van beeld-op-een-slag</string>
   <string name="rendering_exception">Fout het voorgekom tydens die lewering van gekose gebied</string>
   <string name="show_point_options">Gebruik ligging…</string>
-  <string name="renderer_load_sucess">verbeelder suksesvol gelaai</string>
+  <string name="renderer_load_sucess">Verbeelder suksesvol gelaai</string>
   <string name="renderer_load_exception">Uitsondering voorgekom: verbeelder is nie gelaai nie</string>
   <string name="renderers">vektor verbeelder</string>
   <string name="renderers_descr">Kies lewering voorkoms</string>
@@ -584,7 +584,7 @@
   <string name="layer_transport">Vervoer stilhouplekke</string>
   <string name="layer_poi">Interessante plek…</string>
   <string name="layer_map">Kaartbron…</string>
-  <string name="menu_layers">Definieer uitsig</string>
+  <string name="menu_layers">Kaarte</string>
   <string name="context_menu_item_search_poi">Soek interessante plek</string>
   
   <string name="use_trackball_descr">Gebruik die trekbal om die kaart te skuif</string>
@@ -610,7 +610,7 @@
   <string name="search_poi_filter">Filter</string>
   <string name="menu_mute_off">Klank is aan</string>
   <string name="menu_mute_on">Klank is af</string>
-  <string name="voice_provider_descr">Kies stem begeleiding vir navigasie</string>
+  <string name="voice_provider_descr">Kies stem begeleiding vir navigasie (taalkodes sien ISO 639-1)</string>
   <string name="voice_provider">Stem begeleiding</string>
   <string name="voice_data_initializing">Stem inligting gereedmaak…</string>
   <string name="voice_data_not_supported">Die weergawe van stem inligting word nie ondersteun nie</string>
@@ -863,8 +863,8 @@
   <string name="poi_action_add">byvoeg</string>
   <string name="poi_action_change">verander</string>
   <string name="poi_action_succeded_template">Aksie {0} suksesvol voltooi.</string>
-  <string name="poi_error_unexpected_template">Onverwagse fout het voorgekom, tydens die uitvoering van aksie {0}.</string>
+  <string name="poi_error_unexpected_template">Onverwagte fout het voorgekom tydens die uitvoering van aksie {0}.</string>
-  <string name="poi_error_io_error_template">I/O fout het voorgekom tydens die uitvoering van aksie {0}.</string>
+  <string name="poi_error_io_error_template">I/O fout tydens die uitvoering van aksie {0}.</string>
   <string name="poi_error_info_not_loaded">Inligting oor node is nie gelaai nie</string>
   <string name="poi_dialog_name">Naam</string>
   <string name="poi_dialog_opening_hours">Open</string>
@@ -1006,7 +1006,7 @@
 \n\t\'Nag\' - altyd nag kleure
 \n\t\'Ligsensor\' - Beheer deur toestel se ligsensor (indien beskikbaar) "
 	</string>	
-	<string name="tip_map_switch_t_v2">"→Die kaart bron en lae vertoon word verander in \'Keuselys\' -&gt; \'Definieër voorkoms\' in kaart vertoon. ↵\n→Onder \'Kaart bron…\' kan jy kies tussen die gebruik van voorafgelaaide aflyn vektor kaarte, voorafgedefinieërde (aanlyn) teël bronne (aktiveer die \'aanlyn en teël kaarte\' inlasmodule hiervoor), of kaarte met die hand geskep met bv. OsmAndMapCreator op `n rekenaar. ↵\n→OsmAnd ondersteun ook persoonlike bronne. "
+	<string name="tip_map_switch_t_v2">"→Die kaart bron en lae vertoon word verander in \'Keuselys\' -&gt; \'Kaarte\' in kaart vertoon. ↵\n→Onder \'Kaart bron…\' kan jy kies tussen die gebruik van voorafgelaaide aflyn vektor kaarte, voorafgedefinieërde (aanlyn) teël bronne (aktiveer die \'aanlyn en teël kaarte\' inlasmodule hiervoor), of kaarte met die hand geskep met bv. OsmAndMapCreator op `n rekenaar. ↵\n→OsmAnd ondersteun ook persoonlike bronne. "
 	</string>
 	<string name="tip_app_mode_t_v2">"\tOsmAnd ondersteun verskillende (verstelbare) toepassingsprofiele vir verskillende gebruiksgevalle.
 \n\tJy kan profiele verander deur die profiel knoppie in linker onder hoek van die kaart skerm (simbool kar, fiets, of voetganger), of tydens die bou van `n roete. "</string>
@@ -1208,10 +1208,10 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
     <string name="plugin_distance_point_ele">hoogte</string>
     <string name="plugin_distance_point">Punt</string>
     <string name="gpx_file_name">GPX lêernaam</string>
-    <string name="gpx_saved_sucessfully">GPX lêer suksesvol geberg na {0}</string>
+    <string name="gpx_saved_sucessfully">GPX lëer suksesvol geberg na {0}</string>
     <string name="osmand_distance_planning_plugin_description">Skep paaie (of gebruik / pas bestaande GPX lêers aan) om die afstand tussen punte te meet. Berg as GPX, kan gebruik word om GPX roetes te beplan.</string>
     <string name="osmand_distance_planning_plugin_name">Afstand rekenaar &amp; beplanning gereedskap</string>
-    <string name="local_osm_changes_backup_successful">OSM veranderingslêer %1$s suskesvol geskep</string>
+    <string name="local_osm_changes_backup_successful">OSM veranderingslëer %1$s suskesvol geskep</string>
     <string name="destination_point">Bestemming %1$s</string>
     <string name="context_menu_item_destination_point">Stel as bestemming</string>
     <string name="please_select_address">Kies eers die stad of straat</string>
@@ -1256,7 +1256,8 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
 	<string name="speak_traffic_warnings">Kondig verkeerswaarskuwings aan</string>
 	<string name="tip_recent_changes_1_5_t">Veranderings in 1.5:
 	\n\t* Stem waarskuwings oor spoed beperkings en kameras
-	\n\t* Hoë ditheid kaart simbole
+	\n\t* Hoë digtheid kaart simbole
+	\n\t* Meer stem vermoëns (straat-naam aankondiging)
 	\n\t* Baie UI veranderings
 	\n\t* Bugfixes in afstand vertoon, GPX analiseerder, oorgangspunt hantering, beplanning funksie, OSM oplaai, https hantering
     </string>
@@ -1277,4 +1278,11 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
 	<string name="speak_street_names">Kondig straatname aan(TTS)</string>
     <string name="osmodroid_mode_on">Staak OsMoDroid</string>    
     <string name="osmodroid_mode_off">Begin OsMoDroid</string>
+    <string name="driving_region_descr">Kies Bestuur Streek: VSA, Europa, VK, Asië en Ander</string>
+	<string name="driving_region">Bestuur Streek</string>
+	<string name="driving_region_japan">Japan</string>
+	<string name="driving_region_us">Verenigde State van Amerika</string>
+	<string name="driving_region_canada">Kanada</string>
+	<string name="driving_region_europe_asia">Europa &amp; Asië</string>
+	<string name="driving_region_uk">VK, Indië, Australië &amp; Ander</string>
 	</resources>

OsmAnd/res/values-be/strings.xml

@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="local_index_gpx_timespan">\nTime span: %1$d:%2$02d:%3$02d</string>
+<resources><string name="local_index_gpx_timespan">\nДыяпазон часу: %1$d:%2$02d:%3$02d</string>
-	<string name="local_index_gpx_timemoving">\nTime moving: %1$d:%2$02d:%3$02d</string>
+	<string name="local_index_gpx_timemoving">\nЧас руху: %1$d:%2$02d:%3$02d</string>
-	<string name="app_mode_default">Browse map</string>
+	<string name="app_mode_default">Мапа</string>
-	<string name="settings_preset">Default profile</string>
+	<string name="settings_preset">Прадвызначаны</string>
 	<string name="settings_preset_descr">Map view and navigation settings are remembered per use profile. Set your default profile here.</string>
     <string name="destination_point">Destination %1$s</string>
     <string name="context_menu_item_destination_point">Ужыць як прызначэньне</string>
@@ -206,7 +206,7 @@
 	</string>
     <string name="map_widget_max_speed">Абмежаваньне хуткасьці</string>
     <string name="monitoring_control_start">GPX</string>
-    <string name="route_descr_lat_lon">Lat %1$.3f, lon %2$.3f</string>
+    <string name="route_descr_lat_lon">Ш %1$.3f, Д %2$.3f</string>
     <string name="route_descr_current_location">Гэтае месца</string>
     
     

OsmAnd/res/values-bg/strings.xml

@@ -1539,4 +1539,12 @@ OsmAnd е с отворен код и активно да се развива.
     <string name="use_kalman_filter_compass">Използване на филтър на Kalman</string>
     <string name="speak_descr">Настройки за гласови напътствия - имена на улици, предупреждения за пътя (стопове, легнали полицаи), предупреждения за камери, ограничения на скоростта</string>
 	<string name="osb_author_dialog_password">Парола за OSM (по желание)</string>
+	<string name="map_widget_fps_info">кадри/сек</string>
+	<string name="driving_region_descr">Изберете район: САЩ, Европа, Великобритания, Азия или друг</string>
+	<string name="driving_region">Район</string>
+	<string name="driving_region_japan">Япония</string>
+	<string name="driving_region_us">САЩ</string>
+	<string name="driving_region_canada">Канада</string>
+	<string name="driving_region_europe_asia">Европа и Азия</string>
+	<string name="driving_region_uk">Великобритания, Индия, Австралия и други</string>
 	</resources>

OsmAnd/res/values-cs/strings.xml

@@ -1293,9 +1293,14 @@
     <string name="context_menu_item_directions_from">Navigovat odsud</string>
     <string name="local_index_gpx_timemoving">\nČas pohybu: %1$d:%2$02d:%3$02d</string>
 	<string name="osmodroid_mode_on">Zastavit OsMoDroid</string>    
-    <string name="osmodroid_mode_off">Sppustit OsMoDroid</string>
+    <string name="osmodroid_mode_off">Spustit OsMoDroid</string>
     <string name="announce_gpx_waypoints">Hlásit GPX body</string>
     <string name="speak_title">Hlásit…</string>
 	<string name="speak_descr">Konfigurace hlášení názvů ulic, dopravních upozornění, radarů, rychlostních omezení</string>
 	<string name="speak_street_names">Hlásit názvy ulic (TTS)</string>
+    <string name="driving_region_japan">Japonsko</string>
+	<string name="driving_region_us">Spojené státy</string>
+	<string name="driving_region_canada">Kanada</string>
+	<string name="driving_region_europe_asia">Evropa a Asie</string>
+	<string name="driving_region_uk">Británie, Indie, Austrálie a ostatní</string>
 	</resources>

OsmAnd/res/values-da/strings.xml

@@ -513,7 +513,7 @@
 	<string name="osmand_service_descr">Bruges for at køre OsmAnd mens skærmen er slukket</string>
 	<string name="tip_rotation_switching">Kortretning</string>
 	<string name="binary_map_download_success">Hentning lykkedes.
-\nAktiver under \'Menu\' -&gt; \'Definer visning\' -&gt; \'Vælg kortkilde…\' -&gt; \'Offline vektorkort\'.</string>
+\nAktiver under \'Menu\' -&gt; \'Kortlag\' -&gt; \'Vælg kortkilde…\' -&gt; \'Offline vektorkort\'.</string>
 	<string name="tip_day_night_mode">Dag/nat tilstand</string>
 	<string name="navigate_point_format">Format:</string>
 	<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
@@ -929,7 +929,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="gpx_option_from_start_point">Passere langs hele sporet</string>
 	<string name="switch_to_vector_map_to_see">Offline vektor-kort er tilgængelig for denne placering.
 
-\n\nFor at anvende aktiver \'Menu\' -&gt; \'Definer visning\' -&gt; \'Vælg kortkilde…\' -&gt; \'Offline vektor-kort\'.</string>
+\n\nFor at anvende aktiver \'Menu\' -&gt; \'Kortlag\' -&gt; \'Vælg kortkilde…\' -&gt; \'Offline vektor-kort\'.</string>
 	<string name="choose_audio_stream">Stemmeindstillinger</string>
 	<string name="choose_audio_stream_descr">Vælg audiokanal til at afspille talevejledning (system afhængig)</string>
 	<string name="voice_stream_voice_call">Stemmeopkald lyd</string>
@@ -1051,7 +1051,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="tip_favorites_t">Ofte brugte steder kan gemmes som favoritter.
 \nFor at gemme et sted som favorit gå til genvejsmenu, vælg \'Tilføj til favoritter\' og indtast et navn. Når favoriten er gemt, er den tilgængelig via\'Start skær\' -&gt; \'Favoritter\'.
 \nLangt tryk på en favorit i \'Favorit\' menuen åbner muligheder for at bruge den som destination, redigere eller slette den.
-\nFor at vise alle favoritsteder direkte på kortet, aktiver kort overlejringen \'Favoritter\' under \'Menu\' -&gt; \'Definer visning\'.
+\nFor at vise alle favoritsteder direkte på kortet, aktiver kort overlejringen \'Favoritter\' under \'Menu\' -&gt; \'Kortlag\'.
 	</string>
 	<string name="tip_recent_changes_1_1_4_t">Ændringer i 1.1.4:
 	\n* Redesign af brugerflade
@@ -1133,7 +1133,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="layer_osm_bugs">OSM-fejlbeskrivelse (online)</string>
 	<string name="layer_transport">Stoppesteder</string>
 	<string name="layer_map">Vælg kortkilde…</string>
-	<string name="menu_layers">Definer visning</string>
+	<string name="menu_layers">Kortlag</string>
 	<string name="context_menu_item_search_poi">Søg interessepunkt</string>
 	
 	<string name="use_trackball_descr">Brug trackball for at flytte kortet</string>
@@ -1245,7 +1245,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="search_address_street">Gade</string>
 	<string name="search_address_city">By</string>
 	<string name="search_address_top_text">Vælg adresse</string>
-	<string name="voice_provider_descr">Vælg stemme til navigation</string>
+	<string name="voice_provider_descr">Vælg talevejledning til navigation (sprogkode se ISO 639-1)</string>
 	<string name="transport_Stop">Stoppested</string>
 	<string name="transport_stops">Stoppesteder</string>
 	<string name="tip_initial_t">OsmAnd er et navigationsprogram med mange funktioner.
@@ -1288,7 +1288,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
 	<string name="search_online_address">Online søgning</string>
 	<string name="max_level_download_tile">Maks. online zoom</string>
 	<string name="max_level_download_tile_descr">Vælg maksimum zoom niveau der hentes for online delkort</string>
-	<string name="tip_map_switch_t_v2">Kortkilden og lag der vises kan ændres via \'Menu\' -&gt; \'Definer visning\' i kort visning.
+	<string name="tip_map_switch_t_v2">Kortkilden og lag der vises kan ændres via \'Menu\' -&gt; \'Kortlag\' i kort visning.
 \nUnder \'Kortkilde...\' vælges de forhåndsindlæste vektorkort, forhåndsdefinerede (online) delkortkilder (aktiver \'Online og delkort\' udvidelsen) eller kort der er manuelt oprettet f.eks. ved hjælp af OsmAndMapCreator på en PC.
 \nOsmAnd understøtter også brugerdefinerede kilder.
 \n
@@ -1567,4 +1567,12 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
     <string name="announce_gpx_waypoints">Meddel om GPX-rutepunkter</string>
     <string name="osmodroid_mode_off">Start OsMoDroid</string>
     <string name="osmodroid_mode_on">Stop OsMoDroid</string>    
+    <string name="driving_region_japan">Japan</string>
+	<string name="driving_region_us">USA</string>
+	<string name="driving_region_canada">Canada</string>
+	<string name="driving_region_europe_asia">Europa &amp; Asien</string>
+	<string name="driving_region_uk">Storbritannien, Indien, Australien m.fl.</string>
+	<string name="driving_region">Område</string>
+	<string name="driving_region_descr">Vælg område: USA, Europa, England, Asien m.fl.</string>
+	<string name="map_widget_fps_info">FPS-fejlsøgningssinfo</string>
 	</resources>

OsmAnd/res/values-de/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="local_index_gpx_timespan">\nZeitspanne: %1$d:%2$02d:%3$02d</string>
 	<string name="local_index_gpx_timemoving">\nZeit in Bewegung: %1$d:%2$02d:%3$02d</string>
 	<string name="context_menu_item_destination_point">Als Ziel wählen</string>
@@ -323,7 +323,7 @@
 \n\t\'Keine Rotation (Norden ist oben)\' - Die Ausrichtung wird nicht nachgeführt, Norden ist immer oben
 \n\t\'Nach Bewegungsrichtung\' - Die Karte wird gemäß Bewegungsrichtung ausgerichtet und nachgeführt
 \n\t\'Nach Kompass\' - Die Karte wird gemäß Kompass ausgerichtet und nachgeführt "</string>
-	<string name="binary_map_download_success">Download erfolgreich.\n\t\n\tAktivieren unter: \'Menü\' → \'Darstellung\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'.</string>
+	<string name="binary_map_download_success">Download erfolgreich.\n\t\n\tAktivieren unter: \'Menü\' → \'Kartenebenen\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'.</string>
 	<string name="tip_day_night_mode">Tag/Nacht-Modus</string>
 	<string name="tip_day_night_mode_t_v2">"Die Anzeige von Offline-Vektor-Karten kann für einige Anzeigemodi zwischen Tag- (heller) und Nachtansicht (dunkler) umgeschaltet werden. Insbesondere bei nächtlichen Autofahrten ist die dunklere Nacht-Anzeige angenehmer und sicherer.
 \nDer Umschaltmechanismus kann in der Kartenansicht unter Menü → \'Anzeige konfigurieren\' → \'Tag/Nacht-Modus\' geändert werden.
@@ -491,7 +491,7 @@
 	<string name="gpx_option_from_start_point">Gesamten Track durchlaufen</string>
 	<string name="switch_to_vector_map_to_see">Offline-Vektor-Karte ist für diesen Ort vorhanden.
 		\n\t
-		\n\tZur Verwendung aktivieren: \'Menu\' → \'Darstellung\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'.</string>
+		\n\tZur Verwendung aktivieren: \'Menu\' → \'Kartenebenen\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'.</string>
 	<string name="choose_audio_stream">Navi-Sprachausgabe</string>
 	<string name="choose_audio_stream_descr">Ausgabemodus für Sprachansagen wählen (Systemabhängig)</string>
 	<string name="voice_stream_voice_call">wie Anrufe</string>
@@ -530,7 +530,7 @@
 \n * Kopieren der Koordinaten in die Zwischenablage (Clipboard)</string>
 	<string name="tip_favorites">Favoriten</string>
 	<string name="tip_favorites_t">"Sie können jeden beliebigen Ort als Favoriten speichern.\n\nEinen Favoriten erstellen Sie im Karten-Kontextmenü via \'Als Favorit speichern\'. Name und Kategorie sind dabei frei wählbar. Gespeicherte Favoriten sind leicht zugänglich direkt im Hauptmenü unter \'Favoriten\'. Mittels Kontextmenü können Sie jeden Favoriten bearbeiten, löschen, als Ziel wählen oder einfach nur auf der Karte anzeigen lassen.
-\n\nSie können sich auch alle Ihre Favoriten gleichzeitig auf der Karte anzeigen lassen. Dazu in der Kartenansicht unter \'Menü\' → \'Darstellung\' einen Haken bei \'Favoriten\' setzen. "</string>
+\n\nSie können sich auch alle Ihre Favoriten gleichzeitig auf der Karte anzeigen lassen. Dazu in der Kartenansicht unter \'Menü\' → \'Kartenebenen\' einen Haken bei \'Favoriten\' setzen. "</string>
 	<string name="create_poi_link_to_osm_doc">" <u>Online OSM</u> Klassifizierung mit Bildern"</string>
 	<string name="error_doing_search">Fehler in der Offlinesuche aufgetreten</string>
 	<string name="search_offline_geo_error">Konnte geointent nicht verarbeiten: \'%s\'</string>
@@ -539,7 +539,7 @@
 	<string name="preferred_locale_descr">Anzeigesprache wählen</string>
 	<string name="preferred_locale">Anzeigesprache</string>
 	<string name="tip_map_switch">Kartenquelle</string>
-	<string name="tip_map_switch_t_v2">\tDie Kartenquelle und die angezeigten Ebenen können in der Katenansicht über das Menü \'Menü\' -&gt; \'Anzeige konfigurieren\' verändert werden.
+	<string name="tip_map_switch_t_v2">\tDie Kartenquelle und die angezeigten Ebenen können in der Katenansicht über das Menü \'Menü\' -&gt; \'Kartenebenen\' verändert werden.
 		\n\tIm Menü \'Kartenquelle…\' können Sie die Karte wählen: vorher heruntergeladene Offline-Vektor-Karten, vordefinierte Online-Kachel-Karten (aktivieren Sie das Plugin \'Online und Kachel-Karten\') oder manuell am Rechner (z.B. mit OsmAndMapCreator) erstellte Karten.
 		\n\tOsmAnd unterstützt auch benutzerdefinierte Quellen.
 	</string>
@@ -722,7 +722,7 @@
 	<string name="layer_transport">ÖPNV-Haltestellen</string>
 	<string name="layer_poi">POI…</string>
 	<string name="layer_map">Kartenquelle…</string>
-	<string name="menu_layers">Darstellung</string>
+	<string name="menu_layers">Kartenebenen</string>
 	<string name="context_menu_item_search_poi">Suche POI</string>
 	
 	<string name="use_trackball_descr">Trackball für Kartenbewegung benutzen</string>
@@ -1356,4 +1356,12 @@
 	<string name="speak_title">Ansagen …</string>
 	<string name="speak_descr">Einstellungen für Ansagen zu Straßennamen, Verkehrswarnungen, Blitzern oder Höchstgeschwindigkeit</string>
 	<string name="speak_street_names">Straßennamen ansagen (TTS)</string>
+    <string name="map_widget_fps_info">FPS-Info</string>
+	<string name="driving_region_descr">Region zum Fahren wählen: USA, Europa, UK, Asien etc.</string>
+	<string name="driving_region_japan">Japan</string>
+	<string name="driving_region_us">USA</string>
+	<string name="driving_region_canada">Kanada</string>
+	<string name="driving_region_europe_asia">Europa und Asien</string>
+	<string name="driving_region_uk">UK, Indien, Australien u.a.</string>
+	<string name="announce_gpx_waypoints">GPX-Wegpunkte ansagen</string>
     </resources>

OsmAnd/res/values-el/strings.xml

@@ -387,7 +387,7 @@
 \n\t\'Χωρίς περιστροφή (ο βορράς επάνω)\' - Ο χάρτης δεν θα περιστρέφεται. Ο βορράς θα είναι πάντα επάνω
 \n\t\'Προς την κατεύθυνση κίνησης\' - Ο χάρτης συνεχώς θα συγχρονίζεται με την κατεύθυνσή σας
 \n\t\'Πυξίδα\' - Ο χάρτης συνεχώς θα συγχρονίζεται με την κατεύθυνση της πυξίδας "</string>
-	<string name="binary_map_download_success">Η λήψη ήταν επιτυχής.\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\' -&gt; \'Ορισμός εμφάνισης\' -&gt; \'Πηγή χάρτη…\' -&gt; \'Offline διανυσματικοί χάρτες\'.</string>
+	<string name="binary_map_download_success">Η λήψη ήταν επιτυχής.\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\' -&gt; \'Επίπεδα χάρτη\' -&gt; \'Πηγή χάρτη…\' -&gt; \'Offline διανυσματικοί χάρτες\'.</string>
 	<string name="tip_day_night_mode">Λειτουργία ημέρας/νύχτας</string>
 	<string name="tip_day_night_mode_t_v2">"\tΗ εμφάνιση μπορεί σε μερικούς διανυσματικούς χάρτες να αλλάξει μεταξύ ημέρας (πιο φωτεινό) και νύχτας (πιο σκοτεινό).
 \n\tΤα νυχτερινά χρώματα είναι πιο ασφαλή για νυχτερινή οδήγηση.
@@ -558,7 +558,7 @@
 	<string name="gpx_option_reverse_route">Αντιστροφή κατεύθυνσης GPX</string>
 	<string name="gpx_option_destination_point">Χρήση τρέχοντος προορισμού</string>
 	<string name="gpx_option_from_start_point">Πέρασμα κατά μήκος ολόκληρου του ίχνους</string>
-	<string name="switch_to_vector_map_to_see">Υπάρχουν διαθέσιμοι offline διανυσματικοί χάρτες για αυτή την τοποθεσία.\n\nΓια χρήση ενεργοποιήστε \'Μενού\' -&gt; \'Ορισμός εμφάνισης\' -&gt; \'Πηγή χάρτη…\' -&gt; \'Offline διανυσματικοί χάρτες\'.</string>
+	<string name="switch_to_vector_map_to_see">Υπάρχουν διαθέσιμοι offline διανυσματικοί χάρτες για αυτή την τοποθεσία.\n\nΓια χρήση ενεργοποιήστε \'Μενού\' -&gt; \'Επίπεδα χάρτη\' -&gt; \'Πηγή χάρτη…\' -&gt; \'Offline διανυσματικοί χάρτες\'.</string>
 	<string name="choose_audio_stream">Έξοδος φωνητικής καθοδήγησης</string>
 	<string name="choose_audio_stream_descr">Επιλέξτε το κανάλι εκτέλεσης της φωνητικής καθοδήγησης (εξαρτώμενο από το σύστημα)</string>
 	<string name="voice_stream_voice_call">Ήχος κλήσης φωνής</string>
@@ -591,7 +591,8 @@
 	<string name="tip_favorites_t">"\tΤα σημεία που χρησιμοποιούνται συχνά μπορούν να αποθηκευτούν ως Αγαπημένα.
 \n\tΓια να αποθηκεύσετε ένα σημείο ως Αγαπημένο πηγαίνετε στο μενού περιβάλλοντος χάρτη, επιλέξτε \'Προσθήκη στα αγαπημένα\' δώστε του κάποιο όνομα. Μετά την αποθήκευση ενός Αγαπημένου, είναι προσβάσιμο μέσω του \'Κύρια Οθόνη\' -&gt; \'Αγαπημένα\'.
 \n\tΠαρατεταμένο πάτημα ενός Αγαπημένου στο μενού \'Αγαπημένα\' παρέχει επιλογές να το ορίσετε ως προορισμό, να το Επεξεργαστείτε ή να το διαγράψετε.
-\n\tΓια να εμφανιστούν όλα τα Αγαπημένα κατευθείαν στο χάρτη, στην οθόνη χάρτη ενεργοποιήστε το επίπεδο \'Αγαπημένα\' στο \'Μενού\' -&gt; \'Ορισμός εμφάνισης\'. "</string>
+\n\tΓια να εμφανιστούν όλα τα Αγαπημένα κατευθείαν στο χάρτη, στην οθόνη χάρτη ενεργοποιήστε το επίπεδο \'Αγαπημένα\' στο \'Μενού\' -&gt; \'Επίπεδα χάρτη\'. "
+	</string>
 	<string name="error_doing_search">Προέκυψε σφάλμα κατά την offline αναζήτηση</string>
 	<string name="search_offline_geo_error">Δεν ήταν δυνατή η ανάλυση της γεωγρ πρόθεσης \'% s\'</string>
 	<string name="search_osm_offline">Αναζήτηση γεωγραφικής τοποθεσίας</string>
@@ -599,7 +600,7 @@
 	<string name="preferred_locale_descr">Επιλέξτε γλώσσα εμφάνισης</string>
 	<string name="preferred_locale">Γλώσσα εμφάνισης</string>
 	<string name="tip_map_switch">Πηγή Χάρτη</string>
-	<string name="tip_map_switch_t_v2">"\tΗ πηγή χάρτη και οι στρώσεις που εμφανίζονται αλλάζουν μέσω του \'Μενού\' -&gt; \'Ορισμός Εμφάνισης\' στην όψη χάρτη.
+	<string name="tip_map_switch_t_v2">"\tΗ πηγή χάρτη και οι στρώσεις που εμφανίζονται αλλάζουν μέσω του \'Μενού\' -&gt; \'Επίπεδα χάρτη\' στην όψη χάρτη.
 \n\tΚάτω από το \'Πηγή χάρτη…\' μπορείτε να επιλέξετε τη χρήση των εγκατεστημένων offline διανυσματικών χαρτών, προκαθορισμένων (online) πηγών πλακιδίων (ενεργοποιήστε το πρόσθετο \'Online χάρτες\' για αυτό), ή χάρτες που κατασκευάστηκαν χειροκίνητα χρησιμοποιώντας π.χ. το OsmAndMapCreator σε κάποιο PC.
 \n\tΟ OsmAnd επίσης υποστηρίζει προσαρμόσιμες πηγές. "
 	</string>
@@ -768,7 +769,7 @@
 	<string name="layer_transport">Στάσεις ΜΜΜ</string>
 	<string name="layer_poi">Σημ Ενδ…</string>
 	<string name="layer_map">Πηγή χάρτη…</string>
-	<string name="menu_layers">Ορισμός εμφάνισης</string>
+	<string name="menu_layers">Επίπεδα χάρτη</string>
 	<string name="context_menu_item_search_poi">Αναζήτηση ΣΕ</string>
 	
 	<string name="use_trackball_descr">Χρήση του trackball για μετακίνηση του χάρτη</string>
@@ -794,7 +795,7 @@
 	<string name="search_poi_filter">Φιλτράρισμα</string>
 	<string name="menu_mute_off">Ήχος ανοικτός</string>
 	<string name="menu_mute_on">Ήχος κλειστός</string>
-	<string name="voice_provider_descr">Επιλέξτε φωνητική καθοδήγηση για την πλοήγηση</string>
+	<string name="voice_provider_descr">Επιλέξτε φωνητική καθοδήγηση για την πλοήγηση (κωδικοί γλώσσας, δείτε το ISO 639-1)</string>
 	<string name="voice_provider">Φωνητική καθοδήγηση</string>
 	<string name="voice_data_initializing">Αρχικοποίηση δεδομένων φωνής…</string>
 	<string name="voice_data_not_supported">Μη υποστηριζόμενη έκδοση των δεδομένων φωνής</string>
@@ -1310,4 +1311,9 @@
 	<string name="av_camera_focus_descr">Επιλέξτε τον τύπο εστίασης της εσωτερικής κάμερας</string>
 	<string name="osmodroid_mode_on">Παύση OsMoDroid</string>    
     <string name="osmodroid_mode_off">Έναρξη OsMoDroid</string>
+    <string name="driving_region_japan">Ιαπωνία</string>
+	<string name="driving_region_us">ΗΠΑ</string>
+	<string name="driving_region_canada">Καναδάς</string>
+	<string name="driving_region_europe_asia">Ευρώπη &amp; Ασία</string>
+	<string name="driving_region_uk">ΗΒ, Ινδία, Αυστραλία, Κύπρος κλπ</string>
 	</resources>

OsmAnd/res/values-fa/strings.xml

@@ -611,7 +611,7 @@
     <string name="recording_is_recorded">صدا/تصویر در حال ضبط میباشد. برای متوقف کردن آن ویجت AV را بزنید.</string>
     <string name="recording_playing">صدایی از ضبط مورد نظر درحال پخش میباشد.\n%1$s</string>
     <string name="recording_delete_confirm">آیا میخواهید این مورد ضبط شده را پاک کنید؟</string>
-    <string name="recording_description">ضبط %1$s%2$ s از %3$s</string>
+    <string name="recording_description">ضبط %1$s%2$s از %3$s</string>
     <string name="osmand_srtm_short_description_80_chars">افزونه OsmAnd برای منحنی های همتراز آفلاین</string>
     <string name="use_magnetic_sensor_descr">استفاده از حسگر مغناطیسی به جای سنسور جهت یابی برای استفاده در قطب نما</string>
     <string name="show_poi_over_map">نشان دادن POI</string>
@@ -1524,4 +1524,11 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
     <string name="announce_gpx_waypoints">اعلام نقاط بین راهی GPX</string>
     <string name="osmodroid_mode_on">توقف OsMoDroid</string>    
     <string name="osmodroid_mode_off">شروع OsMoDroid</string>
+    <string name="map_widget_fps_info">اطلاعات FPS</string>
+	<string name="driving_region_descr">انتخاب منطقه رانندگی:آمریکا،اروپا،انگلستان،آسیا و سایر مناطق</string>
+	<string name="driving_region_japan">ژاپن</string>
+	<string name="driving_region_us">ایالات متحده آمریکا</string>
+	<string name="driving_region_canada">کانادا</string>
+	<string name="driving_region_europe_asia">اروپا و آسیا</string>
+	<string name="driving_region_uk">انگلستان، هند، استرالیا و سایر کشورها</string>
 	</resources>

OsmAnd/res/values-hu/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="tip_recent_changes_0_7_2_t">"A 0.7.2 kiadás változásai:
 \n\t- Natív renderelő minden eszközre
 \n\t- Offline POI szerkesztés
 \n\t- Akadálymentesítés 
@@ -115,8 +116,8 @@
   <string name="index_name_oceania">Óceánia</string>
   <string name="index_name_other">Világtérkép, tematikus térképek</string>
   <string name="index_name_wiki">Wikipédia</string>
-  <string name="index_name_voice">Hang csomagok (felvett)</string>
+  <string name="index_name_voice">Hang csomagok (felvett, korlátozott lehetőségek)</string>
-  <string name="index_name_tts_voice">Hang csomagok (gépi hang)</string>
+  <string name="index_name_tts_voice">Hang csomagok (TTS gépi hang, ajánlott)</string>
   <string name="amenity_type_wikiosm">Wikipédia (offline)</string>
   <string name="amenity_type_user_defined">Személyre szabható</string>
   <string name="fav_export_confirmation">A kedvencekből létezik már mentés. Le szeretnéd cserélni?</string>
@@ -346,10 +347,10 @@
   <string name="mile">mi</string>
   <string name="send_location_way_choose_title">Hely megosztásának módja</string>
   <string name="send_location_sms_pattern">Hely : %1$s\n%2$s</string>
-  <string name="send_location_email_pattern">A hely megjelenítéséhez kattints a %1$s linkre a webböngészőben vagy az Androidra szánt linkre %2$s\n\nTo see location follow the web browser link %1$s or android intent link %2$s</string>
+  <string name="send_location_email_pattern">A hely megjelenítéséhez kattints a %1$s linkre a webböngészőben vagy az Androidra szánt linkre %2$s</string>
   <string name="send_location">Hely pozíció elküldése</string>
   <string name="context_menu_item_share_location">Hely megosztása</string>
-  <string name="add_waypoint_dialog_added">Sikeres útpont felvétel: \'\'{0}\'\'</string>
+  <string name="add_waypoint_dialog_added">Sikeres GPX útpont felvétel: \'\'{0}\'\'</string>
   <string name="add_waypoint_dialog_title">Útpont hozzáadása a felvett GPX útvonalhoz</string>
   <string name="context_menu_item_add_waypoint">GPX útpont hozzáadás</string>
   <string name="amenity_type_administrative">Adminisztráció</string>
@@ -358,7 +359,7 @@
   <string name="amenity_type_emergency">Vészhelyzet</string>
   <string name="amenity_type_entertainment">Szórakoztatás</string>
   <string name="amenity_type_finance">Pénzügy</string>
-  <string name="amenity_type_geocache">Geocache</string>
+  <string name="amenity_type_geocache">Geocaching</string>
   <string name="amenity_type_healthcare">Egészségügy</string>
   <string name="amenity_type_historic">Történelem</string>
   <string name="amenity_type_landuse">Terület</string>
@@ -417,7 +418,7 @@
   <string name="daynight">Éjjel/nappali mód</string>
   <string name="download_files_question">{0} fájl letöltés ({1} MB)?</string>
   <string name="items_were_selected">{0} elem lett kijelölve</string>
-  <string name="filter_existing_indexes">Szűrő:\nletöltve</string>
+  <string name="filter_existing_indexes">Letöltöttek</string>
   <string name="deselect_all">Kijelölés megszüntetése</string>
   <string name="select_all">Mindet kijelöl</string>
   <string name="reload">Újratölt</string>
@@ -458,7 +459,7 @@
   <string name="error_reading_gpx">GPX adat olvasási hiba</string>
   <string name="vector_data">Vektoros OSM térkép</string>
   <string name="transport_context_menu">Közlekedés keresése a célnál</string>
-  <string name="point_on_map">Hely:\n szélesség %1$.5f, hosszúság %2$.5f</string>
+  <string name="point_on_map">Hely:\n szélesség %1$.5f\n hosszúság %2$.5f</string>
   <string name="osb_bug_name">Hiba</string>
   <string name="poi_context_menu_modify">POI módosítás</string>
   <string name="poi_context_menu_delete">POI törlés</string>
@@ -514,7 +515,7 @@
   <string name="search_poi_filter">Szűrő</string>
   <string name="menu_mute_off">Hang bekapcsolva</string>
   <string name="menu_mute_on">Némítva</string>
-  <string name="voice_provider_descr">Hangutasítás kiválasztása navigációhoz</string>
+  <string name="voice_provider_descr">Hangutasítás kiválasztása navigációhoz (nyelvkódokhoz lásd ISO 639-1)</string>
   <string name="voice_provider">Hangutasítás</string>
   <string name="voice_data_initializing">Beszédadat előkészítése…</string>
   <string name="voice_data_not_supported">Nem támogatott beszédadat</string>
@@ -568,8 +569,8 @@
   <string name="update_poi_is_not_available_for_zoom">Nem lehet a POI-kat frissíteni kis nagyítás mellett</string>
   <string name="context_menu_item_update_poi">POI-k frissítése</string>
   <string name="context_menu_item_update_map_confirm">Biztos, hogy a helyi adatokat internetről frissíti?</string>
-  <string name="search_history_city">Település:\n {0}</string>
+  <string name="search_history_city">Település: {0}</string>
-  <string name="search_history_street">Utca:\n {0}, {1}</string>
+  <string name="search_history_street">Utca: {0}, {1}</string>
   <string name="search_history_int_streets">Kereszteződés: {0} és {1}, {2}</string>
   <string name="search_history_building">Épület: {0}, {1}, {2}</string>
   <string name="favorite">Kedvenc</string>
@@ -960,10 +961,12 @@
 \n\t\'Napkelte/Napnyugta\' - automatikus mód, a Nap helyzetének megfelelően (alapértelmezett)
 \n\t\'Nappal\' - mindig a nappali színek használata
 \n\t\'Éjjel\' - mindig az éjjeli színek használata
-\n\t\'Fényérzékelő szenzor\' - a térkép az eszköz fényérzékelője alapján vált a színek között (ha az eszköz tartalmaz ilyent) "</string>
+\n\t\'Fényérzékelő szenzor\' - a térkép az eszköz fényérzékelője alapján vált a színek között (ha az eszköz tartalmaz ilyent) "
+	</string>
 <string name="tip_map_switch_t_v2">"\tA térképforrás és a rétegek kicserélhetők a \'Menü\' -&gt; \'Rétegek\' alatt.
 \n\tA \'Térképforrás…\' alatt kiválasztható az előre letöltött vektoros térkép, előre beállított (online) raszteres forrás (az \'Online térkép\' kiterjesztést be kell kapcsolni hozzá), vagy kézzel gyártott térkép pl. OsmAndMapCreatorral készítve PC-n.
-\n\tAz OsmAnd saját forrásokat is támogat. "</string>
+\n\tAz OsmAnd saját forrásokat is támogat. "
+	</string>
 <string name="osmand_short_description_80_chars">Az OsmAnd egy nyílt forráskódú navigációs alkalmazás offline és online térképekkel</string>
 <string name="osmand_long_description_1000_chars">
 		OsmAnd (OSM Automated Navigation Directions)
@@ -1187,7 +1190,8 @@
 \n\t* Az OsmAnd már elfogadja a maps.google.com helyhivatkozásokat
 \n\t* Új GPX infó widget\n\t* Többablakos támogatás az újabb Samsung eszközökhöz
 \n\t* Iránytűhöz Kalman-szűrő
-\n\t* Pebble óra támogatás "</string>
+\n\t* Pebble óra támogatás "
+	</string>
     <string name="save_current_track_widget">GPX nyomvonal\n mentése</string>
 	<string name="street_name">Utca</string>
 	<string name="hno">Házszám</string>
@@ -1248,10 +1252,11 @@
 \n\t* Új letöltőképernyő (letöltés a háttérben)
 \n\t* GPX alkönyvtárak támogatása a nyomvonalak rendezéséhez\n\t* SRTM fájlok törlése\n\t* OSM Jegyzetek támogatás " 
     </string>
-    <string name="intermediate_items_sort_return">Célpontok optimális sorrendbe rendezve a térképpozíciótól a célpont felé</string>
+    <string name="intermediate_items_sort_return">Célpontok optimális sorrendbe rendezve a térképpozíciótól a célpont felé.</string>
     <string name="intermediate_items_sort_by_distance">Rendezés (háztól-házig)</string>
     <string name="tip_recent_changes_1_5_t">Az 1.5 kiadás újdonságai:
 	\n\t* Hangos figyelmeztetések sebességhatárra és traffipaxra
+	\n\t* Több figyelmeztető hang lehetőség (utcanevek bemondása)
 	\n\t* Nagy felbontású térkép ikonok
 	\n\t* Sok változtatás a felhasználói felületen
 	\n\t* Hibajavítások: távolságkijelzés, GPX analizálás, útpontkezelés, tervező widget, OSM feltöltés, https kezelés
@@ -1270,7 +1275,7 @@
 	<string name="speak_warnings_descr">Közlekedési figyelmeztetések (stop, fekvőrendőr), traffipax, sebességhatár</string>
     <string name="speak_speed_limit">Sebességhatár bemondása</string>
     <string name="speak_cameras">Traffipax bemondása</string>
-	<string name="speak_traffic_warnings">Közlekedési figyelmeztetések bemondásaa</string>
+	<string name="speak_traffic_warnings">Közlekedési figyelmeztetések bemondása</string>
 	<string name="local_index_gpx_timespan">\nIdőtartam: %1$d:%2$02d:%3$02d</string>
 	<string name="local_index_gpx_timemoving">\nHaladási idő: %1$d:%2$02d:%3$02d</string>
 	<string name="destination_point">Célpont %1$s</string>
@@ -1287,4 +1292,19 @@
 	<string name="av_camera_focus_continuous">A kamera folyamatosan próbál fókuszálni</string>
 	<string name="av_photo_play_sound">Hangjelzés elsütéskor</string>
 	<string name="av_photo_play_sound_descr">Válassz, hogy szeretnél-e hangjelzést fénykép készítésekor</string>
-</resources>
+<string name="driving_region_descr">Válassz vezetési területet: USA, Európa, UK, Ázsia, stb.</string>
+	<string name="driving_region">Vezetési terület</string>
+	<string name="driving_region_japan">Japán</string>
+	<string name="driving_region_us">USA</string>
+	<string name="driving_region_canada">Kanada</string>
+	<string name="driving_region_europe_asia">Európa és Ázsia</string>
+	<string name="driving_region_uk">UK, India, Ausztrália &amp; továbbiak</string>
+	<string name="osmodroid_mode_on">OsMoDroid leállítása</string>    
+    <string name="osmodroid_mode_off">OsMoDroid indítása</string>
+    <string name="announce_gpx_waypoints">GPX útpontok bemondása</string>
+    <string name="speak_title">Bemondás…</string>
+	<string name="speak_descr">Utcanevek, közlekedési figyelmeztetések (megállás, fekvőrendőr), traffipax, sebességhatár bemondásának beállításai</string>
+	<string name="speak_street_names">Utcanevek bemondása (TTS)</string>
+    <string name="osb_author_dialog_password">OSM jelszó (opcionális)</string>
+	<string name="map_widget_fps_info">FPS debug infó</string>
+	</resources>

OsmAnd/res/values-it/strings.xml

@@ -1159,7 +1159,7 @@
     <string name="av_use_external_recorder">Utilizza il registratore di sistema</string>
     <string name="av_settings_descr">Configura le impostazioni audio e video</string>
     <string name="av_settings">"Impostazioni audio/video "</string>
-    <string name="recording_error">"Errore durante la registrazione "</string>
+    <string name="recording_error">Errore durante la registrazione </string>
     <string name="recording_camera_not_available">La fotocamera non è disponibile</string>
     <string name="recording_is_recorded">L\'audio/video sta per essere registrato. Per fermarlo seleziona il widget AV.</string>
     <string name="recording_playing">L\'audio della registrazione specificata sta per essere riprodotto.\n%1$s</string>
@@ -1323,7 +1323,7 @@
 <string name="local_index_gpx_timespan">\nTempo trascorso: %1$d:%2$02d:%3$02d</string>
 	
 	<string name="speak_warnings_descr">Configura gli avvisi del traffico (fermate forzate, dossi rallentatori) avvisi autovelox, limiti di velocità</string>
-    <string name="speak_speed_limit">Annuncia limite di velocità</string>
+    <string name="speak_speed_limit">Annuncia limiti di velocità</string>
     <string name="speak_cameras">Annuncia autovelox</string>
 	<string name="speak_traffic_warnings">Annuncia avvisi di traffico</string>
 	<string name="tip_recent_changes_1_5_t">Cambiamenti nella 1.5:
@@ -1350,4 +1350,12 @@
     <string name="announce_gpx_waypoints">Annuncia i punti GPX di passaggio</string>
     <string name="osmodroid_mode_on">Ferma OsMoDroid</string>    
     <string name="osmodroid_mode_off">Avvia OsMoDroid</string>
+    <string name="driving_region_descr">Scegliete la regione di guida: USA, Europa, UK, Asia e Altre</string>
+	<string name="driving_region">Regione di guida</string>
+	<string name="driving_region_japan">Giappone</string>
+	<string name="driving_region_us">Stati Uniti</string>
+	<string name="driving_region_canada">Canada</string>
+	<string name="driving_region_europe_asia">Europa &amp; Asia</string>
+	<string name="driving_region_uk">UK, India, Australia e Altri</string>
+	<string name="map_widget_fps_info">Informazioni FPS</string>
 	</resources>

OsmAnd/res/values-nb/bidforfix.xml

@@ -1,3 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
-<resources>
+<resources><string name="bidforfix_loading">Laster</string>
+    <string name="bidforfix_supporters">%1$d Støttespillere</string>
+	<string name="bidforfix_funded">finansiert: %d%%</string>    
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
 	<string name="rendering_attr_roadColors_name">Veifargeskjema</string>
     <string name="map_widget_show_destination_arrow">Vis retning til målet</string>
     <string name="gps_not_available">Aktiver GPS i innstillingene</string>
@@ -50,7 +51,7 @@
 	<string name="map_widget_day_night">Dag/natt-kart</string>
 	<string name="map_widget_vector_attributes">Opptegningsattributter:</string>
 	<string name="map_widget_renderer">Opptegningsstil</string>
-	<string name="layer_map_appearance">Still inn skjerm</string>
+	<string name="layer_map_appearance">Konfigurer skjerm</string>
 	<string name="show_lanes">Vis kjørefelt</string>
 	<string name="avoid_unpaved">Unngå uasfalterte veier</string>
 	<string name="avoid_ferries">Unngå ferger</string>
@@ -204,13 +205,13 @@
 	<string name="index_name_oceania">Oseania</string>
 	<string name="index_name_other">Verdens- og emnekart</string>
 	<string name="index_name_wiki">Verdensomspennende Wikipedia</string>
-	<string name="index_name_voice">Talepakker (opptak)</string>
+	<string name="index_name_voice">Talepakker (opptak, begrenset funksjonalitet)</string>
-	<string name="index_name_tts_voice">Talepakker (TTS)</string>
+	<string name="index_name_tts_voice">Talepakker (TTS kunstig tale, foretrekk)</string>
 	<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
 	<string name="amenity_type_user_defined">Brukerdefinert</string>
 	<string name="fav_export_confirmation">Fil med tidligere eksporterte favoritter finnes allerede. Vil du erstatte den?</string>
 	<string name="profile_settings">Profilspesifikke innstillinger</string>
-	<string name="settings_preset">Brukerprofil</string>
+	<string name="settings_preset">Standardprofil</string>
 	<string name="settings_preset_descr">Velg en brukerprofil med egendefinert kart og navigeringsinnstillinger.</string>
 	<string name="routing_settings">Navigering</string>
 	<string name="routing_settings_descr">Spesifiser navigeringsalternativer</string>
@@ -230,7 +231,7 @@
 	<string name="tip_day_night_mode">Dag/natt-modus</string>
 	<string name="tip_day_night_mode_t_v2">\tKartutseende kan for noen vektorkart endres mellom dag (lysere) og natt (mørkere).
 		\n\tNattfarger er tryggere for mørkekjøring.
-		\n\tDag/natt-veksling kan velges i \'Meny\' -&gt; \'Still inn skjerm...\' -&gt;\'Dag/natt-kart\'.
+		\n\tDag/natt-veksling kan velges i \'Meny\' -&gt; \'Konfigurer skjerm...\' -&gt;\'Dag/natt-kart\'.
 		\n\tValgene er:
 		\n\t\'Soloppgang/-nedgang\' - automatisk modus, kontrollert av solens posisjon (standard)
 		\n\t\'Dag\' - bruk alltid dagmodus
@@ -300,7 +301,7 @@
 	<string name="local_index_mi_backup">Deaktiver</string>
 	<string name="local_index_mi_delete">Slett</string>
 	<string name="local_index_mi_reload">Last på nytt fra sd-kort</string>
-	<string name="local_index_download">Last ned…</string>
+	<string name="local_index_download">Last ned</string>
 	<string name="local_index_tile_data">Flisdata: %1$s \nMinimum zoom: %2$d\nMaksimum zoom: %3$d\nNedlastbar: %4$s \nZoom nedlastet: %5$s</string>
 	<string name="local_index_poi_data">Interessepunkt-data</string>
 	<string name="local_index_address_data">Adressedata</string>
@@ -463,7 +464,7 @@
 	<string name="hide_poi_filter">Skjul filter</string>
 	<string name="show_poi_filter">Vis filter</string>
 	<string name="search_poi_filter">Filter</string>
-	<string name="voice_provider_descr">Velg taleveiledning for navigering</string>
+	<string name="voice_provider_descr">Velg taleveiledning for navigering (språkkoder se ISO 639-1)</string>
 	<string name="voice_provider">Taleveiledning</string>
 	<string name="search_near_map">Søk i nærheten av siste kartplassering</string>
 	<string name="search_nearby">Søk i nærheten</string>
@@ -482,8 +483,8 @@
 	<string name="hello">Navigeringsprogrammet OsmAnd</string>
 	<string name="context_menu_item_update_poi">Oppdater interessepunkt</string>
 	<string name="context_menu_item_update_map_confirm">Oppdatere lokaldata via internett?</string>
-	<string name="search_history_city">By:\n {0}</string>
+	<string name="search_history_city">By: {0}</string>
-	<string name="search_history_street">Gate:\n {0}, {1}</string>
+	<string name="search_history_street">Gate: {0}, {1}</string>
 	<string name="search_history_int_streets">Veikryss: {0} x {1} i {2}</string>
 	<string name="search_history_building">Bygning: {0}, {1}, {2}</string>
 	<string name="favorite">Favoritt</string>
@@ -569,13 +570,13 @@
 	<string name="search_activity">Søk</string>
 	<string name="searchpoi_activity">Velg interessepunkt</string>
 	<string name="search_POI_level_btn">Finn mer</string>
-	<string name="incremental_search_city">Søk etter by trinnvis. For å finne byer/postnummer, skriv inn de første tre eller flere tegn.</string>
+	<string name="incremental_search_city">Søk etter by trinnvis</string>
 	<string name="incremental_search_street">Søk etter gate trinnvis</string>
 	<string name="incremental_search_building">Søk etter bygning trinnvis</string>
 	<string name="choose_available_region">Velg region fra liste</string>
 	<string name="choose_intersected_street">Velg kryssende gate</string>
 	<string name="Closest_Amenities">Nærmeste fasiliteter</string>
-	<string name="app_mode_default">Standard</string>
+	<string name="app_mode_default">Se på kartet</string>
 	<string name="app_mode_car">Bil</string>
 	<string name="app_mode_bicycle">Sykkel</string>
 	<string name="app_mode_pedestrian">Fotgjenger</string>
@@ -645,4 +646,49 @@
 	<string name="prefer_in_routing_descr">Foretrekk motorveier</string>
     <string name="max_speed_none">ingen</string>
     <string name="choose_osmand_theme_descr">Vel tema for programmet</string>
+    <string name="driving_region_us">USA</string>
+	<string name="driving_region_canada">Canada</string>
+	<string name="driving_region_europe_asia">Europa og Asia</string>
+	<string name="driving_region_uk">England, India, Australia og andre</string>
+	<string name="driving_region_descr">Velg region for bilkjøring: USA, England, Asia, eller andre</string>
+	<string name="driving_region_japan">Japan</string>
+	<string name="driving_region">Region for bilkjøring</string>
+	<string name="osmodroid_mode_on">Stopp OsMoDroid</string>    
+    <string name="osmodroid_mode_off">Start OsMoDroid</string>
+    <string name="announce_gpx_waypoints">Fortell om GPX-rutepunkter</string>
+    <string name="speak_title">Les opp…</string>
+	<string name="speak_descr">Konfigurér til å lese opp gatenavn, trafikkadvarsler (fartsdumper, etc.), fotoradaradvarsler, fartsgrenser</string>
+	<string name="speak_street_names">Les opp gatenavn (TTS)</string>
+    <string name="speak_speed_limit">Informer om fartsgrense</string>
+    <string name="speak_cameras">Informer om Radarkameraer</string>
+	<string name="speak_traffic_warnings">Les opp trafikkmeldinger</string>
+    <string name="tip_recent_changes_1_5_t">Endringer i 1.5:↵
+→\n\t* Stemmevarslinger om fartsgrenser og radarkameraer
+↵
+→\n\t* Flere muligheter for opplesning (gatenavn blir lest opp)
+↵
+→\n\t* Kartikoner i høy oppløsning
+↵
+→\n\t* Flere endringer i brukergrensesnittet
+↵
+→\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https håndtering
+    </string>
+    <string name="osb_author_or_password_not_specified">Oppgi OSM brukernavn og passord i Innstillinger</string>
+    <string name="clear_intermediate_points">Slett mellomliggende rutepunkter</string>
+    <string name="keep_intermediate_points">Behold mellomliggende rutepunkter</string>
+    <string name="new_directions_point_dialog">Mellomliggende rutepunkter er allerede angitt.</string>
+    <string name="context_menu_item_directions_to">Kjøreveiledning til</string>
+    <string name="context_menu_item_directions_from">Kjøreveiledning fra</string>
+    <string name="route_descr_map_location">Kart: </string>
+    <string name="route_descr_lat_lon">Hø %1$.3f, Le %2$.3f</string>
+    <string name="route_descr_current_location">Aktuell posisjon</string>
+    <string name="route_to">Til:</string>
+    <string name="route_via">Via:</string>
+    <string name="route_from">Fra:</string>
+	<string name="local_index_gpx_timespan">\nTotal tid: %1$d:%2$02d:%3$02d</string>
+	<string name="local_index_gpx_timemoving">\nTid i bevegelse: %1$d:%2$02d:%3$02d</string>
+	<string name="destination_point">Mål %1$s</string>
+    <string name="context_menu_item_destination_point">Velg som mål</string>
+    <string name="please_select_address">Velg by eller gate først</string>
+    <string name="search_street_in_neighborhood_cities">Søk etter gaten i nabobyer</string>
     </resources>

OsmAnd/res/values-nl/strings.xml

@@ -176,7 +176,7 @@
   <string name="osmand_service_descr">Dit is om OsmAnd te gebruiken als het scherm uit is</string>
   <string name="tip_rotation_switching">kaartrotatie</string>
   
-  <string name="binary_map_download_success">Download succesvol.\n\t\n\tOm te gebruiken, activeer \'Menu\' -&gt; \'Definieer beeld\' -&gt; \'Kaarbron…\' -&gt; \'Offline vectorkaarten\'.</string>
+  <string name="binary_map_download_success">Download succesvol.\n\t\n\tOm te gebruiken, activeer \'Menu\' -&gt; \'Kaartlagen\' -&gt; \'Kaartbron…\' -&gt; \'Offline vectorkaarten\'.</string>
   <string name="tip_day_night_mode">Dag/Nacht modus</string>
   
   <string name="tip_osm_improve">Verbeter openstreetmap gegevens</string>
@@ -326,7 +326,7 @@
   <string name="gpx_option_reverse_route">Keer richting van GPX-route om</string>
   <string name="gpx_option_destination_point">Gebruik huidige bestemming</string>
   <string name="gpx_option_from_start_point">Volg de gehele track</string>
-  <string name="switch_to_vector_map_to_see">Offline vectorkaart aanwezig voor deze locatie. \n\t\n\tOm deze te gebruiken, activeer \'Menu\' -&gt; \'Definieer beeld\' -&gt; \'Kaartbron…\' -&gt; \'Offline vectorkaarten\'.</string>
+  <string name="switch_to_vector_map_to_see">Offline vectorkaart aanwezig voor deze locatie. \n\t\n\tOm deze te gebruiken, activeer \'Menu\' -&gt; \'Kaartlagen\' -&gt; \'Kaartbron…\' -&gt; \'Offline vectorkaarten\'.</string>
   <string name="choose_audio_stream">Stembegeleiding audiokanaal</string>
   <string name="choose_audio_stream_descr">Kies kanaal voor de stembegeleiding (systeemafhankelijk)</string>
   <string name="voice_stream_voice_call">als telefoongesprek</string>
@@ -367,7 +367,7 @@
   <string name="tip_favorites_t">\tVeelgebruikte punten kunnen worden bewaard als favorieten.
 		\n\tOm een punt als favoriet te bewaren, ga naar het kaartcontextmenu, kies de optie \'Voeg toe aan favorieten\' en geef het dan een naam. Daarna is het toegankelijk via \'Hoofdmenu\' -&gt; \'Favorieten\'.
 		\n\tMet een lange druk op een favoriet in het menu \'Favorieten\' kan je deze als bestemming kiezen, bewerken of verwijderen.
-		\n\tJe kan alle favorieten tegelijk op de kaart weergeven door de laag \'Favorieten\' aan te zetten op het kaartscherm (\'Menu\' -&gt; \'Definieer beeld\'.
+		\n\tJe kan alle favorieten tegelijk op de kaart weergeven door de laag \'Favorieten\' aan te zetten op het kaartscherm (\'Menu\' -&gt; \'Kaartlagen\'.
 	</string>
   <string name="create_poi_link_to_osm_doc">" <u>Online OSM</u> kaart classificatie met foto\'s"</string>
   <string name="error_doing_search">Fout bij offline zoeken</string>
@@ -493,8 +493,8 @@
   <string name="continuous_rendering_descr">Continue kaartgeneratie inplaats van eenmalige generatie van de hele kaart</string>
   <string name="rendering_exception">Fout opgetreden bij kaartgeneratie van het geselecteerde gebied</string>
   <string name="show_point_options">Gebruik locatie…</string>
-  <string name="renderer_load_sucess">Kaartgenerator sucesvol geladen</string>
+  <string name="renderer_load_sucess">Kaartgenerator succesvol geladen</string>
-  <string name="renderer_load_exception">Fout opgetreden: kaartgenerator niet geladen</string>
+  <string name="renderer_load_exception">Fout opgetreden: renderer niet geladen</string>
   <string name="renderers">Vector kaartgenerator</string>
   <string name="renderers_descr">Kies kaartweergavestijl</string>
   <string name="poi_context_menu_website">Toon website</string>
@@ -550,7 +550,7 @@
   <string name="layer_transport">OV-haltes</string>
   <string name="layer_poi">Interessepunt…</string>
   <string name="layer_map">Kaartbron…</string>
-  <string name="menu_layers">Definieer beeld</string>
+  <string name="menu_layers">Kaartlagen</string>
   <string name="context_menu_item_search_poi">Zoek interessepunt</string>
   
   <string name="use_trackball_descr">Gebruik trackball om de kaart te verschuiven</string>
@@ -576,7 +576,7 @@
   <string name="search_poi_filter">Filter</string>
   <string name="menu_mute_off">Geluid is aan</string>
   <string name="menu_mute_on">Geluid is uit</string>
-  <string name="voice_provider_descr">Kies stembegeleiding voor navigatie</string>
+  <string name="voice_provider_descr">Kies stembegeleiding voor navigatie (zie ISO 639-1 voor taalcodes)</string>
   <string name="voice_provider">Stembegeleiding</string>
   <string name="voice_data_initializing">Initialisatie stemgegevens…</string>
   <string name="voice_data_not_supported">Niet-ondersteunde versie van stemgegevens</string>
@@ -821,7 +821,7 @@
   <string name="osb_close_dialog_title">Bug wordt afgesloten</string>
   <string name="osb_close_dialog_close_button">Sluit bug</string>
   <string name="osb_close_dialog_success">Bug is afgesloten</string>
-  <string name="osb_close_dialog_error">Fout opgetreden: bug is niet afgesloten</string>
+  <string name="osb_close_dialog_error">Fout opgetreden: bug is niet gesloten</string>
   <string name="poi_edit_title">Bewerk interessepunt</string>
   <string name="poi_create_title">Maak interessepunt</string>
   <string name="poi_error_poi_not_found">Punt niet gevonden of voorziening is niet een enkel punt</string>
@@ -1026,7 +1026,7 @@
 \n\t\'Nacht\' - gebruik altijd de nacht modus↵
 \n\t\'Lichtsensor\' - de kaartweergave wordt bepaald door de lichtsensor van he apparaat (indien aanwezig) "
 	</string>
-<string name="tip_map_switch_t_v2">"\tDe kaartbron en de kaartlagen kunnen vanuit het kaartscherm worden gewijzigd via \'Menu\' -&gt; \'Definieer beeld\'.↵
+<string name="tip_map_switch_t_v2">"\tDe kaartbron en de kaartlagen kunnen vanuit het kaartscherm worden gewijzigd via \'Menu\' -&gt; \'Kaartlagen\'.↵
 \n\tOnder \'Kaartbron…\' kan je kiezen uit gedownloade vectorkaarten, online kaartsegmenten (wan een website, activeer hiervoor de plugin \'Online kaarten\'), of kaarten die je gemaakt hebt met b.v. OsmAndMapCreator op een PC.↵
 \n\tOsmAnd ondersteunt ook zelfgemaakte kaartbronnen. "
 	</string>
@@ -1088,7 +1088,7 @@
 <string name="snap_to_road">Positie op de weg uitlijnen</string>
 <string name="intermediate_point_too_far">Routepunt %1$s te ver van dichtstbijzijnde weg.</string>
 <string name="arrived_at_intermediate_point">Je bent aangekomen op je routepunt</string>
-<string name="context_menu_item_intermediate_point">Als routepunt toevoegen</string>
+<string name="context_menu_item_intermediate_point">Als routepunt\ntoevoegen</string>
 <string name="map_widget_intermediate_distance">Routepunt</string>
 <string name="ending_point_too_far">Eindpunt te ver van dichtstbijzijnde weg.</string>
 <string name="btn_add_tag">Tag toevoegen</string>
@@ -1478,7 +1478,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="intermediate_items_sort_return">Volgorde van de tussenpunten is aangepast voor de beste route naar de bestemming.</string>
     <string name="intermediate_items_sort_by_distance">Sorteer (kortste afstand)</string>
     <string name="please_select_address">Kies eerst een stad of straat</string>
-    <string name="context_menu_item_destination_point">Als bestemming instellen</string>
+    <string name="context_menu_item_destination_point">Als bestemming\ninstellen</string>
     <string name="destination_point">Bestemming %1$s</string>
     <string name="local_index_gpx_timemoving">\nTijd in beweging: %1$d:%2$02d:%3$02d</string>
 	<string name="local_index_gpx_timespan">\nTijdspanne: %1$d:%2$02d:%3$02d</string>
@@ -1521,4 +1521,12 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="speak_street_names">Straatnamen aankondigen (TTS)</string>
     <string name="osmodroid_mode_on">OsMoDroid stoppen</string>    
     <string name="osmodroid_mode_off">OsMoDroid starten</string>
+    <string name="driving_region_descr">Selecteer reisregio: VS, Europa, GB, Azië en andere</string>
+	<string name="driving_region">Reisregio</string>
+	<string name="driving_region_japan">Japan</string>
+	<string name="driving_region_us">Verenigde Staten</string>
+	<string name="driving_region_canada">Canada</string>
+	<string name="driving_region_europe_asia">Europa en Azië</string>
+	<string name="driving_region_uk">GB, India, Australië en andere</string>
+	<string name="map_widget_fps_info">FPS-debuginformatie</string>
 	</resources>

OsmAnd/res/values-pl/strings.xml

@@ -128,8 +128,8 @@
   <string name="tip_rotation_switching">Orientacja mapy</string>
   
   <string name="switch_to_raster_map_to_see">Obecna pozycja nie ma pokrycia w zainstalowanych mapach offline. Możesz pobrać nową w Ustawieniach lub przełączyć się na mapy online.</string>
-  <string name="switch_to_vector_map_to_see">Wektorowa mapa offline jest dostępna dla tej lokalizacji. \n\t\n\tMożesz włączyć mapy offline używając menu (Zdefiniuj widok -&gt; Źródło mapy… -&gt; Wektorowe mapy offline).</string>
+  <string name="switch_to_vector_map_to_see">Dla tej lokalizacji dostępna jest wektorowa mapa offline. \n\t\n\tAby użyć wybierz 'Menu' -&gt; 'Warstwy mapy' -&gt; 'Źródło mapy…' -&gt; 'Wektorowe mapy offline'.</string>
-  <string name="binary_map_download_success">Pobieranie zakończone.\n\t\n\tMożesz włączyć mapy offline używając menu (Zdefiniuj widok -&gt; Źródło mapy… -&gt; Wektorowe mapy offline).</string>
+  <string name="binary_map_download_success">Pobieranie zakończone.\n\t\n\tAby użyć aktywuj 'Menu' -&gt; 'Warstwy mapy' -&gt; 'Źródło mapy…' -&gt; 'Wektorowe mapy offline'.</string>
   <string name="choose_audio_stream">Wyjście głosu nawigatora</string>
   <string name="choose_audio_stream_descr">Wybierz kanał do odtwarzania głosu nawigatora (zależne od możliwości systemu)</string>
   <string name="voice_stream_voice_call">Kanał głosowy</string>
@@ -165,10 +165,11 @@
   <string name="tip_location_sharing_t">\tMożesz podzielić się swoją pozycją GPS z rodziną lub znajomymi. \n\tAby to zrobić:: \n\tWybierz z menu kontekstowego mapy \'Opcje punktu\' -&gt; \'Udostępnij pozycję GPS\'. \n\tNastępnie wybierz sposób udostępnienia. Do wyboru jest e-mail, SMS lub zwykłe skopiowanie koordynat do schowka.
 </string>
   <string name="tip_favorites">Ulubione punkty</string>
-  <string name="tip_favorites_t">"\tCzęsto używane punkty mogą zostać zapisane jako ulubione.
+  <string name="tip_favorites_t">\tCzęsto używane punkty mogą zostać zapisane jako ulubione.
 \n\tAby zapisać punkt jako ulubiony przejdź do menu kontekstowego, wybierz \'Opcje punktu\' -&gt; \'Dodaj do ulubionych\' i wprowadź jego nazwę. Po zapisaniu, punkt będzie można znaleźć w głównym menu -&gt; \'Ulubione\'.
 \n\tDłuższe naciśnięcie pozycji w \'Ulubionych\' pokaże opcje dotyczące tego punktu.
-\n\tAby wyświetlić wszystkie ulubione punkty bezpośrednio na mapie, włącz warstwę \'Ulubione\' w \'Zdefiniuj widok\'. "</string>
+\n\tAby wyświetlić wszystkie ulubione punkty bezpośrednio na mapie, włącz warstwę \'Ulubione\' w \'Warstwy mapy\'.
+	</string>
   <string name="error_doing_search">Wystąpił błąd podczas wyszukiwania offline</string>
   <string name="search_offline_geo_error">Nie można zinterpretować \'%s\'</string>
   <string name="search_osm_offline">Wyszukaj adres korzystając z map offline</string>
@@ -292,8 +293,8 @@
   <string name="rendering_exception">Wystąpił błąd podczas rysowania wybranej powierzchni</string>
   <string name="rendering_out_of_memory">Brak wystarczającej ilości pamięci, by wyświetlić wybrany obszar</string>
   <string name="show_point_options">Użyj lokalizacji…</string>
-  <string name="renderer_load_sucess">Render uruchomiony</string>
+  <string name="renderer_load_sucess">Renderer pomyślnie wczytany</string>
-  <string name="renderer_load_exception">Wystąpił błąd, render nie został uruchomiony</string>
+  <string name="renderer_load_exception">Wystąpił błąd: renderer nie został wczytany</string>
   <string name="renderers">Render wektorowy</string>
   <string name="renderers_descr">Wybierz wygląd mapy wektorowej offline</string>
   <string name="poi_context_menu_website">Pokaż stronę WWW tego POI</string>
@@ -331,7 +332,7 @@
   <string name="show_route">Szczegóły trasy</string>
   <string name="fav_imported_sucessfully">Ulubione zostały zaimportowane</string>
   <string name="fav_file_to_load_not_found">Plik GPX zawierający punkty ulubione nie został znaleziony w {0}</string>
-  <string name="fav_saved_sucessfully">Ulubione zostały zapisane {0}</string>
+  <string name="fav_saved_sucessfully">Ulubione zostały zapisane do {0}</string>
   <string name="no_fav_to_save">Brak ulubionych punktów do zapisania</string>
   <string name="import_fav">Import</string>
   <string name="export_fav">Eksport</string>
@@ -349,7 +350,7 @@
   <string name="layer_transport">Przystanki</string>
   <string name="layer_poi">POI…</string>
   <string name="layer_map">Źródło mapy…</string>
-  <string name="menu_layers">Zdefiniuj widok</string>
+  <string name="menu_layers">Warstwy mapy</string>
   <string name="context_menu_item_search_poi">Szukaj POI</string>
   
   <string name="use_trackball_descr">Użyj trackballa do przesuwania mapy</string>
@@ -377,7 +378,7 @@
   <string name="search_poi_filter">Filtr</string>
   <string name="menu_mute_off">Wyłącz dźwięk</string>
   <string name="menu_mute_on">Włącz dźwięk</string>
-  <string name="voice_provider_descr">Wybierz głos nawigatora</string>
+  <string name="voice_provider_descr">Wybierz głos nawigatora (oznaczenia języków ISO 639-1)</string>
   <string name="voice_provider">Głos nawigatora</string>
   <string name="voice_data_initializing">Inicjowanie danych głosowych…</string>
   <string name="voice_data_not_supported">Niewspierana wersja danych głosowych</string>
@@ -617,19 +618,19 @@
   <string name="favourites_remove_dialog_success">Ulubiony punkt {0} został usunięty.</string>
   <string name="osb_add_dialog_title">Wprowadź opis błędu</string>
   <string name="osb_add_dialog_success">Błąd został zgłoszony</string>
-  <string name="osb_add_dialog_error">Wystąpił błąd, zgłoszenie nie zostało utworzone</string>
+  <string name="osb_add_dialog_error">Wystąpił błąd: zgłoszenie nie zostało utworzone</string>
   <string name="osb_comment_menu_item">Dodaj komentarz</string>
   <string name="osb_comment_dialog_message">Wiadomość</string>
   <string name="osb_comment_dialog_author">Nazwa autora</string>
   <string name="osb_comment_dialog_title">Dodaj komentarz do błędu</string>
   <string name="osb_comment_dialog_add_button">Dodaj komentarz</string>
   <string name="osb_comment_dialog_success">Dodano komentarz</string>
-  <string name="osb_comment_dialog_error">Wystąpił błąd, komentarz nie został dodany</string>
+  <string name="osb_comment_dialog_error">Wystąpił błąd: komentarz nie został dodany</string>
   <string name="osb_close_menu_item">Zamknij błąd</string>
   <string name="osb_close_dialog_title">Zamykanie błędu</string>
   <string name="osb_close_dialog_close_button">Zamknij błąd</string>
   <string name="osb_close_dialog_success">Błąd został zamknięty</string>
-  <string name="osb_close_dialog_error">Wystąpił problem, błąd nie został zamknięty</string>
+  <string name="osb_close_dialog_error">Wystąpił problem: błąd nie został zamknięty</string>
   <string name="poi_edit_title">Edytuj POI</string>
   <string name="poi_create_title">Dodaj POI</string>
   <string name="poi_error_poi_not_found">Nie mogę znaleźć węzła albo udogodnienie (amenity) nie jest pojedynczym węzłem</string>
@@ -1039,7 +1040,7 @@
 		\n\t\'Dzień\' - zawsze używaj trybu dziennego\n\t\'Noc\' - Zawsze używaj trybu nocnego
 		\n\t\'Czujnik światła\' - wygląd mapy kontrolowany jest przez czujnik światła w Twoim urządzeni (jeśli taki posiadasz)
 	</string>	
-	<string name="tip_map_switch_t_v2">\tŹródło mapy oraz wyświetlane warstwy można zmienić przez \'Menu\' -&gt; \'Zdefiniuj widok\' w widoku mapy.\n\tWskazując \'Źródło mapy…\' możesz wybrać wykorzystanie pobranych wcześniej map wektorowych, predefiniowanych map rastrowych (włącz wtyczkę \'Mapy online\') lub map utworzonych ręcznie z wykorzystaniem narzędzi takich jak OsmAndMapCreator na PC\n\tOsmAnd wspiera również własne źródła map.
+	<string name="tip_map_switch_t_v2">\tŹródło mapy oraz wyświetlane warstwy można zmienić przez \'Menu\' -&gt; \'Warstwy mapy\' w widoku mapy.\n\tWskazując \'Źródło mapy…\' możesz wybrać wykorzystanie pobranych wcześniej map wektorowych, predefiniowanych map rastrowych (włącz wtyczkę \'Mapy online\') lub map utworzonych ręcznie z wykorzystaniem narzędzi takich jak OsmAndMapCreator na PC\n\tOsmAnd wspiera również własne źródła map.
 	</string>
 	<string name="tip_app_mode_t_v2">"\tOsmAnd wspiera różne (konfigurowalne) profile aplikacji do różnych przypadków użycia.\n\tProfile można zmienić wybierając przycisk w lewym dolnym rogu ekranu (ikonka samochodu, roweru lub pieszego), lub podczas wybierania trasy. "</string>
 	<string name="email">email</string>
@@ -1310,4 +1311,12 @@
     <string name="announce_gpx_waypoints">Punkty śladu GPX</string>
     <string name="osmodroid_mode_on">Zatrzymaj OsMoDroid</string>    
     <string name="osmodroid_mode_off">Uruchom OsMoDroid</string>
+    <string name="driving_region_japan">Japonia</string>
+	<string name="driving_region_us">Stany Zjednoczone</string>
+	<string name="driving_region_europe_asia">Europa i Azja</string>
+	<string name="driving_region_uk">Wielka Brytania, Indie, Australia i inne</string>
+	<string name="driving_region_descr">Wybierz region, w którym będziesz się poruszał: Stany Zjednoczone, Europa, Wielka Brytania, Azja i inne</string>
+	<string name="driving_region">Region poruszania się</string>
+	<string name="driving_region_canada">Kanada</string>
+	<string name="map_widget_fps_info">Informacje debugowania FPS</string>
 	</resources>

OsmAnd/res/values-pt/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="amenity_type_administrative">Administrativo</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="amenity_type_administrative">Administrativo</string>
   <string name="amenity_type_barrier">Barreira</string>
   <string name="amenity_type_education">Educação</string>
   <string name="amenity_type_emergency">Emergência</string>
@@ -21,7 +22,7 @@
   <string name="amenity_type_transportation">Transporte</string>
   <string name="indexing_address">Indexando endereço…</string>
   <string name="indexing_map">Indexando mapa…</string>
-  <string name="indexing_poi">Indexando pontos de interesse…</string>
+  <string name="indexing_poi">Indexando POI…</string>
   <string name="indexing_transport">Indexando transporte…</string>
   <string name="input_output_error">Erro de entrada/saída</string>
   <string name="km">km</string>
@@ -36,7 +37,7 @@
   <string name="poi_filter_for_tourists">Para turistas</string>
   <string name="poi_filter_fuel">Combustível</string>
   <string name="poi_filter_namefinder">Pesquisa nome on-line</string>
-  <string name="reading_cached_tiles">Leitura do cache de imagens…</string>
+  <string name="reading_cached_tiles">Lendo cache de imagens…</string>
   <string name="version_index_is_big_for_memory">O índice \'\'{0}\'\' não coube na memória</string>
   <string name="version_index_is_not_supported">A versão do índice \'\'{0}\'\' não é suportada</string>
   <string name="voice_is_not_available_msg">Instrução de voz não disponível. Por favor, vá até configurações e escolha os dados de voz para download.</string>
@@ -71,7 +72,7 @@
   <string name="continuous_rendering_descr">Mostrar processamento contínuo ao invés de imagem inteira de uma vez</string>
   <string name="rendering_exception">Erro ao exibir a área selecionada</string>
   <string name="rendering_out_of_memory">Não há memória suficiente para exibir a área selecionada</string>
-  <string name="show_point_options">Usar localização...</string>
+  <string name="show_point_options">Usar localização-…</string>
   <string name="renderer_load_sucess">O motor de renderização foi carregado com sucesso</string>
   <string name="renderer_load_exception">Erro: O motor de renderização não foi carregado</string>
   <string name="renderers">Renderizadores de vetor</string>
@@ -128,7 +129,7 @@
   <string name="layer_favorites">Favoritos</string>
   <string name="layer_osm_bugs">Bugs OSM</string>
   <string name="layer_transport">Paradas de transportes</string>
-  <string name="layer_poi">Ponto de Interesse…</string>
+  <string name="layer_poi">POI(Ponto de Interesse)…</string>
   <string name="layer_map">Fonte dos mapas…</string>
   <string name="menu_layers">Definir exibição</string>
   <string name="context_menu_item_search_poi">Encontre um Ponto de Interesse</string>
@@ -167,8 +168,8 @@
   <string name="voice_data_unavailable">Dados de voz selecionados não estão acessíveis</string>
   
   <string name="sd_unmounted">O cartão SD está inacessível. \n Será impossível ver mapas ou procurar coisas.</string>
-  <string name="sd_mounted_ro">O cartão SD está disponivel só para leitura. \nVocê não pode baixar da Internet, só pode visualizar os mapas pré-carregados.</string>
+  <string name="sd_mounted_ro">O cartão SD está disponível só para leitura. \nVocê não pode baixar da Internet, só pode visualizar os mapas pré-carregados.</string>
-  <string name="unzipping_file">Descomprimindo arquivo...</string>
+  <string name="unzipping_file">Descomprimindo arquivo…</string>
   <string name="route_tr">Virar à direita e continuar em frente</string>
   <string name="route_tshr">Virar bruscamente à direita e continuar em frente</string>
   <string name="route_tslr">Virar levemente à direita e continuar em frente</string>
@@ -222,11 +223,11 @@
   <string name="history">Histórico</string>
   <string name="uploading_data">Enviando dados…</string>
   <string name="uploading">Enviando…</string>
-  <string name="search_nothing_found">Nao foi encontrado nada</string>
+  <string name="search_nothing_found">Não foi encontrado nada</string>
   <string name="searching">Pesquisando…</string>
   <string name="searching_address">Pesquisando endereço…</string>
   <string name="search_osm_nominatim">Pesquisar endereço via OSM Nominatim</string>
-  <string name="hint_search_online">Numero, rua, cidade</string>
+  <string name="hint_search_online">Número, rua, cidade</string>
   <string name="search_offline_address">Offline</string>
   <string name="search_online_address">Internet</string>
   <string name="max_level_download_tile">Nível de zoom máx</string>
@@ -280,7 +281,7 @@
   <string name="go_back_to_osmand">Voltar ao mapa do OsmAnd</string>
   <string name="close">Fechar</string>
   <string name="loading_data">Carregando dados…</string>
-  <string name="reading_indexes">Lendo os índices…</string>
+  <string name="reading_indexes">Lendo dados locais…</string>
   <string name="previous_run_crashed">Uma execução anterior da aplicação foi interrompida inesperadamente. O arquivo de log encontra-se em {0}. Por favor, informe o problema e inclua o arquivo de log.</string>
   <string name="saving_gpx_tracks">Salvando trilhas GPX no cartão SD…</string>
   <string name="finished_task">Concluído</string>
@@ -301,8 +302,8 @@
   <string name="auto_zoom_map_descr">Zoom automático em função da sua velocidade</string>
   <string name="auto_zoom_map">Zoom automático do mapa</string>
   <string name="additional_settings">Outras definições</string>
-  <string name="settings_preset_descr">Escolher ou definir padrões de uso.</string>
+  <string name="settings_preset_descr">Vista do mapa e configurações de navegação são salvos por perfil. Ajuste o seu perfil padrão aqui.</string>
-  <string name="settings_preset">Modo da aplicação</string>
+  <string name="settings_preset">Perfil padrão</string>
   <string name="settings">Configurações</string>
   <string name="save_current_track_descr">Salvar a trilha atual no cartão SD agora</string>
   <string name="save_current_track">Salvar a trilha atual</string>
@@ -360,7 +361,7 @@
   <string name="choose_available_region">Escolher uma região na lista</string>
   <string name="choose_intersected_street">Escolher a rua transversal</string>
   <string name="Closest_Amenities">Locais mais próximos</string>
-  <string name="app_mode_default">Padrão (também define valores padrão)</string>
+  <string name="app_mode_default">Escolha mapa</string>
   <string name="app_mode_car">Carro</string>
   <string name="app_mode_bicycle">Bicicleta</string>
   <string name="app_mode_pedestrian">Pedestre</string>
@@ -566,13 +567,13 @@
   <string name="local_openstreetmap_upload">Enviar a modificação OSM</string>
   <string name="local_openstreetmap_delete">Apagar modificação</string>
   <string name="local_openstreetmap_descr_title">Asynchronous OSM Editing:</string>
-  <string name="local_openstreetmap_settings">POI/Bugs armazenados na memoria local</string>
+  <string name="local_openstreetmap_settings">POI/Bugs armazenados na memória local</string>
   <string name="local_openstreetmap_settings_descr">Mostrar e gerir Pontos de Interesse e Erros guardados na memória local</string>
   <string name="live_monitoring_descr">Enviar rota para um serviço na Internet</string>
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>
   <string name="live_monitoring_interval">Live tracking interval</string>
-  <string name="live_monitoring_url_descr">Specify the web address with parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
+  <string name="live_monitoring_url_descr">Especifique o endereço web com a sintaxe de parâmetros: lat={0}, lon={1}, data/hora={2}, hdop={3}, altitude={4}, velocidade={5}, bearing={6}</string>
   <string name="live_monitoring_url">Live tracking web address</string>
   <string name="gpx_monitoring_disabled_warn">Please enable \'Log track to GPX\' Tracking settings.</string>
   <string name="show_current_gpx_title">Mostrar rota atual</string>
@@ -593,7 +594,7 @@
   <string name="index_name_oceania">Oceania</string>
   <string name="index_name_other">Mapas globais</string>
   <string name="index_name_wiki">Worldwide Wikipedia</string>
-  <string name="index_name_voice">Pacotes de vozes (gravadas)</string>
+  <string name="index_name_voice">Pacotes de vozes (gravadas, funcionalidades limitadas)</string>
   <string name="index_name_tts_voice">Pacotes de vozes (TTS)</string>
   <string name="amenity_type_wikiosm">Wikipedia (offline)</string>
   <string name="amenity_type_user_defined">Definido pelo utilizador</string>
@@ -603,7 +604,7 @@
   <string name="global_app_settings">Configurações globais da aplicação</string>
   <string name="tip_rotation_switching">Orientação do Mapa</string>
   
-  <string name="binary_map_download_success">Download successful.\n\t\n\tTo use activate \'Settings\' -&gt; \'Map configuration\' -&gt; \'Offline vector maps\'.</string>
+  <string name="binary_map_download_success">Download bem sucedido.\n\t\n\tAtive para usar: \'Configurações\' -&gt; \'Configuração do Mapa\' -&gt; \'Mapas Offline\'.</string>
   <string name="tip_day_night_mode">Modo Dia/Noite</string>
   
   <string name="tip_osm_improve">Melhorar dados OSM</string>
@@ -618,7 +619,7 @@
   
   <string name="use_transparent_map_theme">Tema transparente</string>
   <string name="native_library_not_supported">Biblioteca Nativa não é compatível com este dispositivo.</string>
-  <string name="init_native_library">A iniciar biblioteca nativa…</string>
+  <string name="init_native_library">Inicializando biblioteca nativa…</string>
   <string name="choose_auto_follow_route">Auto-centrar visualização do mapa</string>
   <string name="choose_auto_follow_route_descr">Tempo para o mapa ser centrado na posição actual</string>
   <string name="auto_follow_route_never">Nunca</string>
@@ -652,13 +653,13 @@
   <string name="local_index_mi_rename">Mudar o nome</string>
   <string name="show_gpx_route">Mostrar no mapa</string>
   <string name="poi_filter_nominatim">Online Nominatim</string>
-  <string name="search_position_current_location_search">A procurar posição…</string>
+  <string name="search_position_current_location_search">Procurando posição…</string>
   <string name="search_position_current_location_found">Position (Found)</string>
   <string name="search_position_address">Endereço…</string>
   <string name="search_position_favorites">Favoritos…</string>
   <string name="search_position_undefined">Sem definir</string>
   <string name="search_position_fixed">Fixo</string>
-  <string name="search_position_current_location">Posição actual…</string>
+  <string name="search_position_current_location">Posição atual…</string>
   <string name="search_position_map_view">Última vista do mapa</string>
   <string name="select_search_position">Search near :</string>
   <string name="context_menu_item_search">Pesquisar aqui perto</string>
@@ -719,7 +720,7 @@
   <string name="tip_recent_changes">Alterações recentes</string>
   <string name="tip_recent_changes_0_6_6_t">"Recent changes for 0.6.6 : \n\t- Text To Speech engine for voice navigation \n\t- Make map renderer more detailed \n\t- Basemap for whole world packaged with app \n\t- Tweak offline navigation (still experimental) \n\t- GPX navigation options \n\t- UI update and large bug fixing "</string>
   <string name="voice_not_specified">Nenhum</string>
-  <string name="installing_new_resources">A preparar novos dados…</string>
+  <string name="installing_new_resources">Preparando novos dados…</string>
   <string name="internet_connection_required_for_online_route">Para usar o serviço de navegação on-line, precisa de uma ligação à Internet.</string>
   <string name="tts_language_not_supported_title">Linguagem não suportada</string>
   <string name="tts_language_not_supported">The selected language is not supported by the installed Android TTS (text-to-speech) engine. Do you want to go to the Market to look for another TTS engine? Otherwise the preset TTS language will be used.</string>
@@ -727,8 +728,8 @@
   <string name="tts_missing_language_data">No data for the selected language is installed. Do you want to go to the Market to install?</string>
   <string name="gpx_option_destination_point">Usar destino actual</string>
   <string name="gpx_option_from_start_point">Percorrer toda a rota</string>
-  <string name="switch_to_vector_map_to_see">Mapa vectorial Offline disponível para esta localização.
+  <string name="switch_to_vector_map_to_see">Mapa vetorial Offline disponível para esta localização.
-\n\t\n\tPara o usar, active \'Menu\' -&gt; \'Definir Vista\' -&gt; \'Origem de Mapa…\' -&gt; \'Mapas Vectoriais Offline\'.</string>
+\n\t\n\tPara usar, ative \'Menu\' -&gt; \'Definir Vista\' -&gt; \'Origem de Mapa…\' -&gt; \'Mapas Vetoriais Offline\'.</string>
   <string name="choose_audio_stream">Saída para orientação por voz</string>
   <string name="choose_audio_stream_descr">Escolha o canal para orientação por voz (dependente do sistema)</string>
   <string name="voice_stream_voice_call">Áudio da chamada de voz</string>
@@ -739,7 +740,7 @@
   <string name="overlay_transparency">Transparência da Sobreposição</string>
   <string name="map_transparency_descr">Modificar transparência do mapa base</string>
   <string name="map_transparency">Transparência do mapa base</string>
-  <string name="layer_underlay">mapa de camada inferior…</string>
+  <string name="layer_underlay">Uapa de camada inferior…</string>
   <string name="map_underlay">Mapa de camada inferior</string>
   <string name="map_underlay_descr">Escolha mapa da camada inferior</string>
   <string name="layer_overlay">Mapa da camada superior…</string>
@@ -812,7 +813,7 @@
   <string name="downloading_build">Downloading build…</string>
   <string name="install_selected_build">Você deseja instalar OsmAnd - {0} de {1} {2} MB ?</string>
   <string name="loading_builds_failed">Retrieving the list of OsmAnd builds failed</string>
-  <string name="loading_builds">Loading OsmAnd builds…</string>
+  <string name="loading_builds">Carregando OsmAnd builds…</string>
   <string name="select_build_to_install">Select one of the OsmAnd builds to install</string>
   <string name="contribution_activity">Special activity for contribution version</string>
   <string name="navigate_point_format_D">DDD.DD</string>
@@ -871,7 +872,7 @@
   <string name="use_compass_navigation_descr">Use compass in navigation when diretion is not detected</string>
   <string name="use_compass_navigation">Usar bússola</string>
   <string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
-  <string name="continue_follow_previous_route_auto">A navegação anterior nao foi terminada, quer continua-la? (%1$s segundos)</string>
+  <string name="continue_follow_previous_route_auto">A navegação anterior não foi terminada, quer continua-la? (%1$s segundos)</string>
   
   
   
@@ -940,7 +941,9 @@
 <string name="gps_wakeup_interval">GPS intervalo de despertar: %s</string>
 <string name="int_continuosly">Contínuo</string>
 <string name="email">e-mail</string>
-<string name="osmand_long_description_1000_chars">" OsmAnd (Direções OSM automatizados de navegação) O OsmAnd é uma aplicação de navegação livre com acesso a uma ampla variedade de dados OpenStreetMap (OSM) globais. Todos os dados de mapas (mapas vetoriais ou telha) podem ser armazenados no cartão de memória do telefone para uso offline. O OsmAnd também oferece roteamento offline e online, incluindo a funcionalidade de roteamento curva-a-curva com orientação por voz. Algumas das características principais: - Completa funcionalidade offline (guarda os mapas baixados, sejam eles vetoriais ou imagens, em uma pasta selecionável) - Mapas vetoriais compactados para o mundo inteiro disponíveis - Faça o download de mapas de países ou regiões diretamente do aplicativo - Sobreposição de camadas de mapas diversos, como GPX ou trilhas de navegação, Pontos de Interesse, favoritos, curvas de nível, paragens de transportes públicos, mapas adicionais com transparência personalizável - Pesquisa offline para endereços e locais (POIs) - Encaminhamento offline para distâncias curtas (experimental) - Carro, bicicleta, e os modos de pedestres com: - Opcional vista de dia/noite automático de comutação - Mapa em função da velocidade opcional zoom - Alinhamento mapa opcional de acordo com bússola ou direção do movimento - Orientação pista opcional, display de limite de velocidade, registradas e vozes TTS Limitações desta versão gratuita de OsmAnd: - Número de downloads de mapa limitado - Sem acesso a Wikipedia off-line POIs OsmAnd está sendo ativamente desenvolvida e nosso projeto e seu progresso depende ainda contribuições financeiras para financiar o desenvolvimento e testdriving novas funcionalidades. Por favor, considere a compra de OsmAnd, ou ajude a financiar novas funcionalidades específicas ou fazer uma doação no osmand.net."</string>
+<string name="osmand_long_description_1000_chars">
+		" OsmAnd (Direções OSM automatizados de navegação) O OsmAnd é uma aplicação de navegação livre com acesso a uma ampla variedade de dados OpenStreetMap (OSM) globais. Todos os dados de mapas (mapas vetoriais ou telha) podem ser armazenados no cartão de memória do telefone para uso offline. O OsmAnd também oferece roteamento offline e online, incluindo a funcionalidade de roteamento curva-a-curva com orientação por voz. Algumas das características principais: - Completa funcionalidade offline (guarda os mapas baixados, sejam eles vetoriais ou imagens, em uma pasta selecionável) - Mapas vetoriais compactados para o mundo inteiro disponíveis - Faça o download de mapas de países ou regiões diretamente do aplicativo - Sobreposição de camadas de mapas diversos, como GPX ou trilhas de navegação, Pontos de Interesse, favoritos, curvas de nível, paragens de transportes públicos, mapas adicionais com transparência personalizável - Pesquisa offline para endereços e locais (POIs) - Encaminhamento offline para distâncias curtas (experimental) - Carro, bicicleta, e os modos de pedestres com: - Opcional vista de dia/noite automático de comutação - Mapa em função da velocidade opcional zoom - Alinhamento mapa opcional de acordo com bússola ou direção do movimento - Orientação pista opcional, display de limite de velocidade, registradas e vozes TTS Limitações desta versão gratuita de OsmAnd: - Número de downloads de mapa limitado - Sem acesso a Wikipedia off-line POIs OsmAnd está sendo ativamente desenvolvida e nosso projeto e seu progresso depende ainda contribuições financeiras para financiar o desenvolvimento e testdriving novas funcionalidades. Por favor, considere a compra de OsmAnd, ou ajude a financiar novas funcionalidades específicas ou fazer uma doação no osmand.net."
+	</string>
 <string name="rendering_attr_roadColors_description">Selecione um esquema de cores de estrada:</string>
 	<string name="rendering_attr_roadColors_name">Esquema de cores</string>
     <string name="map_widget_show_destination_arrow">Ver direção para o destino</string>
@@ -990,9 +993,9 @@
     
     
     <string name="search_villages_and_postcodes">Pesquisa por CEP</string>
-	<string name="dropbox_plugin_description">O plugin Dropbox permite sincronizar trilhos e notas de video/audio com a sua conta Dropbox.</string>
+	<string name="dropbox_plugin_description">O plugin Dropbox permite sincronizar trilhos e notas de vídeo/audio com a sua conta Dropbox.</string>
     <string name="animate_routing_using_gpx">Quer usar o ficheiro GPX actual?</string>
-    <string name="av_def_action_video">Gravar video</string>
+    <string name="av_def_action_video">Gravar vídeo</string>
     <string name="av_def_action_audio">Gravar audio</string>
     <string name="av_widget_action_descr">Escolha a acção widget padrão</string>
     <string name="av_widget_action">Ação widget padrão</string>
@@ -1018,7 +1021,7 @@
     <string name="prefer_motorways">Preferir auto-estradas</string>
 	<string name="prefer_in_routing_title">Preferir…</string>
 	<string name="prefer_in_routing_descr">Preferir Auto-Estradas</string>
-    <string name="tip_recent_changes_1_2_t">Correções em 1.2.1:\n\t* Corrigido o Geo Intent (Foursquare, c:geo)\n\t* Corrigidos os tremeliques de visor durante a navegação\n\t* Outras pequenas correções\n\nAlterações em 1.2:\n\t* Correções de bugs (acertos nas rotas, pesquisa, gravação de AV, comandos de voz, algumas melhorias de exibição)\n\t* Facilitada a configuração de sobreposições de Sombras de Colinas (requer plugin Curvas de Nivel)\n\t* Agora aceita links de localização maps.google.com\n\t* filtro de Kalman para a bússola\n\t* Suporte para relógio Pebble\n\t* Novo widget (Informações GPS)\n\t* Adicionado suporte multi-janela para dispositivos Samsung recentes</string>
+    <string name="tip_recent_changes_1_2_t">Correções em 1.2.1:\n\t* Corrigido o Geo Intent (Foursquare, c:geo)\n\t* Corrigidos os tremeliques de visor durante a navegação\n\t* Outras pequenas correções\n\nAlterações em 1.2:\n\t* Correções de bugs (acertos nas rotas, pesquisa, gravação de AV, comandos de voz, algumas melhorias de exibição)\n\t* Facilitada a configuração de sobreposições de Sombras de Colinas (requer plugin Curvas de Nível)\n\t* Agora aceita links de localização maps.google.com\n\t* filtro de Kalman para a bússola\n\t* Suporte para relógio Pebble\n\t* Novo widget (Informações GPS)\n\t* Adicionado suporte multi-janela para dispositivos Samsung recentes</string>
     <string name="max_speed_none">Nenhum</string>
     <string name="index_name_openmaps">OpenMaps UE</string>
     <string name="dist_control_start">Iniciar</string>
@@ -1077,14 +1080,15 @@
     <string name="zxing_barcode_scanner_not_found">Aplicação ZXing Barcode Scanner não está instalada. Procurar no Market?</string>
 	<string name="support_new_features_descr">Faça uma doação para ver novas funcionalidades implementadas nesta aplicação</string>
 	<string name="tip_rotation_switching_t_v2">"\tVocê pode definir se, e como, o mapa será rotacionado clicando repetidamente no ícone da bússola na tela do mapa.\n\tAs opções são:\n\t\'Não girar\' - Mapa ficará fixo sempre com o norte para cima\n\t\'Na direção do movimento\' - Mapa será continuamente alinhado com a sua direção\n\t\'Na direção da bússola\' - Mapa será continuamente alinhado com a leitura da bússola do dispositivo "</string>
-	<string name="tip_day_night_mode_t_v2">"\tA aparência do mapa pode mudar em alguns mapas vetoriais entre os modos Dia (mais claro) e Noite (mais escuro).\n\tCores noturnas são mais seguras para dirigir à noite.\n\tVocê pode definir uma política para a mudança entre os modos Dia/Noite em \'Menu\' -&gt; \'Diversos\' -&gt; \'Modo Dia/Noite\'.\n\n\tAs opções são:\n\t\'Nascer/Pôr-do-Sol\' - modo automático, controlado pela posição do sol (padrão)\n\t\'Dia\' - sempre usar o modo diurno\n\t\'Noite\' - sempre usar o modo noturno\n\t\'Sensor de luz\' - aparência do mapa é controlada por sensor de luz do dispositivo (se equipado) "</string>	
+	<string name="tip_day_night_mode_t_v2">"\tA aparência do mapa pode mudar em alguns mapas vetoriais entre os modos Dia (mais claro) e Noite (mais escuro).\n\tCores noturnas são mais seguras para dirigir à noite.\n\tVocê pode definir uma política para a mudança entre os modos Dia/Noite em \'Menu\' -&gt; \'Diversos\' -&gt; \'Modo Dia/Noite\'.\n\tAs opções são:\n\t\'Nascer/Pôr-do-Sol\' - modo automático, controlado pela posição do sol (padrão)\n\t\'Dia\' - sempre usar o modo diurno\n\t\'Noite\' - sempre usar o modo noturno\n\t\'Sensor de luz\' - aparência do mapa é controlada pelo sensor de luz do dispositivo (se houver) "
+	</string>	
 	<string name="incomplete_locale">incompleto</string>
 	<string name="street_name">Rua</string>
-	<string name="hno">Numero de casa</string>
+	<string name="hno">Número de casa</string>
     <string name="tip_recent_changes_1_0_0_t">Mudanças em 1.0.0:\n\t* Melhorado cálculo de rota: mais rápido, mais preciso e até 250 km\n\t* Incluída opção de mapas apenas com estradas\n\t* Mapa não perde posição após interrupções\n\t* Permitido modo de serviço oculto durante a navegação</string>
     <string name="monitoring_settings">Serviços de monitoramento e Serviço em segundo plano</string>
     <string name="choose_osmand_theme_descr">Escolha o tema da aplicação</string>
-    <string name="choose_osmand_theme">Tema da aplicaçao</string>
+    <string name="choose_osmand_theme">Tema da aplicação</string>
     <string name="accessibility_options">Opções de acessibilidade</string>
     <string name="select_address_activity">Selecione o endereço</string>
     <string name="favourites_list_activity">Selecione favorito</string>
@@ -1120,4 +1124,172 @@
     <string name="osmand_distance_planning_plugin_name">Calculadora de Distância e Ferramenta de Planeamento</string>
     <string name="osmand_distance_planning_plugin_description">"Criar caminhos (ou usar / modificar arquivos GPX existentes) para medir a distância entre  pontos. Se guardar como GPX, pode ser usado para planear rotas GPX."</string>
     <string name="tip_altitude_offset">Altitude - Corrigir a medição</string>
+	<string name="driving_region_descr">Selecione região: USA, Europa, UK, Ásia e Outros</string>
+	<string name="driving_region">Região</string>
+	<string name="driving_region_japan">Japão</string>
+	<string name="driving_region_us">Estados Unidos</string>
+	<string name="driving_region_europe_asia">Europa &amp; Ásia</string>
+	<string name="driving_region_uk">Reino Unido, Índia, Austrália e Outras</string>
+	<string name="osmodroid_mode_on">Parar OsMoDroid</string>    
+    <string name="osmodroid_mode_off">Iniciar OsMoDroid</string>
+    <string name="announce_gpx_waypoints">Anuncie waypoints GPX</string>
+    <string name="speak_title">Anuncie…</string>
+	<string name="speak_descr">Configure para anunciar nomes das ruas, avisos de tráfego (paradas obrigatórias, lombadas), avisos de radares, limites de velocidade</string>
+	<string name="speak_street_names">Anuncie nome das ruas (TTS)</string>
+    <string name="speak_speed_limit">Anuncie limite de velocidade</string>
+    <string name="speak_cameras">Anuncie radares</string>
+	<string name="speak_traffic_warnings">Anuncie avisos de tráfego</string>
+    <string name="tip_recent_changes_1_5_t">Mudanças na versão 1.5:
+	\n\tAvisos de voz sobre limites de velocidade e câmeras
+	\n\tMais voice prompt capabilites(nome de ruas anunciados)
+	\n\tÍcones de mapas de alta densidade
+	\n\tMuitas mudanças na interface
+	\n\tCorreções no display de distância, analizador GPX, manuseio de waypoints, planejando 	widget, OSM uploading, manuseio em https
+    </string>
+    <string name="osb_author_or_password_not_specified">Favor especificar usuário e senha em Configurações</string>
+    <string name="clear_intermediate_points">Limpar pontos intermediários</string>
+    <string name="keep_intermediate_points">Mantenha pontos intermediários</string>
+    <string name="new_directions_point_dialog">Você já definiu os pontos intermediários.</string>
+    <string name="context_menu_item_directions_to">Direções Para</string>
+    <string name="context_menu_item_directions_from">Direções a partir De</string>
+    <string name="route_descr_map_location">Mapa: </string>
+    <string name="route_descr_lat_lon">Lat %1$.3f, lon %2$.3f</string>
+    <string name="route_to">Para:</string>
+    <string name="route_via">Via:</string>
+    <string name="route_from">A partir:</string>
+	<string name="local_index_gpx_timemoving">\nTempo em movimento: %1$d:%2$02d:%3$02d</string>
+	<string name="local_index_gpx_timespan">\nTime parado: %1$d:%2$02d:%3$02d</string>
+	<string name="destination_point">Destino %1$s</string>
+    <string name="context_menu_item_destination_point">Defina como destino</string>
+    <string name="please_select_address">Selecione cidade ou rua primeiro</string>
+    <string name="tip_recent_changes_1_4_t">Mudanças na versão 1.4:
+	\n\t* Otimize ordenação de waypoints para visitá-los (vendedor itinerante, porta a porta)
+	\n\t* Procure rua por nome (na vizinhança) 
+	\n\t* Planning mode plugin (carregue/edite/salve GPX tracks)
+	\n\t* Nova tela de download (download em background)
+	\n\t* Suporte de GPX subdiretórios (organize suas rotas GPX)
+	\n\t* Apague arquivos SRTM
+	\n\t* Suporte de Notas 
+    </string>
+    <string name="search_street_in_neighborhood_cities">Procure rua nas cidades vizinhas</string>
+    <string name="intermediate_items_sort_return">Waypoints intermediários reordenados para otimizar sua ordem no caminho para o destino.</string>
+    <string name="intermediate_items_sort_by_distance">Ordene(porta a porta)</string>
+    <string name="use_distance_measurement_help">Toque para marcar um pont.\n
+Pressione e segure no mapa para apagar pontos anteriores.\n
+Pressione e segure no ponto para ver e anexar descrição.\n
+Clique no widget de medição para ver mais ações.</string>
+    <string name="default_buttons_do_not_show_again">Não mostrar novamente</string>
+    <string name="distance_measurement_start_editing">Comece edição</string>
+    <string name="distance_measurement_finish_editing">Finalize edição</string>
+    <string name="distance_measurement_finish_subtrack">Comece uma nova subrota</string>
+    <string name="distance_measurement_clear_route">Apagar os pontos</string>
+    <string name="distance_measurement_save_gpx">Salve como GPX</string>
+    <string name="distance_measurement_load_gpx">Abrir GPX</string>
+    <string name="wait_current_task_finished">Aguarde até que a tarefa esteja concluída</string>
+    <string name="use_kalman_filter_compass_descr">Use filtro Kalman para evitar aberrações na bússola</string>
+    <string name="use_kalman_filter_compass">Use filtro Kalman</string>
+    <string name="access_mark_final_location_first">Modo de acessibilidade: selecione o destino primeiro</string> 
+    <string name="use_magnetic_sensor_descr">use o sensor magnético para determinar a direção da bússola em vez do sensor de orientação</string>
+    <string name="use_magnetic_sensor">Use sensor magnético</string>
+    <string name="other_location">Outro</string>
+    <string name="local_indexes_cat_srtm">Dados de linhas de contorno</string>
+    <string name="osmodroid_plugin_description">Plugin  OsMoDroid é uma extensão do OsmAnd para aplicação OsModroid para online tracking. Mais informações sobre o serviço em http://esya.ru.</string>
+    <string name="tip_altitude_offset_t">\tMaioria dos dispositivos GPS reportam medidas de altitude no sistema de referência elipsoidal WGS84, para o qual a conversão para sistemas usados localmente requerem a correção dependente de posição.
+		\n\tUma melhor aproximação para esses sistmas locais é a referêncai EGM96. OsmAnd agora tamb[em suporta a exibição automática de altitudes no sistema EGM96.
+		\n\tPara obtê-lo, façao o download do arquivo WW15MGH.DAC via Gerenciamento de Dados (original em http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC).
+	</string>
+    <string name="monitoring_control_start">GPX</string>
+    <string name="osmand_play_title_30_chars">Mapas OsmAnd &amp; Navegação</string>
+	<string name="osmand_extended_description_4000_chars">
+OsmAnd (OSM Automated Navigation Directions) is a map and navigation application with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data. All map data can be stored on your device\'s memory card for offline use. Via your device\'s GPS, OsmAnd offers routing, with optical and voice guidance, for car, bike, and pedestrian. All the main functionalities work both online and offline (no internet needed).
+
+Algumas das principais funcionalidades:
+
+navegação
+ - Funciona online (rápido) ou offline (sem taxas de dados quando você está viajando)
+ - Turn-by-turn voice guidance (recorded and synthesized voices)
+ - Optional lane guidance, street name display, and estimated time of arrival
+ - Suporta pontos intermedi[arios em seu itinerário
+ - Automatic re-routing whenever you deviate from the route
+ - Search for places by address, by type (e.g.: restaurant, hotel, gas station, museum), or by geographical coordinates
+
+Map Viewing
+ - Display your position and orientation on the map
+ - Optionally align the map according to compass or your direction of motion
+ - Save your most important places as Favorites
+ - Display POIs (point of interests) around you
+ - Can display specialized online tile maps
+ - Can display satellite view (from Bing)
+ - Can display different overlays like touring/navigation GPX tracks and additional maps with customizable transparency
+ - Optionally display place names in English, local, or phonetic spelling
+
+Use OpenStreetMap and Wikipedia Data:
+ - High quality information from the best collaborative projects of the world
+ - Global maps from OpenStreetMap, available per country or region
+ - Wikipedia POIs, great for sightseeing (not available in free version)
+ - Unlimited free download, directly from the app (download limit 16 map files in free version)
+ - Always up-to-date maps (updated at least once a month)
+ - Compact offline vector maps
+ - Select between complete map data and just road network (Example: All of Japan is 700 MB, or 200 MB for the road network only)
+ - Also supports online or cached tile maps
+
+Safety Features
+ - Optional automated day/night view switching
+ - Optional speed limit display, with reminder if you exceed it
+ - Optional speed-dependent map zooming
+ - Share your location so that your friends can find you
+
+Bicycle and Pedestrian Features
+ - The maps include foot, hiking, and bike paths, great for outdoor activities
+ - Special routing and display modes for bike and pedestrian
+ - Optional public transport stops (bus, tram, train) including line names
+ - Optional trip recording to local GPX file or online service
+ - Optional speed and altitude display
+ - Display of contour lines and hill-shading (via additional plugin)
+
+Contribua para OpenStreetMap
+ - Reporte erros nos mapas
+ - Upload GPX tracks to OSM directly from the app
+ - Add POIs and directly upload them to OSM (or later if offline)
+ - Optional trip recording also in background mode (while device is in sleep mode)
+
+OsmAnd is open source and actively being developed. Everyone can contribute to the application by reporting bugs, improving translations, or coding new features. The project is in a lively state of continuous improvement by all these forms of developer and user interaction. The project progress also relies on financial contributions to fund the development, coding, and testing of new functionalities. By buying OsmAnd+ you help the application to be even more awesome! It is also possible to fund specific new features, or to make a general donation on osmand.net.
+
+
+Cobertura de mapa e qualidade aproximada:
+ - Western Europe: ****
+ - Eastern Europe: ***
+ - Russia: ***
+ - North America: ***
+ - South America: **
+ - Asia: **
+ - Japan &amp; Korea: ***
+ - Middle East: **
+ - Africa: **
+ - Antarctica: *
+
+Lista de países (basicamente, o mundo todo!):
+Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.
+	</string>
+	<string name="osmand_plus_play_title_30_chars">Mapas OsmAnd+ &amp; Navegação</string>
+	<string name="tip_map_switch_t_v2">\tO caminho dos mapas e camadas mostradas são mudados via \'Menu\' -&gt; \'Definir vista\' em vista de mapa.
+\n\tem \'Caminho dos maps…\' você pode escolhe usar os mapas vetoriais offline pré-carregados, predefined (online) tile sources (ative o plugin \'Online and tile maps\' para isso), ou mapas criados manualmente usando, por exemplo OsmAndMapCreator em um PC.
+→→\n\tOsmAnd também suporta fontes customizadas.
+	</string>
+	<string name="tip_app_mode_t_v2">\tOsmAnd suporta diferentes (personalizáveis) perfis de aplicação para diferentes ussos.
+\n\tVocê pode mudar os perfis via botão perfil no canto inferior esquerdo da tela do mapa (ícone do carro, bicicleta ou pedestre) ou quando criando uma rota.
+	</string>
+	<string name="downloading_file_new">Fazendo o download…</string>
+	<string name="osb_author_dialog_password">Password do OSM (opcional)</string>
+	<string name="av_camera_focus">Tipo de foco da câmera</string>
+	<string name="av_camera_focus_descr">Selecione o tipo de foco da câmera interna</string>
+	<string name="av_camera_focus_auto">Auto foco</string>
+	<string name="av_camera_focus_hiperfocal">Foco hiperfocal</string>
+	<string name="av_camera_focus_edof">Profundidade de visão estendida</string>
+	<string name="av_camera_focus_infinity">Foco está definido no infinito</string>
+	<string name="av_camera_focus_macro">Foco Macro (close-up)</string>
+	<string name="av_camera_focus_continuous">A câmera tenta focalizar continuamente</string>
+	<string name="av_photo_play_sound">Emita som ao tirar foto</string>
+	<string name="av_photo_play_sound_descr">Escolha se emitir som quando tirar fotos</string>
+<string name="driving_region_canada">Canadá</string>
 	</resources>

OsmAnd/res/values-ru/strings.xml

@@ -1257,4 +1257,13 @@
     <string name="route_descr_map_location">Карта: </string>
     <string name="osb_author_dialog_password">Пароль OSM (опционально)</string>
 	<string name="local_index_gpx_timemoving">\nВремя в пути: %1$d:%2$02d:%3$02d</string>
+	<string name="driving_region_descr">Выберите регион: США, Европа, Англия, Азия и т.д.</string>
+	<string name="driving_region">Регион</string>
+	<string name="driving_region_japan">Япония</string>
+	<string name="driving_region_us">США</string>
+	<string name="driving_region_europe_asia">Европа и Азия</string>
+	<string name="driving_region_uk">Англия, Индия, Австралия и др.</string>
+	<string name="context_menu_item_directions_to">Маршрут к</string>
+    <string name="context_menu_item_directions_from">Маршрут от</string>
+    <string name="driving_region_canada">Канада</string>
 	</resources>

OsmAnd/res/values-sl/strings.xml

@@ -49,7 +49,7 @@
 	<string name="favourites_context_menu_delete">Briši priljubljeno lokacijo</string>
 	<string name="add_favorite_dialog_favourite_added_template">Priljubljena lokacija \'\'{0}\'\' je bila dodana.</string>
 	<string name="favourites_remove_dialog_msg">Odstrani priljubljeno lokacijo \'%s\'?</string>
-	<string name="favourites_remove_dialog_success">Priljubljena lokacija {0} je bila izbrisana.</string>
+	<string name="favourites_remove_dialog_success">Priljubljena točka {0} je bila izbrisana.</string>
 	<string name="poi_edit_title">Uredi POI</string>
 	<string name="poi_create_title">Ustvari POI</string>
 	<string name="poi_error_poi_not_found">Točke ni mogoče najti ali pa usluga ni samostojna točka</string>
@@ -60,8 +60,8 @@
 	<string name="poi_action_add">Dodajanje</string>
 	<string name="poi_action_change">Popravljanje</string>
 	<string name="poi_action_succeded_template">{0} je bilo uspešno.</string>
-	<string name="poi_error_unexpected_template">{0} NI bilo uspešno (Nepričakovana napaka).</string>
+	<string name="poi_error_unexpected_template">Med izvajanjem dejanja {0} prišlo do nepričakovane napake.</string>
-	<string name="poi_error_io_error_template">{0} NI bilo uspešno (I/O napaka).</string>
+	<string name="poi_error_io_error_template">Prišlo je do I/O napake pri izvajanju dejanja {0}.</string>
 	<string name="poi_error_info_not_loaded">Informacije o točki niso bile naložene</string>
 	<string name="poi_dialog_name">Ime</string>
 	<string name="poi_dialog_opening_hours">Odprto</string>
@@ -439,7 +439,7 @@
 	<string name="poi_filter_custom_filter">Filter po meri</string>
 	<string name="gps_status_app_not_found">Aplikacija GPS Status ni nameščena. Ali jo želite poiskati v trgovini Market?</string>
 	<string name="show_point_options">Uporabi mesto …</string>
-	<string name="menu_layers">Nastavitve prikaza</string>
+	<string name="menu_layers">Sloji zemljevida</string>
 	<string name="where_am_i">Kje sem?</string>
 	<string name="hide_poi_filter">Skrij filter</string>
 	<string name="show_poi_filter">Prikaži filter</string>
@@ -469,7 +469,7 @@
 	<string name="voice_is_not_available_msg">Glasovno vodenje ni na voljo. V nastavitvah izberite in prenesite ustrezen glasovni paket.</string>
 	<string name="voice_is_not_available_title">Izbrano ni nobeno glasovno vodenje</string>
 	<string name="voice">Glas</string>
-	<string name="voice_provider_descr">Izberite glasovno vodenje za navigacijo</string>
+	<string name="voice_provider_descr">Izberite glasovno vodenje za navigacijo (koda jezika po ISO 639-1)</string>
 	<string name="voice_data_initializing">Začenjanje podatkov govora …</string>
 	<string name="voice_data_not_supported">Nepodprta različica podatkov govora</string>
 	<string name="voice_data_corrupted">Izbrani podatki govora so pokvarjeni</string>
@@ -638,7 +638,7 @@
 	<string name="osb_comment_dialog_message">Sporočilo</string>
 	<string name="osb_comment_dialog_author">Ime avtorja</string>
 	<string name="osb_add_dialog_success">Napaka uspešno prijavljena</string>
-	<string name="osb_add_dialog_error">Napaka v programu: Napaka ni bila prijavljena</string>
+	<string name="osb_add_dialog_error">Prišlo je do napake: napaka ni bila prijavljena</string>
 	<string name="osb_comment_dialog_add_button">Dodaj komentar</string>
 	<string name="osb_comment_menu_item">Dodaj opis napake</string>
 	<string name="osb_comment_dialog_title">Dodajanje opisa napake</string>
@@ -688,7 +688,7 @@
 	<string name="live_monitoring">Spletno sledenje v živo</string>
 	<string name="live_monitoring_interval_descr">Določi interval sledenja v živo</string>
 	<string name="live_monitoring_interval">Interval sledenja v živo</string>
-	<string name="live_monitoring_url_descr">Navedite spletne naslove z naslednjo sintakso za parametre: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
+	<string name="live_monitoring_url_descr">Navedite spletne naslove z naslednjo sintakso za parametre: geogr. šir.={0}, geogr. dolž.={1}, čas={2}, hdop={3}, višina={4}, hitrost={5}, usmeritev={6}</string>
 	<string name="live_monitoring_url">Spletni naslov za sledenje v živo</string>
 	<string name="gpx_monitoring_disabled_warn">Omogočite nastavitev \'Beleži sled v datoteko GPX\'.</string>
 	<string name="profile_settings">Za profil določene nastavitve</string>
@@ -697,7 +697,7 @@
 	<string name="index_settings">Podatki brez povezave (prenos)</string>
 	<string name="osmand_service">Zmožnost načina spanja</string>
 	<string name="osmand_service_descr">Uporabi za izvajanje OsmAnd, ko je zaslon izklopljen</string>
-	<string name="binary_map_download_success">Prejem je uspešen.\n\t\n\tZa uporabo omogočite \'Meni\'-&gt;\'Nastavitve prikaza\'-&gt;\'Vir zemljevidov …\'-&gt;Nepovezani vektorski zemljevidi\'.</string>
+	<string name="binary_map_download_success">Prejem je uspešen.\n\t\n\tZa uporabo omogočite \'Meni\'-&gt;\'Sloji zemljevida\'-&gt;\'Vir zemljevidov …\'-&gt;Nepovezani vektorski zemljevidi\'.</string>
 	<string name="tip_day_night_mode">Način dneva/noči</string>
 	<string name="daynight_mode_auto">Sončni vzhod / zahod</string>
 	<string name="daynight_mode_day">Dnevni</string>
@@ -769,7 +769,7 @@
 	<string name="gpx_option_reverse_route">Obratna smer GPX</string>
 	<string name="gpx_option_destination_point">Uporabi trenuten cilj</string>
 	<string name="gpx_option_from_start_point">Podaj celotno sled</string>
-	<string name="switch_to_vector_map_to_see">Za to mesto so na voljo nepovezani vektorski zemljevidi.\n\t\n\tZa njihovo uporabi omogočite \'Meni\'-&gt;\'Nastavitve prikaza\'-&gt;\'Vir zemljevida …\'-&gt;\'Nepovezani vektorski zemljevidi\'.</string>
+	<string name="switch_to_vector_map_to_see">Za to mesto so na voljo nepovezani vektorski zemljevidi.\n\t\n\tZa njihovo uporabi omogočite \'Meni\'-&gt;\'Sloji zemljevida\'-&gt;\'Vir zemljevida …\'-&gt;\'Nepovezani vektorski zemljevidi\'.</string>
 	<string name="voice_stream_notification">Obvestilni zvok</string>
 	<string name="voice_stream_music">Zvok predstavnosti/glasbe</string>
 	<string name="warning_tile_layer_not_downloadable">Program ne more prejeti plasti zemljevida %1$s, poskusite jo ponovno namestiti.</string>
@@ -801,7 +801,11 @@
 	<string name="add_waypoint_dialog_added">GPX točka \'\'{0}\'\' je bila uspešno dodana</string>
 	<string name="add_waypoint_dialog_title">Dodaj navigacijsko točko posneti sledi GPX</string>
 	<string name="context_menu_item_add_waypoint">Dodaj navigacijsko točko sledi GPX</string>
-	<string name="tip_favorites_t">"\tPogosto uporabljene točke si lahko shranite kot Priljubljene.\n\tČe želite shraniti točko kot priljubljeno, pojdite v kontekstni meni zemljevida in izberite \'Dodaj med priljubljene\' in vnesite ime. Po shranjevanju priljubljene točke je ta dostopna preko \'Glavnega zaslona\' -&gt; \'Priljubljene\'.\n\tDolg pritisk na priljubljeni točki v meniju \'Priljubljene\' nam ponudi možnost, da jo določimo kot cilj, uredimo ali brišemo.\n\tZa prikaz vseh priljubljenih točk na zemljevidu, omogočite sloj \'Priljubljene\' v \'Meni\' -&gt; \'Nastavitve prikaza\'. "</string>
+	<string name="tip_favorites_t">\tPogosto uporabljene točke si lahko shranite kot Priljubljene.
+		\n\tČe želite shraniti točko kot priljubljeno, pojdite v kontekstni meni zemljevida in izberite \'Dodaj med priljubljene\' in vnesite ime. Po shranjevanju priljubljene točke je ta dostopna preko \'Glavnega zaslona\' -&gt; \'Priljubljene\'.
+		\n\tDolg pritisk na priljubljeni točki v meniju \'Priljubljene\' nam ponudi možnost, da jo določimo kot cilj, uredimo ali brišemo.
+		\n\tZa prikaz vseh priljubljenih točk na zemljevidu, omogočite sloj \'Priljubljene\' v \'Meni\' -&gt; \'Sloji zemljevida\'.
+	</string>
 	<string name="transport">Prevoz</string>
 	<string name="additional_settings">Dodatne nastavitve</string>
 	<string name="settings">Nastavitve</string>
@@ -965,11 +969,11 @@ Pomembnejše lastnosti:
 	<string name="first_time_download">Prenos območij</string>
 	<string name="search_poi_location">Iskanje znaka …</string>
 	<string name="search_near_map">Iskanje v bližini mesta zadnjega zemljevida</string>
-	<string name="tip_map_switch_t_v2">\tVir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' -&gt; \'Določitev pogleda\' v pogledu zemljevida.
+	<string name="tip_map_switch_t_v2">\tVir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' -&gt; \'Sloji zemljevida\' v pogledu zemljevida.
 		\n\tPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku.
 		\n\tOsmAnd podpira tudi vire po meri.
 	</string>
-	<string name="fav_saved_sucessfully">Priljubljeni uspešno shranjeni v {0}</string>
+	<string name="fav_saved_sucessfully">Priljubljene točke uspešno shranjene v {0}</string>
 	<string name="opening_hours_not_supported">Oblika delovnega časa ni podprta za urejanje</string>
 	<string name="add_new_rule">Dodajanje novega pravila</string>
 	<string name="transport_Routes">Poti</string>
@@ -1442,7 +1446,7 @@ Približna pokritost zemljevidov in kakovost le-teh:
 Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, Angola, Angvila, Antigva in Barbuda, Argentina, Armenija, Aruba, Avstralija, Avstrija, Azerbajdžan, Bahami, Bahrajn, Bangladeš, Barbados, Belorusija, Belgija, Belize, Benin, Bermuda, Butan, Bolivija, Bonaire, Bosna in Hercegovina, Bocvana, Brazilija, Britanski Deviški otoki, Brunej, Bolgarija, Burkina Faso, Burundi, Kambodža, Kamerun, Kanada, Zelenortski otoki, Srednjeafriška republika, Čad, Čile, Kitajska, Kolumbija, Komori, Kongo, Kostarika, Slonokoščena obala, Hrvaška, Kuba, Curaçao, Ciper, Češka, Danska, Džibuti, Dominika, Dominikanska republika, Ekvador, Egipt, Salvador, Ekvatorialna Gvineja, Eritreja, Estonija, Etiopija, Fidži, Finska, Francija, Francoska Gvajana, Francoska Polinezija, Gabon, Gambija, Gruzija, Nemčija, Gana, Gibraltar, Grčija, Grenlandija, Grenada, Guadeloupe, Guam, Gvatemala, Guernsey, Gvineja, Gvineja Bissau, Gvajana, Haiti, Vatikan, Honduras, Hong Kong, Madžarska, Islandija, Indija, Indonezija, Iran, Irak, Irska, otok Man, Izrael, Italija, Jamajka, Japonska, Jersey, Jordanija, Kazahstan, Kenija, Kiribati, Severna Koreja in Južna Koreja, Kuvajt, Kirgizistan, Laos, Latvija, Libanon, Lesoto, Liberija, Libija, Liechtenstein, Litva, Luksemburg, Macao, Makedonija, Madagaskar, Malavi, Malezija, Maldivi, Mali, Malta, Martinique, Mavretanija, Mauritius, Mayotte, Mehika, Mikronezija, Moldavija, Monako, Mongolija, Črna gora, Montserrat, Maroko, Mozambik, Mjanmar, Namibija, Nauru, Nepal, Nizozemska, Nizozemski Antili, Nova Kaledonija, Nova Zelandija, Nikaragva, Niger, Nigerija, Norveška, Oman, Pakistan, Palau, Palestinsko ozemlje, Panama, Papua Nova Gvineja, Paragvaj, Peru, Filipini, Poljska, Portugalska, Portoriko, Katar, Romunija, Rusija, Ruanda, Saint Barthelemy, Saint Helena, Saint Kitts in Nevis, Sveta Lucija, Saint Martin, Saint Pierre in Miquelon, Saint Vincent in Grenadine, Samoa, San Marino, Saudska Arabija, Senegal, Srbija, Sejšeli, Sierra Leone, Singapur, Slovaška, Slovenija, Somalija, Južna Afrika, Južna Georgia, Južni Sudan, Španija, Šrilanka, Sudan, Surinam, Svazi, Švedska, Švica, Sirija, Tajvan, Tadžikistan, Tanzanija, Tajska, Vzhodni Timor, Togo, Tokelau, Tonga, Trinidad in Tobago, Tunizija, Turčija, Turkmenistan, Tuvalu, Uganda, Ukrajina, Združeni arabski emirati, Velika Britanija (UK), Združene države Amerike (ZDA), Urugvaj, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis in Fortuna, Zahodna Sahara, Jemen, Zambija, Zimbabve.
 	</string>
 	<string name="local_index_gpx_timespan">\nČasovni razpon: %1$d:%2$02d:%3$02d</string>
-	<string name="local_index_gpx_timemoving">\nČas premika: %1$d:%2$02d:%3$02d</string>
+	<string name="local_index_gpx_timemoving">\nČas premikanja: %1$d:%2$02d:%3$02d</string>
 	<string name="av_camera_focus">Vrsta ostrenja kamere</string>
 	<string name="av_camera_focus_descr">Izberite vrsto ostrenja vgrajene kamere</string>
 	<string name="av_camera_focus_auto">Samodejno ostrenje</string>
@@ -1480,6 +1484,14 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="osmodroid_mode_off">Zaženi OsMoDroid</string>
     <string name="announce_gpx_waypoints">Najavljanje GPX točk</string>
     <string name="speak_title">Najavi …</string>
-	<string name="speak_descr">Nastavitve za najavljanje imena ulic, prometna opozorila (prisilne ustavitve, ležeči policaji), opozorila merilnikov hitrosti, omejitve hitrosti</string>
+	<string name="speak_descr">Nastavitve za najavljanje imena ulic, prometna opozorila (ležeči policaji ipd.), opozorila merilnikov hitrosti, omejitve hitrosti</string>
 	<string name="speak_street_names">Najavljanje imen ulic (TTS)</string>
+    <string name="map_widget_fps_info">Podatki razhroščevanja FPS</string>
+	<string name="driving_region_descr">Izbira področja vožnje: ZDA, Evropa, Velika Britanija, Azija in drugo</string>
+	<string name="driving_region">Področje vožnje</string>
+	<string name="driving_region_japan">Japonska</string>
+	<string name="driving_region_us">Združene države</string>
+	<string name="driving_region_canada">Kanada</string>
+	<string name="driving_region_europe_asia">Evropa in Azija</string>
+	<string name="driving_region_uk">Velika Britanija, Indija, Avstralija in drugo</string>
 	</resources>

OsmAnd/res/values-sv/strings.xml

@@ -1175,7 +1175,8 @@ Aktuella data på enheten (%1$s ledigt):</string>
 	<string name="plugin_distance_point_hdop">precision</string>
     <string name="tip_recent_changes_1_5_t">Förändringar i 1.5:
 	\n\t* Röstvarningar vid hastighetsbegränsningar och fartkameror
-	\n\t* Högkvalitativa kartikoner
+	\n\t* Fler röstprompter (uppläsning av gatunamn)
+	\n\t* Högupplösta kartikoner
 	\n\t* Många förändringar av gränssnittet
 	\n\t* Buggfixar i avståndsvisning, GPX-analys, behandling av waypoints, planeringswidget, OSM-uppladdning, https-behandling
     </string>
@@ -1195,4 +1196,13 @@ Aktuella data på enheten (%1$s ledigt):</string>
     <string name="announce_gpx_waypoints">Meddela vid GPX-waypoints</string>
     <string name="osmodroid_mode_on">Stoppa OsMoDroid</string>    
     <string name="osmodroid_mode_off">Starta OsMoDroid</string>
+    <string name="map_widget_fps_info">FPS-avbuggningsinfo</string>
+	<string name="driving_region_descr">Välj område: USA, Europa, UK, Asien och andra</string>
+	<string name="driving_region">Område</string>
+	<string name="driving_region_japan">Japan</string>
+	<string name="driving_region_us">USA</string>
+	<string name="driving_region_canada">Canada</string>
+	<string name="driving_region_europe_asia">Europa &amp; Asien</string>
+	<string name="driving_region_uk">UK, Indien, Australien &amp; andra</string>
+	<string name="local_osm_changes_backup_successful">Ändrad OSM-fil skapad utan problem %1$s</string>
     </resources>

OsmAnd/res/values-tr/bidforfix.xml

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources>    
+<resources><string name="bidforfix_loading">Yükleniyor</string>
-<string name="bidforfix_loading">Yükleniyor</string>
     <string name="bidforfix_supporters">%1$d Destekçi</string>
-	<string name="bidforfix_funded">Finansör: %d%%</string>    
+	<string name="bidforfix_funded">Bağışlanan: %d%%</string>    
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
-<string name="close_changeset">Değişiklik listesini kapat</string>
+<resources><string name="close_changeset">Değişiklik listesini kapat</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz?</string>
 	<string name="rendering_attr_roadColors_description">Yol renk şemasını seç:</string>
 	<string name="rendering_attr_roadColors_name">Yol renk şeması</string>
@@ -105,66 +105,67 @@
 \n\t* Bisikletler için bir yol tipi daha eklendi (bisikletyolu)
 \n\t* Hata düzeltmeleri "</string>
 	<string name="local_indexes_cat_av">Ses/Video verisi</string>
-    <string name="stop_routing_confirm">Navigasyonu durdurmak istediğinize emin misiniz?</string>
+    <string name="stop_routing_confirm">Navigasyonu durdurmak istediğinizden emin misiniz?</string>
-    <string name="clear_dest_confirm">Varış yerini iptal etmek istediğinize emin misiniz?</string>
+    <string name="clear_dest_confirm">Varış noktasını temizlemek istediğinizden emin misiniz?</string>
-    <string name="precise_routing_mode">Hassas rota (alfa)</string>
+    <string name="precise_routing_mode">Hassas yönlendirme (alfa)</string>
     <string name="recording_context_menu_show">Göster</string>
-    <string name="recording_photo_description">%2$s fotoğrafdan %1$s cisi</string>
+    <string name="recording_photo_description">%2$s fotoğrafın %1$s cisi</string>
     <string name="av_def_action_picture">Fotoğraf çek</string>
     <string name="recording_context_menu_precord">Fotoğraf çek</string>
-    <string name="dropbox_plugin_description">Dropbox eklentisi, parçaları ve ses/video notlarını dropbox hesabınızla senkronize etmenize olanak verir.</string>
+    <string name="dropbox_plugin_description">Dropbox eklentisi, yol tariflerini ve ses/video notlarını dropbox hesabınızla eşitlemenize olanak verir.</string>
     <string name="dropbox_plugin_name">Dropbox eklentisi</string>
-    <string name="animate_routing_using_gpx">Varolan bir gpx dosyasını kullanmak istiyor musunuz?</string>
+    <string name="animate_routing_using_gpx">Varolan bir GPX dosyasını kullanmak istiyor musunuz?</string>
-    <string name="intermediate_points_change_order">Sırayı değiştir</string>
+    <string name="intermediate_points_change_order">Sıralamayı değiştir</string>
-    <string name="srtm_paid_version_msg">Kontur çizgileri eklentisi daha geliştirme aşamasında, desteklemek için lütfen Market mağazasından satın alın.</string>
+    <string name="srtm_paid_version_msg">Programın geliştirilebilmesi için lütfen çevreleme çizgileri eklentisini Mağazadan almayı da düşünün.</string>
-    <string name="srtm_paid_version_title">Kontur çizgileri eklentisi</string>
+    <string name="srtm_paid_version_title">Çevreleme çizgileri eklentisi</string>
-    <string name="av_def_action_video">Video kaydet</string>
+    <string name="av_def_action_video">Video çek</string>
     <string name="av_def_action_audio">Ses kaydet</string>
     <string name="av_widget_action_descr">Varsayılan eklenti eylemini seçin</string>
     <string name="av_widget_action">Varsayılan eklenti eylemi</string>
     <string name="av_video_format_descr">Video formatını seçin</string>
     <string name="av_video_format">Video formatı</string>
-    <string name="av_use_external_recorder_descr">Video için sistem kaydedicisini kullan</string>
+    <string name="av_use_external_recorder_descr">Video için dahili kaydediciyi kullan</string>
-    <string name="av_use_external_recorder">Harici kaydediciyi kullan</string>
+    <string name="av_use_external_recorder">Dahili kaydediciyi kullan</string>
     <string name="av_settings_descr">Ses ve video ayarlarını yapılandır</string>
-    <string name="av_settings">"Ses/Video ayarları "</string>
+    <string name="av_settings">Ses/Video ayarları </string>
-    <string name="recording_error">"Kaydedilirken hata oluştu "</string>
+    <string name="recording_error">Kaydedilirken hata oluştu </string>
-    <string name="recording_camera_not_available">Kamera kullanılabilir değil.</string>
+    <string name="recording_camera_not_available">Kamera kullanılabilir değil</string>
-    <string name="dist_control_start">Başlat</string>
+    <string name="dist_control_start">başlat</string>
-    <string name="tip_recent_changes_1_2_t">1.2 deki değişiklikler:</string>
+    <string name="index_name_openmaps">AB Açık haritası</string>
-    <string name="index_name_openmaps">OpenMaps AB</string>
     <string name="download_hillshade_item">Tepe gölgelendirme</string>
     <string name="tip_recent_changes_1_1_2_t">1.1.2 değişiklikler:
 \n\t* Ses / video eklentisi geliştirme (EXIF bilgileri ile fotoğrafları)
 \n\t* Kullanılabilirlik (suboptimal yönlendirme) sabit ve Kontur çizgileri eklenti Kontur hatları için
 \n\t* Tepe gölgelendirme paketleri eklentisi
-\n\t* Hata düzeltmeleri yeniden</string>
+\n\t* Hata düzeltmeleri yeniden
+    </string>
     <string name="precise_routing_mode_descr">Hatasız hassas rotaları hesaplamak için hassas yönlendirmeyi etkinleştirin. Bu mesafe çok sınırlıdır ve yerel kitaplık kullanmaz.</string>
-    <string name="av_use_external_camera_descr">Fotoğraf için sistem uygulamasını kullanın</string>
+    <string name="av_use_external_camera_descr">Fotoğraf için dahili uygulamayı kullan</string>
-    <string name="av_use_external_camera">Kamera uygulamasını kullanın</string>
+    <string name="av_use_external_camera">Kamera uygulamasını kullan</string>
     <string name="recording_is_recorded">Ses/Video kayıt ediliyor. Durdurmak için bu AV ikonuna basın.</string>
-    <string name="recording_playing">Belirtilen kayıt arasından bir ses çalınıyor. %1$s</string>
+    <string name="recording_playing">Belirtilen kayıttan bir ses çalınıyor.\n%1$s</string>
-    <string name="recording_open_external_player">Dış sürücü aç</string>
+    <string name="recording_open_external_player">Harici oynatıcı aç</string>
     <string name="recording_delete_confirm">Bu kaydı kaldırmak istiyor musunuz?</string>
-    <string name="tip_recent_changes_1_1_0_t">1.1.0 değişiklikler:
+    <string name="tip_recent_changes_1_1_0_t">1.1.0'daki değişiklikler:
 \n\t* Uzaklık hesap eklentisi
-\n\t* Ses / video notları eklentisi
+\n\t* Ses/video notları eklentisi
-\n\t* Kontur çizgileri eklentisi
+\n\t* Çevreleme çizgileri eklentisi
 \n\t* Hata düzeltmeleri
-\n\t* &amp;#39;Touring görünümü&amp;#39; haritası stil seçeneği başka harita bilgilerini, yeni yol stilleri, daha fazla kontrast ve Alp yürüyüş (SAC skala) GPS yükseklik okuması için seçeneği
+\n\t* Daha fazla harita bilgileri, yeni yol stilleri, daha fazla zıtlık ve Alp doğa yürüyüşü (SAC skala) seçeneği olan tur görünümü harita stil seçeneği 
-\n\t* EGM96 jeoit ofset düzeltme</string>
+\n\t* GPS yükseklik okuması için EGM96 denge düzeltmesi
+    </string>
     <string name="recording_unavailable">kullanılamaz</string>
-    <string name="recording_context_menu_arecord">Bir sesli not al</string>
+    <string name="recording_context_menu_arecord">Sesli bir not al</string>
     <string name="recording_context_menu_vrecord">Bir video notu al</string>
     <string name="layer_recordings">Kayıt katmanı</string>
-    <string name="recording_can_not_be_played">Kayıt çalınamaz</string>
+    <string name="recording_can_not_be_played">Kayıt oynatılamaz</string>
     <string name="recording_context_menu_delete">Kayıt sil</string>
-    <string name="recording_description">Kayıt %1$s %2$s of %3$</string>
+    <string name="recording_description">Kayıt %3$'nın %1$s %2$s</string>
     <string name="recording_default_name">kayıt</string>
     <string name="av_control_stop">durdur</string>
-    <string name="av_control_start">Başlat</string>
+    <string name="av_control_start">başlat</string>
     <string name="map_widget_av_notes">Ses/video notları</string>
-    <string name="osmand_srtm_short_description_80_chars">Çevrimdışı kontur hatları için OsmAnd eklentisi</string>
+    <string name="osmand_srtm_short_description_80_chars">Çevrimdışı çevreleme çizgileri için OsmAnd eklentisi</string>
     <string name="osmand_srtm_long_description_1000_chars">Bu eklenti OsmAnd adlı çevrimdışı haritalar gösterilebilir kontür çizgileri sağlar. Global veri (70 derece kuzey ve 70 derece güney arasındaki) SRTM (Mekik Radar Topografi Misyonu) ve ASTER (Gelişmiş Uzay Termal Yayılma ve Yansıma Radyometre), bir görüntüleme aracı onboard Terra, NASA&amp;#39;nın Earth Gözlem amiral gemisi uydudan ölçümleri esas Sistemi. ASTER NASA arasında bir kooperatif çabadır, Ekonomi, Ticaret ve Sanayi Odası (METI) ve Japonya Uzay Sistemleri (J-spacesystems) Japonya Bakanlığı.</string>
     
     
@@ -172,23 +173,23 @@
     
     <string name="map_widget_distancemeasurement">Mesafe ölçümü</string>
     <string name="audionotes_location_not_defined">Notu ile ilişkilendirmek Yer henüz tanımlanmamıştır. &amp;quot;Konumu kullan ...&amp;quot; Belirtilen yere not atamak</string>
-    <string name="monitoring_control_stop">Durdur</string>
+    <string name="monitoring_control_stop">durdur</string>
-    <string name="map_widget_audionotes">Ses notları</string>
+    <string name="map_widget_audionotes">Sesli notlar</string>
-    <string name="audionotes_plugin_description">Yolculuk sırasında ses / video notları alın</string>
+    <string name="audionotes_plugin_description">Yolculuk sırasında ses/video notları alın</string>
-    <string name="audionotes_plugin_name">Ses / video notları</string>
+    <string name="audionotes_plugin_name">Ses/video notları</string>
-    <string name="index_srtm_parts">Bölümler</string>
+    <string name="index_srtm_parts">bölümler</string>
-    <string name="index_srtm_ele">Kontur hatları</string>
+    <string name="index_srtm_ele">Çevreleme çizgileri</string>
-    <string name="srtm_plugin_description">Çevrimdışı kontür hatları ve gölge tepeleri (-&amp;gt; Veri Yönetimi -&amp;gt; Download -&amp;gt; seçin istenen harita türünü Ayarlar) indirmeden kolaylaştırır.</string>
+    <string name="srtm_plugin_description">Çevrimdışı çevreleme çizgileri indirmeyi ve tepe gölgelendirmeyi başlat (Ayarlar -&gt; Veri Yönetim -&gt; İndir -&gt; İstenilen harita türünü seç).</string>
-    <string name="srtm_plugin_name">Kontur çizgileri eklentisi</string>
+    <string name="srtm_plugin_name">Çevreleme çizgileri eklentisi</string>
     <string name="download_select_map_types">Diğer haritalar</string>
     <string name="download_roads_only_item">Sadece yollar</string>
-    <string name="download_srtm_maps">Kontur çizgileri</string>
+    <string name="download_srtm_maps">Çevreleme çizgileri</string>
     <string name="download_regular_maps">Düzenli haritalar</string>
-    <string name="download_roads_only_maps">Yollar-sadece haritalar</string>
+    <string name="download_roads_only_maps">"Sadece yol" haritaları</string>
     
 	<string name="rendering_attr_noAdminboundaries_name">Sınırları gizle</string>
-	<string name="rendering_attr_noAdminboundaries_description">Bölgesel sınırların göstergesine bastır (admin düzeyleri 5-9)</string>
+	<string name="rendering_attr_noAdminboundaries_description">Bölgesel sınırların gösterimini sakla (admin düzeyleri 5-9)</string>
-    <string name="osmodroid_plugin_old_ver_not_supported">OsMoDroid eklenti eski bir sürümünü sahiptir ve güncelleştirilmesi gerekmektedir.</string>
+    <string name="osmodroid_plugin_old_ver_not_supported">OsMoDroid eklentisi eski bir sürümünü sahip ve güncelleştirilmesi gerekmektedir.</string>
     <string name="osmodroid_plugin_description">OsMoDroid eklenti canlı izleme özellikleri için OsModroid uygulama için, uzatma OsmAnd edilir. Hizmet hakkında bilgi http://esya.ru mevcuttur.</string>
     <string name="osmodroid_plugin_name">OsMoDroid eklentisi</string>
 	<string name="tip_altitude_offset">Rakım Ekranı - Ofset Düzeltme</string>
@@ -249,7 +250,7 @@
 	<string name="map_widget_next_turn_small">Sonraki dönüş(küçük)</string>
 	<string name="map_widget_next_next_turn">İkinci sonraki dönüş</string>
 	<string name="map_widget_mini_route">Mini rota haritası</string>
-	<string name="download_hillshade_maps">Tepe gölgelendirme bindirmeleri</string>
+	<string name="download_hillshade_maps">Tepe gölgelendirme tabakaları</string>
     <string name="email">e-posta</string>
 <string name="osmand_parking_position_description_add_time">Araba park edilmişti:</string>
 	<string name="starting_point_too_far">Başlangıç noktası en yakın yoldan çok uzakta.</string>
@@ -363,7 +364,7 @@
 	<string name="fast_route_mode">En hızlı rota</string>
 	<string name="context_menu_item_download_map">Haritayı indir</string>
 	<string name="maps_could_not_be_downloaded">Bu harita indirilemedi</string>
-	<string name="phone">telefon</string>
+	<string name="phone">Telefon</string>
 	<string name="use_high_res_maps">Yüksek çözünürlüklü ekran</string>
 	<string name="download_files">İndir</string>
 	<string name="transport_search_none">hiçbiri</string>
@@ -552,7 +553,6 @@
 	<string name="online_map_settings_descr">Çevrimiçi veya önbelleğe alınmış çini harita kaynaklarını yapılandırın</string>
 	<string name="map_settings_descr">Harita ekranını yapılandırma</string>
 	<string name="osmand_rastermaps_plugin_description">Altlık olarak veya tamamlayıcı / altlık haritaları gibi online veya önbelleğe kiremit haritalar çeşitli yapılandırmak için ayarları göster. Bu haritalar ayrıca çevrimdışı ve OsmAnd klasöre kopyalanır hazırlanabilir.</string>
-	<string name="osmand_background_plugin_description">Periyodik GPS cihazı uyanma ile izleme ve uyku navigasyon (ekran kapalı) modunu etkinleştirmek için ayarları göster.</string>
 	<string name="osmand_accessibility_description">Özel erişilebilirlik özellikleri için ayarları göster.</string>
 	<string name="osmand_monitoring_description">GPX dosyaları için geziler kaydetmek için veya bir web hizmeti kullanarak parça yaşamayı kolaylaştıran ayarları göster.</string>
 	<string name="osmand_extra_settings_description">Gelişmiş harita yapılandırma (Artış harita detayları gibi) ve bazı aygıt özellikleri için ayarları görüntüleyin.</string>
@@ -728,16 +728,15 @@
 	<string name="layer_poi_label">POI etiketler</string>
 	<string name="save_current_track_widget">Kaydet</string>
 	<string name="map_widget_gps_info">GPS Bilgisi</string>
-    <string name="tip_recent_changes_1_1_4_t">1.1.4 deki değişiklikler</string>
     <string name="access_arrival_time">Varış Zamanı</string>
-    <string name="item_checked">İşaretli</string>
+    <string name="item_checked">işaretli</string>
-    <string name="item_unchecked">İşaretsiz</string>
+    <string name="item_unchecked">işaretsiz</string>
     <string name="map_view">Harita</string>
-    <string name="prefer_motorways">Otoyol Tercihi</string>
+    <string name="prefer_motorways">Otoyol tercih et</string>
-	<string name="prefer_in_routing_title">Tercihler</string>
+	<string name="prefer_in_routing_title">Tercih et…</string>
-	<string name="prefer_in_routing_descr">Otoyol Tercihi</string>
+	<string name="prefer_in_routing_descr">Otoyol tercih et</string>
     <string name="max_speed_none">Yok</string>
-    <string name="av_def_action_choose">İsteğe bağlı seçim</string>
+    <string name="av_def_action_choose">Talep üzerine seç</string>
     <string name="osmand_play_title_30_chars">OsmAnd Haritalar &amp; Nevigasyon</string>
 	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Haritalar &amp; Navigasyon</string>
 	<string name="gpx_navigation">GPX Rotası</string>
@@ -787,5 +786,80 @@
 	<string name="trace_rendering_descr">Dönüştürme performansını göster</string>
 	<string name="installing_new_resources">Yeni veriler açılıyor…</string>
 	<string name="internet_connection_required_for_online_route">Çevrimiçi navigasyon seçildi ancak İnternet bağlantısı kullanılabilir değil.</string>
-	<string name="layer_hillshade">Tepe gölge katmanı</string>
+	<string name="layer_hillshade">Tepe gölgesi katmanı</string>
+    <string name="map_widget_fps_info">FPS hata ayıklama bilgisi</string>
+	<string name="driving_region_descr">Sürüş Bölgesi Seçimi : Amerika, Avrupa, Birleşik Krallık, Asya ve Diğerleri</string>
+	<string name="driving_region">Sürüş Bölgesi</string>
+	<string name="driving_region_japan">Japonya</string>
+	<string name="driving_region_us">Amerika</string>
+	<string name="driving_region_canada">Kanada</string>
+	<string name="driving_region_europe_asia">Avrupa ve Asya</string>
+	<string name="driving_region_uk">Birleşik Krallık, Hindistan, Avustralya ve Diğerleri</string>
+	<string name="osmodroid_mode_on">OsMoDroid'i Durdur</string>    
+    <string name="osmodroid_mode_off">OsMoDroid'i Başlat</string>
+    <string name="speak_title">Duyuru…</string>
+	<string name="speak_descr">Sokak isimleri, trafik uyarıları (mecburi duruşlar, tümsekler), hız kamerası uyarıları, hız sınırları bildirimlerini ayarla</string>
+	<string name="speak_street_names">Sokak isimlerini bildir</string>
+    <string name="speak_speed_limit">Hız sınırlarını bildir</string>
+    <string name="speak_cameras">Hız kameralarını bildir</string>
+	<string name="speak_traffic_warnings">Trafik uyarılarını bildir</string>
+    <string name="osb_author_or_password_not_specified">Lütfen OSM kullanıcı adı ve şifrenizi Ayarlar bölümünde belirtin</string>
+    <string name="context_menu_item_directions_to">Varış yeri</string>
+    <string name="context_menu_item_directions_from">Hareket yeri</string>
+    <string name="route_descr_map_location">Harita: </string>
+    <string name="route_to">Buraya:</string>
+    <string name="route_via">Üzerinden:</string>
+    <string name="route_from">Buradan:</string>
+	<string name="local_index_gpx_timespan">Zaman aralığı:</string>
+	<string name="local_index_gpx_timemoving">Seyahat süresi:</string>
+	<string name="destination_point">Hedef</string>
+    <string name="context_menu_item_destination_point">Hedef olarak belirle</string>
+    <string name="please_select_address">Önce şehir ya da sokak seç</string>
+    <string name="search_street_in_neighborhood_cities">Yakın şehirlerde sokak ara</string>
+    <string name="intermediate_items_sort_by_distance">Sırala (kapıdan kapıya)</string>
+    <string name="local_osm_changes_backup_successful">OSM değişiklik dosyası başarıyla oluşturuldu</string>
+    <string name="local_osm_changes_backup_failed">OSM değişikliklerinin yedeklemesi başarısız</string>
+    <string name="delete_point">Mevkiyi sil</string>
+    <string name="plugin_distance_point_time">süre</string>
+    <string name="plugin_distance_point_hdop">hassaslık</string>
+    <string name="plugin_distance_point_speed">hız</string>
+    <string name="plugin_distance_point_ele">rakım</string>
+    <string name="plugin_distance_point">Mevki</string>
+    <string name="gpx_file_name">GPX dosya adı</string>
+    <string name="osmand_distance_planning_plugin_name">Mesafe hesaplayıcı ve Planlama aracı</string>
+    <string name="default_buttons_do_not_show_again">Tekrar gösterme</string>
+    <string name="distance_measurement_start_editing">Düzenlemeye başla</string>
+    <string name="distance_measurement_finish_editing">Düzenlemeyi bitir</string>
+    <string name="distance_measurement_finish_subtrack">Yeni bir alt yola başla</string>
+    <string name="distance_measurement_clear_route">Tüm mevkileri temizle</string>
+    <string name="distance_measurement_save_gpx">GPX olarak kaydet</string>
+    <string name="distance_measurement_load_gpx">Varolan GPX'i aç</string>
+    <string name="wait_current_task_finished">Mevcut görev bitene kadar bekleyin lütfen</string>
+    <string name="use_kalman_filter_compass_descr">Pusula sapmalarından korunmak için Kalman filtresi kullan</string>
+    <string name="use_kalman_filter_compass">Kalman filtresi kullan</string>
+    <string name="access_mark_final_location_first">Erişilebilirlik modu : lütfen önce varış noktası seçin</string> 
+    <string name="use_magnetic_sensor_descr">pusula değerini belirlemek için yönlendirme sensörü yerine manyetik sensörü kullan</string>
+    <string name="use_magnetic_sensor">Manyetik sensörü kullan</string>
+    <string name="other_location">Diğer</string>
+    <string name="install_paid">Tam sürüm</string>
+    <string name="cancel_route">Rotayı bırak</string>
+    <string name="cancel_navigation">Navigasyonu durdur</string>
+    <string name="clear_destination">Varış noktasını temizle</string>
+    <string name="download_using_mobile_internet">Şuanda Wifi ağına bağlı değil. Mevcut internet bağlantısı ile indirilsin mi?</string>
+    <string name="street_name">Sokak</string>
+	<string name="hno">Bina numarası</string>
+    <string name="website">İnternet sitesi</string>
+	<string name="monitoring_settings">Kayıt servisleri ve Uyku modu</string>
+    <string name="monitoring_settings_descr">Seyahatlerin nasıl kaydedileceğini ve uyku modunu yapılandırın</string>
+    <string name="osmand_monitoring_plugin_name">Kayıt servisleri ve Uyku modu</string>
+    <string name="contribution_activity">Yükleme versiyonu</string>
+    <string name="choose_osmand_theme_descr">Uygulama teması seç</string>
+    <string name="choose_osmand_theme">Uygulama teması</string>
+    <string name="accessibility_options">Erişilebilirlik ayarları</string>
+    <string name="select_address_activity">Adres seç</string>
+    <string name="favourites_list_activity">Favoriyi seç</string>
+    <string name="local_openstreetmap_act_title">OSM değişiklikleri</string>
+    <string name="default_buttons_other_actions">Diğer komutlar</string>
+    <string name="local_indexes_cat_srtm">Çevreleme çizgileri verisi</string>
+    <string name="announce_gpx_waypoints">GPX yol işaretlerini söyle</string>
     </resources>

OsmAnd/res/values-uk/strings.xml

@@ -234,7 +234,7 @@
   <string name="download_files_not_enough_space">Не вистачає місця на диску для завантаження %1$s MB (вільно: %2$s).</string>
   <string name="download_files_question_space">Вільне місце {2} MB! Завантажити {0} файл(ів) ({1} MB)?</string>
   <string name="tip_select_destination_point">Вибір точки прибуття</string>
-  <string name="tip_select_destination_point_t">\tВи можете обрати пункт призначення на мапі, в результатах пошуку або точку із закладок через пункт \"Йти до\" в контекстному меню.
+  <string name="tip_select_destination_point_t">\tВи можете обрати пункт призначення на мапі, в результатах пошуку або точку із закладок через пункт \"Маршрути\" в контекстному меню.
 		\n\tТочка призначення показується на мапі, як помаранчеве коло, напрямок до неї — помаранчевою стрілкою. Також, в правому верхньому куті показується відстань по прямій лінії до неї.
 	</string>
   <string name="tip_recent_changes_0_6_9_t">Зміни в 0.6.9:
@@ -267,10 +267,18 @@
   <string name="layer_poi_label">POI мітки</string>
   <string name="animate_route_off">Закінчити моделювання</string>
   <string name="animate_route">Почати моделювання</string>
-  <string name="tip_recent_changes_0_6_8_t">"Changes in 0.6.8 : \n\t- Completely redesigned search (POI, Address)! Make address search much faster and more responsive. Create one Search interface with many different options. \n\t- Implement POI search by name in big areas (countries) \n\t- Fix flickering map screen for tablets (Issue 641) \n\t- Auto-center map view option (Issue 356) \n\t- GPX navigation moved to \'Directions\' and \'Save Directions\' moved to \'About route\' \n\t- POI data included in .obf file (all download indexes after 01/10/11) \n\t- Voice prompt fixes (GPS position fix, omitting first command) \n\t- Small improvements "
+  <string name="tip_recent_changes_0_6_8_t">Зміни в 0.6.8:
+		\n\t- Повністю перероблений пошук (POI, Адреси)! Адресний пошук тепер значно швидшій та точний. Створено один загальний інтерфейс Пошуку з різними параметрами.
+		\n\t- Реалізовано пошук POI за назвою для великих ділянок (країн)  
+		\n\t- Виправлено мерехтіння екрану на планшетах (Issue 641)
+		\n\t- Параметр авто-центрування мапи (Issue 356)
+		\n\t- GPX навігацію переміщено в \'Маршрут\', та \'Зберегти маршрут\' до \'Про маршрут\'
+		\n\t- Дані про POI включено до файлу .obf (для всіх мап після 01/10/11) 
+		\n\t- Виправлення помилок в Голосових підказках (GPS-координати, пропуск першої підказки) 
+		\n\t- Деякі покращення
 	</string>
   <string name="file_can_not_be_renamed">Файл не можна перейменувати.</string>
-  <string name="file_with_name_already_exists">Файл з таким ім\'ям вже існує.</string>
+  <string name="file_with_name_already_exists">Файл з таким ім’ям вже існує.</string>
   <string name="gpx_navigation">GPX маршрут</string>
   <string name="poi_query_by_name_matches_categories">Деякі категорії POI відповідають запиту, можете використовувати їх для створення фільтра:</string>
   <string name="data_to_search_poi_not_available">Локальні дані для пошука POI за іменем не знайдено.</string>
@@ -359,7 +367,7 @@
   <string name="gpx_option_reverse_route">Виберіть зворотній напрямок</string>
   <string name="gpx_option_destination_point">Використовувати поточний пункт призначення</string>
   <string name="gpx_option_from_start_point">Пройти увесь шлях спочатку</string>
-  <string name="switch_to_vector_map_to_see">Для цього регіону доступні оффлайн векторні мапи\n\t\n\tДля їх використання виберіть пункт меню \"Мапа\" → \"Джерело мапи\" → \"Оффлайн векторні мапи\".</string>
+  <string name="switch_to_vector_map_to_see">Для цього регіону доступні оффлайн векторні мапи\n\t\n\tДля їх використання виберіть пункт меню \"Шари мапи\" → \"Джерело мапи\" → \"Оффлайн векторні мапи\".</string>
   <string name="choose_audio_stream">Голосові інструкції</string>
   <string name="choose_audio_stream_descr">Виберіть канал для голосових інструкцій (залежить від системи)</string>
   <string name="voice_stream_voice_call">Потік голосових дзвінків</string>
@@ -399,7 +407,7 @@
   <string name="tip_favorites_t">\tТочки, що часто використовуються можуть бути додані в Закладки.
 		\n\tДля додавання точки до Закладок, відкрийте контекстне меню мапи, виберіть пункт \'Додати в Закладки\' та додайте назву закладки. Після додання до Закладок, вона буде доступна в меню \'Мапа\' -&gt; \'Закладки\'.
 		\n\tДовге натискання на закладку в меню \'Закладки\' надасть можливість встановити її в якості місця призначення. редагувати її чи вилучити.
-		\n\tДля показу всіх збережених точок на мапі, активуйте шар \'Закладки\' в \'Мапа\' -&gt; \'Джерело мапи…\'.
+		\n\tДля показу всіх збережених точок на мапі, активуйте шар \'Закладки\' в \'Шари мапи\' -&gt; \'Джерело мапи…\'.
 	</string>
   <string name="error_doing_search">Помилка автономного пошуку</string>
   <string name="search_offline_geo_error">Неможливо обробити запит \'%s\'</string>
@@ -412,7 +420,7 @@
   <string name="tip_app_mode">Профіль</string>
   
   <string name="tip_navigation">Навігація</string>
-  <string name="tip_navigation_t">\tЩоб розпочати навігацію виберіть пункт призначення. Після цього натисніть \"Меню\" → \"Навігація\" на мапі і виберіть тип навігації.</string>
+  <string name="tip_navigation_t">\tЩоб розпочати навігацію виберіть пункт призначення. Після цього натисніть \"Меню\" → \"Маршрут\" на мапі і виберіть тип навігації.</string>
   <string name="tip_search">Пошук</string>
   <string name="tip_map_context_menu">Контекстне меню мапи</string>
   <string name="tip_map_context_menu_t">\tКонтекстне меню мапи доступне, якщо натиснути та утримувати мапу чи натиснути джойстик.
@@ -576,7 +584,7 @@
   <string name="layer_transport">Зупинки транспорту</string>
   <string name="layer_poi">POI…</string>
   <string name="layer_map">Джерело мапи…</string>
-  <string name="menu_layers">Мапа</string>
+  <string name="menu_layers">Шари мапи</string>
   <string name="context_menu_item_search_poi">Шукати POI</string>
   
   <string name="use_trackball_descr">Використовувати трекбол для руху мапи</string>
@@ -602,7 +610,7 @@
   <string name="search_poi_filter">Фільтр</string>
   <string name="menu_mute_off">Звук увімкнено</string>
   <string name="menu_mute_on">Звук вимкнено</string>
-  <string name="voice_provider_descr">Виберіть голос для навігації</string>
+  <string name="voice_provider_descr">Виберіть голос для навігації (коди мов за ISO 639-1)</string>
   <string name="voice_provider">Голосові дані</string>
   <string name="voice_data_initializing">Ініціалізуються голосові дані…</string>
   <string name="voice_data_not_supported">Голосові дані не підтримуються поточною версією програми</string>
@@ -691,10 +699,10 @@
   <string name="fav_points_not_exist">Не існує збережених точок</string>
   <string name="update_existing">Замінити</string>
   <string name="only_show">Тільки показати</string>
-  <string name="follow">Йти до</string>
+  <string name="follow">Маршрут</string>
   <string name="recalculate_route_to_your_location">Режим пересування:</string>
   <string name="mark_final_location_first">Вкажіть пункт призначення</string>
-  <string name="get_directions">Напрямки</string>
+  <string name="get_directions">Маршрут</string>
   <string name="show_gps_status">Показати GPS статус</string>
   <string name="opening_hours">Робочі години</string>
   <string name="opening_changeset">Відкриття пакету правок…</string>
@@ -1315,7 +1323,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 		\n\t\"Нічний\" - завжди використовується нічний режим
 		\n\t\"Датчик освітленості\" - вигляд мапи змінюється автоматично в залежності від датчика освітленості (при його наявності) у вашому пристрої
 	</string>	
-	<string name="tip_map_switch_t_v2">\tМапи і шари можна змінювати вибравши \"Мапа\" (іконка глобуса) на екрані мапи
+	<string name="tip_map_switch_t_v2">\tМапи і шари можна змінювати вибравши \"Шари мапи\" (іконка глобуса) на екрані мапи
 		\n\tВ \"Джерела мап…\" можна вибрати попередньо завантажені векторі мапи, онлайн мапи з різних джерел (для використання потрібно увімкнути втулок \"Онлайн мапи\") або самостійно створені мапи (наприклад, за допомогою OsmAndMapCreator для ПК).
 		\n\tOsmAnd також підтримує джерела користувача.
 	</string>
@@ -1464,7 +1472,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="access_mark_final_location_first">Допоміжні можливості: будь ласка, спочатку оберіть пункт призначення</string> 
     <string name="use_magnetic_sensor_descr">Використовувати магнітометр для визначення сторін світу замість, датчику орієнтації</string>
     <string name="tip_search_t">\tВи можете шукати об’єкти роздивляючись мапу, використовуючи пошук за адресою, координатами, чи пошук POI, або обираючи із збережених точок.
-		\n\tВибір пункту «Пошук» в меню, дозволить перейти до завдання того, що ви бажаєте відшукати. У допомогу до всіх підказок, контекстне меню пропонує два варіанти: \'Встановити як пункт призначення\' чи \'Показати на мапі\'
+		\n\tВибір пункту «Пошук» в меню, дозволить перейти до завдання того, що ви бажаєте відшукати. У допомогу до всіх підказок, контекстне меню пропонує два варіанти: \'Маршрут\' чи \'Показати на мапі\'
 	</string>
 	<string name="destination_point">Пункт призначення %1$s</string>
     <string name="local_index_gpx_timespan">\nПроміжок часу: %1$d:%2$02d:%3$02d</string>
@@ -1491,7 +1499,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="clear_intermediate_points">Очистити проміжні точки</string>
     <string name="new_directions_point_dialog">Ви вже задали проміжні точки.</string>
     <string name="context_menu_item_directions_to">Напрямки до</string>
-    <string name="context_menu_item_directions_from">Напрямки від</string>
+    <string name="context_menu_item_directions_from">Маршрут від</string>
     <string name="route_to">До:</string>
     <string name="announce_gpx_waypoints">Попереджати про маршрутні точки GPX</string>
     <string name="speak_title">Попереджати…</string>
@@ -1525,4 +1533,31 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="osb_author_dialog_password">Пароль OSM (необов’язково)</string>
 	<string name="osmodroid_mode_on">Зупинити OsMoDroid</string>    
     <string name="osmodroid_mode_off">Запустити OsMoDroid</string>
+    <string name="driving_region_descr">Виберіть регіон: США, Європа, Англія, Азія та інші</string>
+	<string name="driving_region">Регіон</string>
+	<string name="driving_region_japan">Японія</string>
+	<string name="driving_region_us">США</string>
+	<string name="driving_region_canada">Канада</string>
+	<string name="driving_region_europe_asia">Європа та Азія</string>
+	<string name="driving_region_uk">Англія, Індія, Австралія та інші</string>
+	<string name="tip_recent_changes_0_6_7_t">Зміни в for 0.6.7:
+		\n\t- Менеджер локальних даних (завантаження. вилучення, активація/деактивація даних безпосередньо в OsmAnd)
+		\n\t- Закладки та групи (категоризація, вилучення, керування закладками)
+		\n\t- Огляд GPX в застосунку (перегляд інформації з треку, відстань, середня швидкість, висота, т.д.)
+		\n\t- Навігація GPX (більше параметрів, продовження навгації після збою, підкримка руху по колу)
+		\n\t- Можливість збереження маршруту як треку GPX для локального використання
+		\n\t- Покращено GPX-моніторинг  (відкидання неточного положення та збереження точності/висоти/швидкості)
+		\n\t- Завантаження GPX для використання спільнотою OSM (http://download.osmand.net/gpx/)
+		\n\t- Покращення векторного рендерингу
+		\n\t- Покращення рушія TTS (повідомлення точної відстані, також можна і в милях)
+		\n\t- Виправлення помилок
+	</string>
+	<string name="tip_recent_changes_0_6_6_t">Зміни в версії 0.6.6: 
+		\n\t- Рушій Text To Speech для голосової навігації
+		\n\t- Рендер створює більш детальну мапу
+		\n\t- Базова мапа всього світу постачається разом із застосунком
+		\n\t- Підлаштування оффлайнової навігації (ще експериментально)
+		\n\t- Параметри для GPX навігації
+		\n\t- Оновлення інтерфейсу та велика кількість виправлених помилок
+	</string>
 	</resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -389,7 +389,7 @@
 		\n\t\'行進方向\' - 地圖會不斷對準您的車頭方向
 		\n\t\'依羅盤\' - 地圖會不斷對準裝置的羅盤指示
 	</string>
-	<string name="binary_map_download_success">下載完成。\n\t\n\t透過 \'選單\' -&gt; \'定義檢視\' -&gt; \'地圖來源…\' -&gt; \'離線向量地圖\'啟動使用。</string>
+	<string name="binary_map_download_success">下載完成。\n\t\n\t透過 \'選單\' -&gt; \'地圖圖層\' -&gt; \'地圖來源…\' -&gt; \'離線向量地圖\'啟動使用。</string>
 	<string name="tip_day_night_mode">日/夜模式</string>
 	<string name="tip_day_night_mode_t_v2">\t部份的向量地圖的地圖顯示可在日間(較亮)與夜間(較暗)之間切換.
 		\n\t夜間顏色是在夜間行駛比較安全。
@@ -523,7 +523,7 @@
 	<string name="gpx_option_reverse_route">反轉 GPX 方向</string>
 	<string name="gpx_option_destination_point">使用目前的目的地</string>
 	<string name="gpx_option_from_start_point">沿著整條行跡往前</string>
-	<string name="switch_to_vector_map_to_see">指定以離線向量地圖顯示\n\t\n\t啟用方式\'選單\' -&gt; \'定義檢視\' -&gt; \'地圖來源…\' -&gt; \'離線向量圖\'。</string>
+	<string name="switch_to_vector_map_to_see">指定以離線向量地圖顯示\n\t\n\t啟用方式\'選單\' -&gt; \'地圖圖層\' -&gt; \'地圖來源…\' -&gt; \'離線向量圖\'。</string>
 	<string name="choose_audio_stream">語音導航輸出</string>
 	<string name="choose_audio_stream_descr">選擇播放語音導航輸出(依靠系統)</string>
 	<string name="voice_stream_voice_call">通話音訊</string>
@@ -557,7 +557,7 @@
 	<string name="tip_favorites_t">\t常用地點可記錄成我的最愛。
 		\n\叫出地圖的快顯功能表，選\'加到我的最愛\'，然後輸入名字即可將某一點位置設為我的最愛。事後可透由\'主畫面\' -&gt;\'我的最愛\'找到它。
 		\n\t選按一個我的最愛會跳出一些選項，可設為目的地、編輯或刪除它。
-		\n\t欲將我的最愛顯示在地圖上，只要在地圖畫面模式下由\'選單\' -&gt;\'定義檢視\'開啟\'我的最愛\'即可。
+		\n\t欲將我的最愛顯示在地圖上，只要在地圖畫面模式下由\'選單\' -&gt;\'地圖圖層\'開啟\'我的最愛\'即可。
 	</string>
 	<string name="error_doing_search">離線查尋發生錯誤</string>
 	<string name="search_offline_geo_error">無法解析地理原意 \'%s\'</string>
@@ -566,7 +566,7 @@
 	<string name="preferred_locale_descr">選擇顯示語言</string>
 	<string name="preferred_locale">顯示語言</string>
 	<string name="tip_map_switch">地圖來源</string>
-	<string name="tip_map_switch_t_v2">\t地圖來源與顯示圖層可透過在地圖畫面下的\'選單\'-&gt;\'定義檢視\'來改變。
+	<string name="tip_map_switch_t_v2">\t地圖來源與顯示圖層可透過在地圖畫面下的\'選單\'-&gt;\'地圖圖層\'來改變。
 		\n\t在\'地圖來源…\'您可以選擇使用預先載入的離線向量圖，預先定義的（線上）圖磚來源(在此啟動\'線上和地圖圖磚\'外掛元件)，或手動建立地圖，例如使用 PC 上的 OsmAndMapCreator。
 		\n\tOsmAnd 也支援自訂來源。
 	</string>
@@ -739,7 +739,7 @@
 	<string name="layer_transport">車站、站牌</string>
 	<string name="layer_poi">興趣點…</string>
 	<string name="layer_map">地圖來源…</string>
-	<string name="menu_layers">定義檢視</string>
+	<string name="menu_layers">地圖圖層</string>
 	<string name="context_menu_item_search_poi">查尋興趣點</string>
 	
 	<string name="use_trackball_descr">使用軌跡球移動地圖</string>
@@ -1530,4 +1530,12 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
 	<string name="speak_street_names">通報街道名稱 (TTS)</string>
     <string name="osmodroid_mode_on">停止 OsMoDroid</string>    
     <string name="osmodroid_mode_off">啟動 OsMoDroid</string>
+    <string name="driving_region_descr">選擇駕駛區域：美國、歐洲、英國、亞洲和其他</string>
+	<string name="driving_region_japan">日本</string>
+	<string name="driving_region_us">美國</string>
+	<string name="driving_region_canada">加拿大</string>
+	<string name="driving_region_europe_asia">歐洲和亞洲</string>
+	<string name="driving_region_uk">英國、印度、澳洲和其他</string>
+	<string name="driving_region">駕駛區域</string>
+	<string name="map_widget_fps_info">FPS 除錯資訊</string>
 	</resources>

OsmAnd/res/values/colors.xml

@@ -55,5 +55,6 @@
 
 	<color name="osmbug_opened">#C8FF0000</color> <!-- standard RED -->
 	<color name="osmbug_closed">#C800FF00</color> <!-- standard GREEN -->
+	<color name="osmbug_not_submitted">#C8FFFF00</color> <!-- standard YELLOW -->
 	
 </resources>

OsmAnd/res/values/strings.xml

@@ -9,7 +9,14 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
-
+	<string name="map_widget_fps_info">FPS debug info</string>
+	<string name="driving_region_descr">Select Driving Region : US, Europe, UK, Asia and Others</string>
+	<string name="driving_region">Driving Region</string>
+	<string name="driving_region_japan">Japan</string>
+	<string name="driving_region_us">United States</string>
+	<string name="driving_region_canada">Canada</string>
+	<string name="driving_region_europe_asia">Europe &amp; Asia</string>
+	<string name="driving_region_uk">UK, India, Australia &amp; Others</string>
 	<string name="osmodroid_mode_on">Stop OsMoDroid</string>    
     <string name="osmodroid_mode_off">Start OsMoDroid</string>
     <string name="announce_gpx_waypoints">Announce GPX waypoints</string>
@@ -59,7 +66,7 @@
     <string name="search_street_in_neighborhood_cities">Search street in neighborhood cities</string>
     <string name="intermediate_items_sort_return">Intermediate waypoints resorted to optimize their order on the way to the destination.</string>
     <string name="intermediate_items_sort_by_distance">Sort (door-to-door)</string>
-    <string name="local_osm_changes_backup_successful">OSM change file succesfully generated %1$s</string>
+    <string name="local_osm_changes_backup_successful">OSM change file successfully generated %1$s</string>
     <string name="local_osm_changes_backup_failed">Backup OSM changes failed</string>
     <string name="local_osm_changes_backup">Backup as OSM change</string>
     <string name="delete_point">Delete Point</string>
@@ -69,7 +76,7 @@
     <string name="plugin_distance_point_ele">elevation</string>
     <string name="plugin_distance_point">Point</string>
     <string name="gpx_file_name">GPX file name</string>
-    <string name="gpx_saved_sucessfully">GPX file succesfully saved to {0}</string>
+    <string name="gpx_saved_sucessfully">GPX file successfully saved to {0}</string>
     <string name="osmand_distance_planning_plugin_description">Create paths (or use / modify existing GPX files) to measure the distance between points. Save as GPX, can be used to plan GPX routes.</string>
     <string name="osmand_distance_planning_plugin_name">Distance calculator &amp; Planning Tool</string>
     <string name="use_distance_measurement_help">* Tap to mark a point.\n 
@@ -190,7 +197,7 @@
     <string name="av_use_external_camera">Use camera app</string>
     <string name="av_settings_descr">Configure audio and video settings</string>
     <string name="av_settings">Audio/video settings </string>
-    <string name="recording_error">Error ocurred while recording </string>
+    <string name="recording_error">Error occurred while recording </string>
     <string name="recording_camera_not_available">Camera is not available</string>
     <string name="recording_is_recorded">Audio/video is being recorded. To stop it press the AV widget.</string>
     <string name="recording_playing">An audio from the specified recording is being played.\n%1$s</string>
@@ -857,7 +864,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 		\n\t\'To direction of movement\' - Map will continuously be aligned with your heading
 		\n\t\'To compass\' - Map will continuously be aligned with device compass reading
 	</string>
-	<string name="binary_map_download_success">Download successful.\n\t\n\tTo use activate \'Menu\' -> \'Define View\' -> \'Map source&#8230;\' -> \'Offline vector maps\'.</string>
+	<string name="binary_map_download_success">Download successful.\n\t\n\tTo use activate \'Menu\' -> \'Map layers\' -> \'Map source&#8230;\' -> \'Offline vector maps\'.</string>
 	<string name="tip_day_night_mode">Day/Night Mode</string>
 	<string name="tip_day_night_mode_t_v2">\tThe map appearance can for some vector maps be changed between day (brighter) and night (darker).
 		\n\tNight colors are safer for night driving.
@@ -1030,7 +1037,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="gpx_option_reverse_route">Reverse GPX direction</string>
 	<string name="gpx_option_destination_point">Use current destination</string>
 	<string name="gpx_option_from_start_point">Pass along entire track</string>
-	<string name="switch_to_vector_map_to_see">Offline vector map present for this location. \n\t\n\tTo use activate \'Menu\' -> \'Define view\' -> \'Map Source&#8230;\' -> \'Offline vector maps\'.</string>
+	<string name="switch_to_vector_map_to_see">Offline vector map present for this location. \n\t\n\tTo use activate \'Menu\' -> \'Map layers\' -> \'Map Source&#8230;\' -> \'Offline vector maps\'.</string>
 	<string name="choose_audio_stream">Voice guidance output</string>
 	<string name="choose_audio_stream_descr">Choose channel to play voice guidance (system-dependent)</string>
 	<string name="voice_stream_voice_call">Voice call audio</string>
@@ -1064,7 +1071,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="tip_favorites_t">\tFrequently used points can be saved as Favorites.
 		\n\tTo save a point as Favorite go to the map context menu, select option \'Add to favorites\' and then enter a name for it. After saving a Favorite, it is accessible via \'Main Screen\' -> \'Favorites\'.
 		\n\tLong pressing on a Favorite in the \'Favorites\' menu provides options to set it as desination, Edit or Delete it.
-		\n\tTo display all Favorite points directly on the map, on the map screen enable layer \'Favorites\' under \'Menu\' -> \'Define view\'.
+		\n\tTo display all Favorite points directly on the map, on the map screen enable layer \'Favorites\' under \'Menu\' -> \'Map layers\'.
 	</string>
 	<string name="create_poi_link_to_osm_doc"><u>Online OSM</u> map classification with images</string>
 	<string name="error_doing_search">Error occurred in offline search</string>
@@ -1075,7 +1082,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="preferred_locale">Display language</string>
 	<string name="incomplete_locale">incomplete</string>
 	<string name="tip_map_switch">Map Source</string>
-	<string name="tip_map_switch_t_v2">\tThe map source and layers displayed are changed via \'Menu\' -> \'Define view\' in map view.
+	<string name="tip_map_switch_t_v2">\tThe map source and layers displayed are changed via \'Menu\' -> \'Map layers\' in map view.
 		\n\tUnder \'Map source&#8230;\' you can choose using the pre-loaded offline vector maps, predefined (online) tile sources (activate the \'Online and tile maps\' plugin for this), or maps manually created using e.g. OsmAndMapCreator on a PC.
 		\n\tOsmAnd also supports custom sources.
 	</string>
@@ -1191,8 +1198,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="continuous_rendering_descr">Display continuous rendering instead of image-at-once</string>
 	<string name="rendering_exception">Error occurred while rendering selected area</string>
 	<string name="show_point_options">Use location …</string>
-	<string name="renderer_load_sucess">Renderer sucessfully loaded</string>
+	<string name="renderer_load_sucess">Renderer successfully loaded</string>
-	<string name="renderer_load_exception">Exception occured: renderer was not loaded</string>
+	<string name="renderer_load_exception">Exception occurred: renderer was not loaded</string>
 	<string name="renderers">Vector renderer</string>
 	<string name="renderers_descr">Choose rendering appearance</string>
 	<string name="poi_context_menu_website">Show POI website</string>
@@ -1225,9 +1232,9 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="rotate_map_to_bearing_descr">Select map screen alignment</string>
 	<string name="rotate_map_to_bearing">Map orientation</string>
 	<string name="show_route">Route details</string>
-	<string name="fav_imported_sucessfully">Favorites succesfully imported</string>
+	<string name="fav_imported_sucessfully">Favorites successfully imported</string>
 	<string name="fav_file_to_load_not_found">GPX file containing favorites is not found at {0}</string>
-	<string name="fav_saved_sucessfully">Favorites succesfully saved to {0}</string>
+	<string name="fav_saved_sucessfully">Favorites successfully saved to {0}</string>
 	<string name="no_fav_to_save">No favorite points to save</string>
 	<string name="import_fav">Import</string>
 	<string name="export_fav">Export</string>
@@ -1245,7 +1252,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="layer_transport">Transportation stops</string>
 	<string name="layer_poi">POI&#8230;</string>
 	<string name="layer_map">Map source&#8230;</string>
-	<string name="menu_layers">Define view</string>
+	<string name="menu_layers">Map layers</string>
 	<string name="context_menu_item_search_poi">Search POI</string>
 	<string name="use_trackball_descr">Use trackball to move map</string>
 	<string name="use_trackball">Use trackball</string>
@@ -1348,7 +1355,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="download_question_exist">Offline data for {0} already exists ({1}). Do you want to update it ({2}) ?</string>
 	<string name="address">Address</string>
 	<string name="download_index_success">Download successful</string>
-	<string name="error_io_error">I/O error occured</string>
+	<string name="error_io_error">I/O error occurred</string>
 	<string name="downloading_file_new">Downloading …</string>
 	<string name="downloading">Downloading&#8230;</string>
 	<string name="downloading_list_indexes">Downloading list of available regions&#8230;</string>
@@ -1488,10 +1495,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="favourites_context_menu_edit">Edit favorite</string>
 	<string name="favourites_context_menu_delete">Delete favorite</string>
 	<string name="favourites_remove_dialog_msg">Remove favorite point \'%s\'?</string>
-	<string name="favourites_remove_dialog_success">Favorite point {0} was succesfully deleted.</string>
+	<string name="favourites_remove_dialog_success">Favorite point {0} was successfully deleted.</string>
 	<string name="osb_add_dialog_title">Enter bug text</string>
 	<string name="osb_add_dialog_success">Bug successfully created</string>
-	<string name="osb_add_dialog_error">Exception occured: bug was not created</string>
+	<string name="osb_add_dialog_error">Exception occurred: bug was not created</string>
 	<string name="osb_author_dialog_password">OSM password (optional)</string>
 	<string name="osb_comment_menu_item">Add comment</string>
 	<string name="osb_comment_dialog_message">Message</string>
@@ -1499,12 +1506,12 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="osb_comment_dialog_title">Adding comment to bug</string>
 	<string name="osb_comment_dialog_add_button">Add comment</string>
 	<string name="osb_comment_dialog_success">Comment was successfully added</string>
-	<string name="osb_comment_dialog_error">Exception occured: comment was not added</string>
+	<string name="osb_comment_dialog_error">Exception occurred: comment was not added</string>
 	<string name="osb_close_menu_item">Close bug</string>
 	<string name="osb_close_dialog_title">Closing bug</string>
 	<string name="osb_close_dialog_close_button">Close bug</string>
 	<string name="osb_close_dialog_success">Bug was successfully closed</string>
-	<string name="osb_close_dialog_error">Exception occured: bug was not closed</string>
+	<string name="osb_close_dialog_error">Exception occurred: bug was not closed</string>
 	<string name="poi_edit_title">Edit POI</string>
 	<string name="poi_create_title">Create POI</string>
 	<string name="poi_error_poi_not_found">Node cannot be found or amenity is not a single node</string>
@@ -1515,8 +1522,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="poi_action_add">add</string>
 	<string name="poi_action_change">change</string>
 	<string name="poi_action_succeded_template">Action {0} completed successfully.</string>
-	<string name="poi_error_unexpected_template">Unexpected error occured while performing action {0}.</string>
+	<string name="poi_error_unexpected_template">Unexpected error occurred while performing action {0}.</string>
-	<string name="poi_error_io_error_template">I/O error occured while performing action {0}.</string>
+	<string name="poi_error_io_error_template">I/O error occurred while performing action {0}.</string>
 	<string name="poi_error_info_not_loaded">Info about node was not loaded</string>
 	<string name="poi_dialog_name">Name</string>
 	<string name="poi_dialog_opening_hours">Open</string>

OsmAnd/res/xml/general_settings.xml

@@ -6,8 +6,7 @@
 			<ListPreference android:key="preferred_locale" android:title="@string/preferred_locale" android:summary="@string/preferred_locale_descr"></ListPreference>
 			<CheckBoxPreference android:summary="@string/use_english_names_descr" android:title="@string/use_english_names"
 				android:key="use_english_names"></CheckBoxPreference>
+			<ListPreference android:key="default_driving_region" android:title="@string/driving_region" android:summary="@string/driving_region_descr"></ListPreference>
 			<ListPreference android:key="default_metric_system" android:title="@string/unit_of_length" android:summary="@string/unit_of_length_descr"></ListPreference>
-			<CheckBoxPreference android:summary="@string/left_side_navigation_descr" android:title="@string/left_side_navigation"
-				android:key="left_side_navigation"></CheckBoxPreference>
 			<ListPreference android:key="osmand_theme" android:title="@string/choose_osmand_theme" android:summary="@string/choose_osmand_theme_descr"></ListPreference>
 </PreferenceScreen>

OsmAnd/src/net/londatiga/android/QuickAction.java

@@ -195,7 +195,7 @@ public class QuickAction extends CustomPopupWindow {
 			} else if (arrowPos > screenWidth/4 && arrowPos < 3 * (screenWidth/4)) {
 				window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Center : R.style.Animations_PopDownMenu_Center);
 			} else {
-				window.setAnimationStyle((onTop) ? R.style.Animations_PopDownMenu_Right : R.style.Animations_PopDownMenu_Right);
+				window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Right : R.style.Animations_PopDownMenu_Right);
 			}
 					
 			break;

OsmAnd/src/net/osmand/access/NavigationInfo.java

@@ -87,7 +87,7 @@ public class NavigationInfo {
 				return null;
 			if (style == RelativeDirectionStyle.CLOCKWISE) {
 				String result = NavigationInfo.this.getString(R.string.towards);
-				result += " " + String.valueOf((value != 0) ? value : 12); //$NON-NLS-1$
+				result += " " + ((value != 0) ? value : 12); //$NON-NLS-1$
 				result += " " + NavigationInfo.this.getString(R.string.oclock); //$NON-NLS-1$
 				return result;
 			} else {

OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java

@@ -58,8 +58,8 @@ public class OsmAndLocationProvider implements SensorEventListener {
 	
 	
 	
-	private final boolean USE_KALMAN_FILTER = true;
+	private static final boolean USE_KALMAN_FILTER = true;
-	private final float KALMAN_COEFFICIENT = 0.04f;
+	private static final float KALMAN_COEFFICIENT = 0.04f;
 	
 	float avgValSin = 0;
 	float avgValCos = 0;
@@ -374,7 +374,7 @@ public class OsmAndLocationProvider implements SensorEventListener {
 	private void updateCompassVal() {
 		heading = (float) getAngle(avgValSin, avgValCos);
 		for(OsmAndCompassListener c : compassListeners){
-			c.updateCompassValue(heading.floatValue());
+			c.updateCompassValue(heading);
 		}
 	}
 	

OsmAnd/src/net/osmand/plus/OsmandApplication.java

@@ -583,7 +583,7 @@ public class OsmandApplication extends Application implements ClientContext {
 		uiHandler.post(new Runnable() {
 			@Override
 			public void run() {
-				AccessibleToast.makeText(uiContext, b.toString(), Toast.LENGTH_LONG).show();
+				AccessibleToast.makeText(uiContext, b, Toast.LENGTH_LONG).show();
 			}
 		});
 	}

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -562,10 +562,24 @@ public class OsmandSettings {
 	public final OsmandPreference<ApplicationMode> DEFAULT_APPLICATION_MODE = new EnumIntPreference<ApplicationMode>(
 			"default_application_mode", ApplicationMode.DEFAULT, ApplicationMode.values()).makeGlobal();
 	
+	public final OsmandPreference<DrivingRegion> DRIVING_REGION = new EnumIntPreference<DrivingRegion>(
+			"default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()) {
+		protected boolean setValue(Object prefs, DrivingRegion val) {
+			((CommonPreference<MetricsConstants>)METRIC_SYSTEM).cachedValue = null;
+			return super.setValue(prefs, val);
+		};
+	}.makeGlobal().cache();
+	
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
 	public final OsmandPreference<MetricsConstants> METRIC_SYSTEM = new EnumIntPreference<MetricsConstants>(
-			"default_metric_system", MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.values()).makeGlobal().cache();
+			"default_metric_system", MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.values()){
+		protected MetricsConstants getDefaultValue() {
+			return DRIVING_REGION.get().defMetrics;
+		};
+	}.makeGlobal().cache();
+	
+	
 	
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
@@ -648,7 +662,7 @@ public class OsmandSettings {
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<RouteService> ROUTER_SERVICE = 
 		new EnumIntPreference<RouteService>("router_service", RouteService.OSMAND, 
-				new RouteService[] {RouteService.OSMAND, RouteService.YOURS, RouteService.ORS}).makeProfile();
+				RouteService.values()).makeProfile();
 	
 	public final CommonPreference<Boolean> SNAP_TO_ROAD = new BooleanPreference("snap_to_road", false).makeProfile().cache();
 	{
@@ -656,8 +670,6 @@ public class OsmandSettings {
 		SNAP_TO_ROAD.setModeDefaultValue(ApplicationMode.BICYCLE, true);
 	}
 	
-	public final CommonPreference<Boolean> LEFT_SIDE_NAVIGATION = new BooleanPreference("left_side_navigation", false).makeGlobal();
-
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SAVE_CURRENT_TRACK = "save_current_track"; //$NON-NLS-1$
@@ -1501,4 +1513,32 @@ public class OsmandSettings {
 		
 	}
 	
+	/**
+	 * Class represents specific for driving region
+	 * Signs, leftHandDriving
+	 */
+	public enum DrivingRegion {
+		
+		EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false, false),
+		US(R.string.driving_region_us, MetricsConstants.MILES_AND_FOOTS, false, true),
+		CANADA(R.string.driving_region_canada, MetricsConstants.KILOMETERS_AND_METERS, false, true),
+		UK_AND_OTHERS(R.string.driving_region_uk, MetricsConstants.MILES_AND_FOOTS, true, false),
+		JAPAN(R.string.driving_region_japan, MetricsConstants.KILOMETERS_AND_METERS, true, false)
+		;
+
+		public final boolean leftHandDriving;
+		public final boolean americanSigns;
+		public final MetricsConstants defMetrics;
+		public final int name;
+
+		DrivingRegion(int name, MetricsConstants def, boolean leftHandDriving, boolean americanSigns) {
+			this.name = name;
+			defMetrics = def;
+			this.leftHandDriving = leftHandDriving;
+			this.americanSigns = americanSigns;
+		}
+
+	}
+
+	
 }

OsmAnd/src/net/osmand/plus/PoiFilter.java

@@ -160,7 +160,7 @@ public class PoiFilter {
 				
 				@Override
 				public boolean isCancelled() {
-					return false || (matcher != null && matcher.isCancelled());
+					return (matcher != null && matcher.isCancelled());
 				}
 			};
 		}

OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java

@@ -78,9 +78,7 @@ public class PoiFiltersHelper {
 	
 	private void putValues(Map<AmenityType, LinkedHashSet<String>> types, AmenityType tp,String... vls){
 		LinkedHashSet<String> list = new LinkedHashSet<String>();
-		for(String v: vls){
+        Collections.addAll(list, vls);
-			list.add(v);
-		}
 		types.put(tp, list);
 	}
 	

OsmAnd/src/net/osmand/plus/SQLiteTileSource.java

@@ -43,9 +43,9 @@ public class SQLiteTileSource implements ITileSource {
 	private int maxZoom = 17; 
 	private int baseZoom = 17; //Default base zoom
 
-	final int margin = 1;
+	static final int margin = 1;
-	final int tileSize = 256;
+	static final int tileSize = 256;
-	final int minScaledSize = 8;
+	static final int minScaledSize = 8;
 	private ClientContext ctx;
 	
 	public SQLiteTileSource(ClientContext ctx, File f, List<TileSourceTemplate> toFindUrl){
@@ -355,7 +355,7 @@ public class SQLiteTileSource implements ITileSource {
 		db.execSQL("DELETE FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {x+"", y+"",(17 - zoom)+""});    //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
 	}
 
-	private final int BUF_SIZE = 1024;
+	private static final int BUF_SIZE = 1024;
 	
 	/**
 	 * Makes method synchronized to give a little more time for get methods and 

OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java

@@ -63,17 +63,21 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 	public void onCreate(final Bundle icicle) {
 		Bundle bundle = this.getIntent().getExtras();
 		String filterId = bundle.getString(AMENITY_FILTER);
-		helper = ((OsmandApplication)getApplication()).getPoiFilters();
+		helper = ((OsmandApplication) getApplication()).getPoiFilters();
 		filter = helper.getFilterById(filterId);
 		super.onCreate(icicle);
 
-		
 		setContentView(R.layout.editing_poi_filter);
 		getSupportActionBar().setTitle(R.string.filterpoi_activity);
 		getSupportActionBar().setIcon(R.drawable.tab_search_poi_icon);
 
+		if (filter != null) {
 			getSupportActionBar().setSubtitle(filter.getName());
 			setListAdapter(new AmenityAdapter(AmenityType.getCategories()));
+		} else {
+			setListAdapter(new AmenityAdapter(new AmenityType[0]));
+		}
+
 	}
 
 
@@ -94,6 +98,9 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 	
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
+		if(filter == null) {
+			return super.onCreateOptionsMenu(menu);
+		}
 		createMenuItem(menu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item, 
 				R.drawable.ic_action_gsave_light, R.drawable.ic_action_gsave_dark ,
 				MenuItem.SHOW_AS_ACTION_IF_ROOM);

OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java

@@ -166,7 +166,7 @@ public class LiveMonitoringHelper  {
 					is.close();
 				}
 				httpclient.getConnectionManager().shutdown();
-				log.info("Montior response : " + responseBody.toString());
+				log.info("Montior response : " + responseBody);
 			}
 
 			

OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java

@@ -741,7 +741,7 @@ public class LocalIndexesActivity extends OsmandExpandableListActivity {
 	public void openSelectionMode(int stringRes, int darkIcon, int lightIcon, DialogInterface.OnClickListener listener, Boolean backup,
 			LocalIndexType filter) {
 		if (backup != null) {
-			listAdapter.filterCategories(backup.booleanValue());
+			listAdapter.filterCategories(backup);
 		}
 		if (filter != null) {
 			listAdapter.filterCategories(filter);

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -365,7 +365,7 @@ public class MapActivity extends AccessibleActivity  {
 		boolean changeLocation = settings.AUTO_ZOOM_MAP.get();
 		mapView.getAnimatedDraggingThread().startZooming(newZoom, changeLocation);
 		if (app.getInternalAPI().accessibilityEnabled())
-			AccessibleToast.makeText(this, getString(R.string.zoomIs) + " " + String.valueOf(newZoom), Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
+			AccessibleToast.makeText(this, getString(R.string.zoomIs) + " " + newZoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$
 		showAndHideMapPosition();
 	}
  

OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java

@@ -9,6 +9,7 @@ import net.osmand.access.AccessibleToast;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ClientContext;
 import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.OsmandSettings.DrivingRegion;
 import net.osmand.plus.OsmandSettings.MetricsConstants;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
@@ -42,6 +43,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 
 	private Preference applicationDir;
 	private ListPreference applicationModePreference;
+	private ListPreference drivingRegionPreference;
+	private ListPreference metricsAndConstantsPreference;
 
 	
 	@Override
@@ -116,7 +119,6 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		screen.addPreference(createCheckBoxPreference(settings.USE_KALMAN_FILTER_FOR_COMPASS, R.string.use_kalman_filter_compass, R.string.use_kalman_filter_compass_descr));
 		
 		registerBooleanPreference(settings.USE_ENGLISH_NAMES, screen);
-		registerBooleanPreference(settings.LEFT_SIDE_NAVIGATION, screen);
 
 		
 		// List preferences
@@ -132,7 +134,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				settings.OSMAND_THEME, screen,
 				new String[] { "Dark", "Light", "Dark ActionBar" }, new Integer[] { OsmandSettings.OSMAND_DARK_THEME,
 						OsmandSettings.OSMAND_LIGHT_THEME, OsmandSettings.OSMAND_LIGHT_DARK_ACTIONBAR_THEME });
-		MetricsConstants[] mvls  = new MetricsConstants[] {MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.MILES_AND_FOOTS, MetricsConstants.MILES_AND_YARDS}; //MetricsConstants.values();
+		DrivingRegion[] drs  = DrivingRegion.values();
+		entries = new String[drs.length];
+		for (int i = 0; i < entries.length; i++) {
+			entries[i] = getString(drs[i].name);
+		}
+		registerListPreference(settings.DRIVING_REGION, screen, entries, drs);
+		
+		MetricsConstants[] mvls  = MetricsConstants.values();
 		entries = new String[mvls.length];
 		for(int i=0; i<entries.length; i++){
 			entries[i] = mvls[i].toHumanString(getMyApplication());
@@ -201,7 +210,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		
 		applicationModePreference = (ListPreference) screen.findPreference(settings.APPLICATION_MODE.getId());
 		applicationModePreference.setOnPreferenceChangeListener(this);
-
+		drivingRegionPreference = (ListPreference) screen.findPreference(settings.DRIVING_REGION.getId());
+		metricsAndConstantsPreference = (ListPreference) screen.findPreference(settings.METRIC_SYSTEM.getId());
     }
 
 
@@ -219,6 +229,11 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 
 		applicationModePreference.setTitle(getString(R.string.settings_preset) + "  ["
 				+ settings.APPLICATION_MODE.get().toHumanString(getMyApplication()) + "]");
+		drivingRegionPreference.setTitle(getString(R.string.driving_region) + "  ["
+				+ getString(settings.DRIVING_REGION.get().name) + "]");
+		// Too long
+//		metricsAndConstantsPreference.setTitle(getString(R.string.unit_of_length) + "  ["
+//				+ settings.METRIC_SYSTEM.get().toHumanString(getMyApplication()) + "]");
 	}
 
 	@Override
@@ -226,7 +241,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		String id = preference.getKey();
 		super.onPreferenceChange(preference, newValue);
 		if (id.equals(settings.SAFE_MODE.getId())) {
-			if (((Boolean) newValue).booleanValue()) {
+			if ((Boolean) newValue) {
 				loadNativeLibrary();
 			}
 		} else if (preference == applicationDir) {
@@ -245,6 +260,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 			Intent intent = getIntent();
 			finish();
 			startActivity(intent);
+		} else {
+			updateAllSettings();
 		}
 		return true;
 	}

OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java

@@ -206,8 +206,8 @@ public class GeoIntentActivity extends OsmandListActivity {
 				int i = q.indexOf(',');
 				String lat = q.substring(0, i);
 				String lon = q.substring(i + 1);
-				if (lat.indexOf(":") != -1) {
+				if (lat.indexOf(':') != -1) {
-					i = lat.indexOf(":");
+					i = lat.indexOf(':');
 					lat = lat.substring(i + 1);
 				}
 				try {
@@ -422,7 +422,7 @@ public class GeoIntentActivity extends OsmandListActivity {
 		});
 	}
 	
-	private class Empty implements MyService {
+	private static class Empty implements MyService {
 
 		@Override
 		public Collection<MapObject> execute() {
@@ -431,7 +431,7 @@ public class GeoIntentActivity extends OsmandListActivity {
 		
 	}
 	
-	private class GeoPointSearch implements MyService {
+	private static class GeoPointSearch implements MyService {
 		private MapObject point;
 		/**
 		 * geo:latitude,longitude geo:latitude,longitude?z=zoom

OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java

@@ -161,7 +161,7 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea
 					b.append("?format=xml&addressdetails=0&accept-language=").append(Locale.getDefault().getLanguage()); //$NON-NLS-1$
 					b.append("&q=").append(URLEncoder.encode(search, "UTF-8")); //$NON-NLS-1$
 					
-					log.info("Searching address at : " + b.toString()); //$NON-NLS-1$
+					log.info("Searching address at : " + b); //$NON-NLS-1$
 					URL url = new URL(b.toString());
 					URLConnection conn = url.openConnection();
 					conn.setDoInput(true);

OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java

@@ -425,7 +425,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		if (location == null) {
 			title = R.string.search_poi_location;
 			enabled = false;
-		} else if (!isNameFinderFilter() && !isSearchByNameFilter()) {
+		} else if (filter != null && !isNameFinderFilter() && !isSearchByNameFilter()) {
 			title = R.string.search_POI_level_btn;
 			enabled = (taskAlreadyFinished || currentSearchTask.getStatus() != Status.RUNNING) && filter.isSearchFurtherAvailable();
 		} else if (filter != null) {
@@ -811,8 +811,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 			StringBuilder value = new StringBuilder();
 			MapRenderingTypes.getDefault().getAmenityTagValue(amenity.getType(), amenity.getSubType(),
 					tag, value);
-			if(RenderingIcons.containsBigIcon(tag.toString() + "_" + value.toString())) {
+			if(RenderingIcons.containsBigIcon(tag + "_" + value)) {
-				icon.setImageResource(RenderingIcons.getBigIconResourceId(tag.toString() + "_" + value.toString()));
+				icon.setImageResource(RenderingIcons.getBigIconResourceId(tag + "_" + value));
 			} else if(RenderingIcons.containsBigIcon(value.toString())) {
 				icon.setImageResource(RenderingIcons.getBigIconResourceId(value.toString()));
 			} else {