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

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

@@ -166,7 +166,7 @@ public class RenderingRuleProperty {
 			try {
 				return parseColor(value);
 			} catch (RuntimeException e) {
-				log.error("Rendering parse " + e.getMessage());
+				log.error("Rendering parse " + e.getMessage() + " in " + attrName);
 			}
 			return -1;
 		} else if(type == FLOAT_TYPE){
@@ -178,7 +178,7 @@ public class RenderingRuleProperty {
 				}
 				return 0;
 			} catch (NumberFormatException e) {
-				log.error("Rendering parse " + value);
+				log.error("Rendering parse " + value + " in " + attrName);
 			}
 			return -1;
 		} else {
@@ -198,7 +198,7 @@ public class RenderingRuleProperty {
 				}
 				return Float.parseFloat(value);
 			} catch (NumberFormatException e) {
-				log.error("Rendering parse " + value);
+				log.error("Rendering parse " + value + " in " + attrName);
 			}
 			return -1;
 		} else {

OsmAnd/.gitignore

@@ -31,3 +31,8 @@ assets/OsmAndCore_ResourcesBundle/
 
 # Output
 /build
+
+# Project-specific
+/helpAssets
+/voiceAssets
+/resourcesSrc

OsmAnd/assets/help/style.css

@@ -5,4 +5,3 @@
    li { text-align:justify;"}
    img { max-width: 75%; width: auto; height: auto; }
    p.img {text-align: center}
-

OsmAnd/assets/style.css

@@ -5,4 +5,3 @@
    li { text-align:justify;"}
    img { max-width: 75%; width: auto; height: auto; }
    p.img {text-align: center}
-

OsmAnd/build.gradle

@@ -1,16 +1,50 @@
 apply plugin: 'com.android.application'
 
+//<target name="fix_apostrophe_issues">
+//<replace token="version='1.0'" value="version=&quot;1.0&quot;" encoding="UTF-8">
+//<fileset dir="res" includes="**/strings.xml" />
+//</replace>
+//               <replace token="encoding='utf-8'" value="encoding=&quot;utf-8&quot;" encoding="UTF-8">
+//                       <fileset dir="res" includes="**/strings.xml" />
+//</replace>
+//
+//               <replaceregexp  match="([^\\])'" replace="\1\\\\'" flags="-g" byline="off" encoding="UTF-8">
+//                       <fileset dir="res" includes="**/strings.xml" />
+//</replaceregexp>
+//       </target>
+
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
 
+    signingConfigs {
+        development {
+            storeFile file("../keystores/debug.keystore")
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+
+        publishing {
+            storeFile file("osmand_key")
+            storePassword System.getenv("PWD")
+            keyAlias "androiddebugkey"
+            keyPassword System.getenv("PWD")
+        }
+    }
+
     defaultConfig {
-        minSdkVersion 7
+        minSdkVersion 9
         targetSdkVersion 21
+
+        versionCode System.getenv("APK_NUMBER_VERSION") ?: versionCode
+        versionName System.getenv("APK_VERSION") ?: versionName
     }
 
     lintOptions {
+        lintConfig file("lint.xml")
         abortOnError false
+        warningsAsErrors false
     }
 
     // This is from OsmAndCore_android.aar - for some reason it's not inherited
@@ -25,64 +59,196 @@ android {
 
     sourceSets {
         main {
-            manifest {
+            manifest.srcFile "AndroidManifest.xml"
-                srcFile "AndroidManifest.xml"
+            jni.srcDirs = []
-            }
+            jniLibs.srcDirs = ["libs"]
-            jni {
+            aidl.srcDirs = ["src"]
-                srcDirs = []
+            java.srcDirs = [
-            }
-            jniLibs {
-                srcDirs = ["libs"]
-            }
-            aidl {
-                srcDirs = ["src"]
-            }
-            java {
-                srcDirs = [
                     "src",
-                    fileTree(dir: "../OsmAnd-java/src", exclude: "**/PlatformUtil.java")]
+                    fileTree(dir: "../OsmAnd-java/src", exclude: "**/PlatformUtil.java"),
-            }
+                    "resourcesSrc"
-            resources {
+            ]
-                srcDirs = ["src", "../OsmAnd-java/src"]
+            resources.srcDirs = [
-            }
+                    "src",
-            renderscript {
+                    "../OsmAnd-java/src",
-                srcDirs = ["src"]
+                    "resourcesSrc"
-            }
+            ]
-            res {
+            renderscript.srcDirs = ["src"]
-                srcDirs = ["res"]
+            res.srcDirs = [
-            }
+                    "res",
-            assets {
+                    "../../resources/rendering_styles/style-icons/"
-                srcDirs = ["assets"]
+            ]
-            }
+            assets.srcDirs = [
+                    "assets",
+                    "voiceAssets",
+                    "helpAssets"
+            ]
         }
     }
 
+    flavorDimensions "version", "distribution", "abi"
     productFlavors {
+        // ABI
         x86 {
+            flavorDimension "abi"
             ndk {
                 abiFilter "x86"
             }
         }
         mips {
+            flavorDimension "abi"
             ndk {
                 abiFilter "mips"
             }
         }
         armv7 {
+            flavorDimension "abi"
             ndk {
                 abiFilter "armeabi-v7a"
             }
         }
         armv5 {
+            flavorDimension "abi"
             ndk {
                 abiFilter "armeabi"
             }
         }
-        fat
+        fat {
+            flavorDimension "abi"
+        }
+
+        // Version
+        free {
+            flavorDimension "version"
+            applicationId "net.osmand"
+        }
+        paid {
+            flavorDimension "version"
+            applicationId "net.osmand.plus"
+        }
+        /*
+        sherpafy {
+            flavorDimension "version"
+            applicationId "net.osmand.sherpafy"
+        }
+        */
+
+        // Distribution
+        googleplay {
+            flavorDimension "distribution"
+        }
+        /*
+        amazon {
+            flavorDimension "distribution"
+        }
+        */
+    }
+
+    buildTypes {
+        debug {
+            signingConfig signingConfigs.development
+        }
+        nativeDebug {
+            signingConfig signingConfigs.development
+        }
+        release {
+            signingConfig signingConfigs.publishing
+        }
+    }
+}
+
+task collectVoiceAssets(type: Sync) {
+    from "../../resources"
+    into "voiceAssets"
+    include "specialphrases/**"
+    include "voice/**/*.p"
+}
+
+task collectRoutingResources(type: Sync) {
+    from "../../resources/routing"
+    into "resourcesSrc/net/osmand/router"
+    include "*.xml"
+}
+
+task collectRenderingStyles(type: Sync) {
+    from "../../resources/rendering_styles"
+    into "resourcesSrc/net/osmand/render"
+    include "*.xml"
+}
+
+task collectRegionsInfo(type: Copy) {
+    from "../../resources/countries-info"
+    into "resourcesSrc/net/osmand/map"
+    include "regions.ocbf"
+}
+
+task collectHelpContents(type: Sync) {
+    from "../../help"
+    into "helpAssets/help"
+    include "*.html"
+    include "images/**/*.png"
+}
+
+task collectMiscResources(type: Copy) {
+    from("../../../resources/obf_creation") {
+        include "rendering_types.xml"
+    }
+    from("../../../resources/poi") {
+        include "poi_types.xml"
+    }
+
+    into "resourcesSrc/net/osmand/osm"
+}
+
+task collectExternalResources << {}
+collectExternalResources.dependsOn collectVoiceAssets,
+        collectRoutingResources,
+        collectRenderingStyles,
+        collectRegionsInfo,
+        collectHelpContents,
+        collectMiscResources
+tasks.withType(JavaCompile) {
+    compileTask -> compileTask.dependsOn << collectExternalResources
+}
+
+// Legacy core build
+import org.apache.tools.ant.taskdefs.condition.Os
+task buildOsmAndCore(type: Exec) {
+    description "Build Legacy OsmAndCore"
+
+    if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+        commandLine "bash", file("./old-ndk-build.sh").getAbsolutePath()
+    } else {
+        commandLine "cmd", "/c", "echo", "Not supported"
+    }
+}
+task cleanupDuplicatesInCore(type: Delete) {
+    dependsOn buildOsmAndCore
+
+    delete "libs/armeabi/libgnustl_shared.so"
+    delete "libs/armeabi-v7a/libgnustl_shared.so"
+    delete "libs/mips/libgnustl_shared.so"
+    delete "libs/x86/libgnustl_shared.so"
+}
+tasks.withType(JavaCompile) {
+    compileTask -> compileTask.dependsOn << [buildOsmAndCore, cleanupDuplicatesInCore]
+}
+
+repositories {
+    ivy {
+        name = "OsmAndBinariesIvy"
+        url = "http://builder.osmand.net:81"
+        layout "pattern" , {
+            artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
+        }
     }
 }
 
 dependencies {
+    compile fileTree(dir: "libs", include: ["*.jar"], exclude: ["QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar"])
     compile "com.actionbarsherlock:actionbarsherlock:4.4.0@aar"
-    compile fileTree(dir: "libs", include: ["*.jar"])
+    compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+    debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+    nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
+    releaseCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 }

OsmAnd/build.xml

@@ -18,13 +18,15 @@
 
 	<target name="download_resources">
 	    <get src="http://builder.osmand.net:81/binaries/android/OsmAndCore_wrapper.jar"
-	        dest="libs/OsmAndCore_wrapper.jar"  usetimestamp="true"/>
+	        dest="libs/OsmAndCore_wrapper.jar" usetimestamp="true"/>
-	    <get src="http://builder.osmand.net:81/binaries/android/OsmAndCore_android.aar"
+	    <get src="http://builder.osmand.net:81/ivy/net.osmand/OsmAndCore_android/0.1-SNAPSHOT/OsmAndCore_android-0.1-SNAPSHOT.aar"
-	        dest="OsmAndCore_android.aar"  usetimestamp="true"/>
+	        dest="OsmAndCore_android.aar" usetimestamp="true"/>
+	    <get src="http://builder.osmand.net:81/ivy/net.osmand/OsmAndCore_androidNativeRelease/0.1-SNAPSHOT/OsmAndCore_androidNativeRelease-0.1-SNAPSHOT.aar"
+	        dest="OsmAndCore_androidNativeRelease.aar" usetimestamp="true"/>
 	</target>
 	
 	<target name="use_qt_core" depends="download_resources">
-	    <unzip src="OsmAndCore_android.aar" dest="libs">
+	    <unzip src="OsmAndCore_androidNativeRelease.aar" dest="libs">
 	        <patternset>
 	            <include name="jni/armeabi-v7a/*"/>
 	        </patternset>

OsmAnd/res/layout-land/dash_search_fragment.xml

@@ -3,7 +3,6 @@
     android:id="@+id/search"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="4dp"
     android:background="@drawable/bg_cardui"
     android:orientation="vertical" >
 

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

@@ -8,7 +8,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:orientation="vertical"
-			android:padding="6dp" >
+			android:padding="@dimen/dashPadding" >
 
 		<LinearLayout android:orientation="horizontal"
 					  android:layout_width="match_parent"
@@ -24,28 +24,23 @@
 							  android:layout_width="match_parent"
 							  android:layout_height="wrap_content"/>
 
-
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
 						android:name="net.osmand.plus.dashboard.DashMapFragment"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
-				<fragment
-						xmlns:android="http://schemas.android.com/apk/res/android"
-						android:name="net.osmand.plus.dashboard.DashFavoritesFragment"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"/>
-
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
 						android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
+						android:layout_marginTop="@dimen/dashCardMargin"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
-						android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
+						android:name="net.osmand.plus.dashboard.DashFavoritesFragment"
+						android:layout_marginTop="@dimen/dashCardMargin"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
@@ -63,15 +58,24 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
+				<fragment
+						xmlns:android="http://schemas.android.com/apk/res/android"
+						android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
+						android:layout_marginTop="@dimen/dashCardMargin"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
 						android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
+						android:layout_marginTop="@dimen/dashCardMargin"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
 						android:name="net.osmand.plus.dashboard.DashPluginsFragment"
+						android:layout_marginTop="@dimen/dashCardMargin"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
@@ -84,7 +88,7 @@
 					  android:layout_height="wrap_content"
 					  android:orientation="horizontal"
 					  android:visibility="gone"
-					  android:padding="6dp"
+					  android:padding="@dimen/dashPadding"
 					  android:baselineAligned="false">
 
 			<LinearLayout
@@ -99,7 +103,7 @@
 						android:layout_height="wrap_content"
 						android:layout_gravity="start|bottom"
 						android:text="@string/about_settings"
-						android:textSize="20sp" />
+						android:textSize="@dimen/dashAboutTextSize" />
 			</LinearLayout>
 
 		</LinearLayout>

OsmAnd/res/layout-large/dashboard.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="match_parent"
-			  android:layout_height="match_parent">
-
-</LinearLayout>

OsmAnd/res/layout/dash_audio_video_notes_plugin.xml

@@ -3,13 +3,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:id="@+id/main_notes"
 			  android:background="@drawable/bg_cardui"
-			  android:layout_marginBottom="4dp"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
 			  android:orientation="vertical">
 	<LinearLayout android:orientation="horizontal"
 				  android:layout_width="fill_parent"
-				  android:layout_height="40dp">
+				  android:layout_height="@dimen/dashHeaderHeight">
 		<TextView android:id="@+id/notes_text"
 				  android:text="@string/map_widget_av_notes"
 				  style="@style/DashboardSubHeader"/>

OsmAnd/res/layout/dash_download_maps_fragment.xml

@@ -7,7 +7,7 @@
               android:layout_height="wrap_content">
     <TextView android:id="@+id/message"
               android:layout_height="wrap_content"
-              android:padding="12dp"
+              android:padding="@dimen/dashFavIconMargin"
               android:layout_width="match_parent"
               android:gravity="center_horizontal"
               android:textColor="@color/dashboard_black"
@@ -17,7 +17,7 @@
           android:layout_height="1dp"/>
     <LinearLayout android:layout_width="fill_parent"
                   android:orientation="horizontal"
-                  android:layout_height="40dp">
+                  android:layout_height="@dimen/dashHeaderHeight">
         <Button android:id="@+id/local_downloads"
                 android:layout_width="0dp"
                 android:layout_weight="1"

OsmAnd/res/layout/dash_error_fragment.xml

@@ -7,7 +7,7 @@
               android:layout_height="wrap_content">
     <TextView android:id="@+id/error_header"
               android:layout_height="wrap_content"
-              android:padding="12dp"
+              android:padding="@dimen/dashFavIconMargin"
               android:layout_width="match_parent"
               android:gravity="center_horizontal"
               android:textColor="@color/dashboard_black"
@@ -17,7 +17,7 @@
           android:layout_height="1dp"/>
     <LinearLayout android:layout_width="fill_parent"
                   android:orientation="horizontal"
-                  android:layout_height="40dp">
+                  android:layout_height="@dimen/dashHeaderHeight">
         <Button android:id="@+id/error_btn"
                 android:layout_width="0dp"
                 android:layout_weight="1"

OsmAnd/res/layout/dash_fav_list.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="match_parent"
-			  android:background="@drawable/dashboard_button"
-			  android:layout_height="50dp">
-    <View android:layout_width="match_parent"
-          android:background="@color/dashboard_divider"
-          android:layout_height="1dp"/>
-    <LinearLayout android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent">
-        <ImageView android:id="@+id/icon"
-                   android:layout_gravity="center_vertical"
-                   android:layout_marginLeft="12dp"
-                   android:layout_marginRight="12dp"
-                   android:layout_width="28dp"
-                   android:layout_height="28dp"/>
-
-        <LinearLayout android:orientation="vertical"
-                      android:layout_gravity="center_vertical"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content">
-            <TextView android:id="@+id/name"
-                      android:textSize="16sp"
-                      android:textColor="@color/dashboard_black"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"/>
-            <TextView android:id="@+id/distance"
-                      android:textSize="12sp"
-                      android:textColor="@color/dashboard_blue"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"/>
-        </LinearLayout>
-    </LinearLayout>
-
-
-</LinearLayout>

OsmAnd/res/layout/dash_favorites_fragment.xml

@@ -3,13 +3,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:id="@+id/main_fav"
 			  android:background="@drawable/bg_cardui"
-			  android:layout_marginBottom="4dp"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
 			  android:orientation="vertical">
 	<LinearLayout android:orientation="horizontal"
 				  android:layout_width="fill_parent"
-				  android:layout_height="40dp">
+				  android:layout_height="@dimen/dashHeaderHeight">
 		<TextView android:id="@+id/fav_text"
 				  android:text="@string/my_data_Button"
 				  style="@style/DashboardSubHeader"/>

OsmAnd/res/layout/dash_favorites_item.xml

@@ -4,7 +4,7 @@
 			  android:orientation="vertical"
 			  android:layout_width="match_parent"
 			  android:background="@drawable/dashboard_button"
-			  android:layout_height="50dp">
+			  android:layout_height="@dimen/dashListItemHeight">
     <View android:layout_width="match_parent"
           android:background="@color/dashboard_divider"
           android:layout_height="1dp"/>
@@ -13,18 +13,17 @@
                   android:layout_height="match_parent">
         <ImageView android:id="@+id/icon"
                    android:layout_gravity="center_vertical"
-                   android:layout_marginLeft="12dp"
+                   android:layout_marginLeft="@dimen/dashFavIconMargin"
-                   android:layout_marginRight="12dp"
+                   android:layout_marginRight="@dimen/dashFavIconMargin"
-                   android:layout_width="28dp"
+                   android:layout_width="wrap_content"
-                   android:layout_height="28dp"/>
+                   android:layout_height="fill_parent"/>
-
         <LinearLayout android:orientation="vertical"
                       android:layout_weight="1"
                       android:layout_gravity="center_vertical"
                       android:layout_width="0dp"
                       android:layout_height="wrap_content">
             <TextView android:id="@+id/name"
-                      android:textSize="16sp"
+                      android:textSize="@dimen/dashFavNameTextSize"
                       android:textColor="@color/dashboard_black"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"/>
@@ -34,10 +33,10 @@
 				<ImageView android:visibility="gone"
 						   android:id="@+id/direction"
 						   android:layout_gravity="center_vertical"
-						   android:layout_width="10dp"
+						   android:layout_width="@dimen/dashFavDirectionSize"
-						   android:layout_height="10dp"/>
+						   android:layout_height="@dimen/dashFavDirectionSize"/>
 				<TextView android:id="@+id/distance"
-						  android:textSize="12sp"
+						  android:textSize="@dimen/showAllButtonTextSize"
 						  android:textColor="@color/dashboard_blue"
 						  android:layout_width="wrap_content"
 						  android:layout_height="wrap_content"/>
@@ -46,11 +45,12 @@
         </LinearLayout>
 
         <ImageButton android:id="@+id/navigate_to"
+                android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_action_gdirections_light"
                 android:background="@drawable/dashboard_button"
-                android:layout_marginLeft="12dp"
+                android:layout_marginLeft="@dimen/dashFavIconMargin"
-                android:layout_width="50dp"
+                android:layout_width="@dimen/dashListItemHeight"
-                android:layout_height="50dp"/>
+                android:layout_height="@dimen/dashListItemHeight"/>
     </LinearLayout>
 
 

OsmAnd/res/layout/dash_map_fragment.xml

@@ -3,12 +3,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:orientation="vertical"
 			  android:background="@drawable/bg_cardui"
-			  android:layout_marginBottom="4dp"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content">
 	<LinearLayout android:orientation="horizontal"
 				  android:layout_width="fill_parent"
-				  android:layout_height="40dp">
+				  android:layout_height="@dimen/dashHeaderHeight">
 		<TextView android:id="@+id/map_text"
 				  android:text="@string/map_Button"
 				  style="@style/DashboardSubHeader"/>
@@ -17,10 +16,12 @@
 				style="@style/DashboardGeneralButton"/>
 	</LinearLayout>
 
-	<RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
+	<RelativeLayout android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+			android:padding="@dimen/subHeaderPadding">
 		<LinearLayout android:id="@+id/loading"
 					  android:layout_width="fill_parent"
-					  android:layout_height="110dp"
+					  android:layout_height="@dimen/dashMapHeight"
 					  android:gravity="center_vertical|center_horizontal"
 					  android:orientation="horizontal">
 
@@ -35,16 +36,16 @@
 					android:layout_height="wrap_content"
 					android:maxLines="3"
 					android:text="@string/loading_data"
-					android:textSize="18sp" />
+					android:textSize="@dimen/dashProgressTextSize" />
 		</LinearLayout>
 
 		<net.osmand.plus.views.OsmAndMapSurfaceView
 				android:id="@+id/MapView"
 				android:layout_width="fill_parent"
-				android:layout_height="110dp"
+				android:layout_height="@dimen/dashMapHeight"
-				android:layout_marginLeft="2dp"
+				android:layout_marginLeft="@dimen/dashMapMargin"
-				android:layout_marginRight="2dp"
+				android:layout_marginRight="@dimen/dashMapMargin"
-				android:layout_marginBottom="2dp"
+				android:layout_marginBottom="@dimen/dashMapMargin"
 				android:contentDescription="@string/map_view"
 				android:visibility="gone"/>
 	</RelativeLayout>

OsmAnd/res/layout/dash_note_item.xml

@@ -4,7 +4,7 @@
 			  android:orientation="vertical"
 			  android:layout_width="match_parent"
 			  android:background="@drawable/dashboard_button"
-			  android:layout_height="50dp">
+			  android:layout_height="@dimen/dashHeaderHeight">
 	<View android:layout_width="match_parent"
 		  android:background="@color/dashboard_divider"
 		  android:layout_height="1dp"/>
@@ -13,10 +13,10 @@
 				  android:layout_height="match_parent">
 		<ImageView android:id="@+id/icon"
 				   android:layout_gravity="center_vertical"
-				   android:layout_marginLeft="12dp"
+				   android:layout_marginLeft="@dimen/dashFavIconMargin"
-				   android:layout_marginRight="12dp"
+				   android:layout_marginRight="@dimen/dashFavIconMargin"
-				   android:layout_width="28dp"
+				   android:layout_width="@dimen/dashNoteIconSize"
-				   android:layout_height="28dp"/>
+				   android:layout_height="@dimen/dashNoteIconSize"/>
 
 		<LinearLayout android:orientation="vertical"
 					  android:layout_weight="1"
@@ -24,7 +24,7 @@
 					  android:layout_width="0dp"
 					  android:layout_height="wrap_content">
 			<TextView android:id="@+id/name"
-					  android:textSize="16sp"
+					  android:textSize="@dimen/dashFavNameTextSize"
 					  android:lines="1"
 					  android:ellipsize="end"
 					  android:textColor="@color/dashboard_black"
@@ -32,7 +32,7 @@
 					  android:layout_height="wrap_content"/>
 
 			<TextView android:id="@+id/descr"
-					  android:textSize="12sp"
+					  android:textSize="@dimen/showAllButtonTextSize"
 					  android:lines="1"
 					  android:ellipsize="end"
 					  android:layout_width="wrap_content"
@@ -43,9 +43,9 @@
 		<ImageButton android:id="@+id/play"
 					 android:src="@drawable/ic_play_light"
 					 android:background="@drawable/dashboard_button"
-					 android:layout_marginLeft="12dp"
+					 android:layout_marginLeft="@dimen/dashFavIconMargin"
-					 android:layout_width="50dp"
+					 android:layout_width="@dimen/dashHeaderHeight"
-					 android:layout_height="50dp"/>
+					 android:layout_height="@dimen/dashHeaderHeight"/>
 	</LinearLayout>
 
 

OsmAnd/res/layout/dash_plugin_item.xml

@@ -12,9 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingLeft="12dp"
+        android:paddingLeft="@dimen/dashFavIconMargin"
-        android:paddingBottom="4dp"
+        android:paddingBottom="@dimen/dashPluginPadding"
-        android:paddingRight="12dp" >
+        android:paddingRight="@dimen/dashFavIconMargin" >
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -27,7 +27,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
+                android:layout_marginLeft="@dimen/dashPluginMargin"
                 android:ellipsize="end"
                 android:lines="1"
                 android:layout_gravity="center_vertical"

OsmAnd/res/layout/dash_plugins_fragment.xml

@@ -7,7 +7,7 @@
 			  android:layout_height="match_parent">
 	<LinearLayout android:orientation="horizontal"
 				  android:layout_width="fill_parent"
-				  android:layout_height="40dp">
+				  android:layout_height="@dimen/dashHeaderHeight">
 		<TextView android:id="@+id/plugin_text"
 				  android:text="@string/prefs_plugins"
 				  style="@style/DashboardSubHeader"/>

OsmAnd/res/layout/dash_search_fragment.xml

@@ -3,7 +3,6 @@
     android:id="@+id/search"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="4dp"
     android:background="@drawable/bg_cardui"
     android:orientation="vertical" >
 
@@ -14,7 +13,7 @@
         	android:id="@+id/search_for"
         	style="@style/DashboardSubHeader"
         	android:layout_width="wrap_content"
-        	android:layout_height="40dp"
+        	android:layout_height="@dimen/dashHeaderHeight"
         	android:text="@string/search_for" />
     </LinearLayout>
 
@@ -25,7 +24,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="@dimen/dashSearchBtnHeight"
         android:orientation="horizontal" >
 
         <Button
@@ -64,7 +63,7 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="90dp"
+        android:layout_height="@dimen/dashSearchBtnHeight"
         android:orientation="horizontal" >
 
         <Button

OsmAnd/res/layout/dash_updates_fragment.xml

@@ -4,32 +4,15 @@
 			  xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:orientation="vertical"
 			  android:background="@drawable/bg_cardui"
-			  android:layout_marginBottom="4dp"
 			  android:layout_width="match_parent"
 			  android:layout_height="wrap_content">
 	<LinearLayout
 			android:layout_gravity="center_vertical"
 			android:layout_width="match_parent"
-			android:layout_height="40dp">
+			android:layout_height="@dimen/dashHeaderHeight">
 		<TextView android:text="@string/map_update"
 				  android:id="@+id/header"
-				  android:layout_width="wrap_content"
+				  style="@style/DashboardSubHeader"/>
-				  android:layout_height="fill_parent"
-				  android:paddingTop="2dp"
-				  android:gravity="center_vertical"
-				  android:layout_marginLeft="15dp"
-				  android:textSize="14sp"
-				  android:textColor="@color/dashboard_black"/>
-		<ProgressBar android:id="@+id/main_progress"
-					 android:visibility="visible"
-					 android:layout_marginLeft="2dp"
-					 android:indeterminate="true"
-					 android:indeterminateOnly="true"
-					 android:layout_width="wrap_content"
-					 android:layout_height="wrap_content"/>
-		<View android:layout_width="0dp"
-			  android:layout_weight="1"
-			  android:layout_height="wrap_content"/>
 		<Button android:id="@+id/show_all"
 				android:text="@string/show_all"
 				style="@style/DashboardGeneralButton"/>

OsmAnd/res/layout/dash_updates_item.xml

@@ -3,14 +3,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:orientation="vertical"
 			  android:layout_width="match_parent"
-			  android:layout_marginLeft="12dp"
+			  android:layout_marginLeft="@dimen/dashFavIconMargin"
-			  android:layout_marginRight="12dp"
+			  android:layout_marginRight="@dimen/dashFavIconMargin"
-			  android:layout_height="50dp">
+			  android:layout_height="@dimen/dashListItemHeight">
 	<View android:layout_width="match_parent"
 		  android:background="@color/dashboard_divider"
 		  android:layout_height="1dp"/>
 	<LinearLayout android:orientation="horizontal"
-				  android:layout_marginLeft="12dp"
+				  android:layout_marginLeft="@dimen/subHeaderMarginLeft"
 				  android:layout_width="fill_parent"
 				  android:layout_height="fill_parent">
 		<LinearLayout android:orientation="vertical"
@@ -20,6 +20,7 @@
 					  android:layout_height="wrap_content">
 			<TextView android:id="@+id/map_name"
 					  android:textColor="@color/dashboard_black"
+					  android:textSize="@dimen/dashFavNameTextSize"
 					  android:layout_width="wrap_content"
 					  android:layout_height="wrap_content"/>
 			<TextView android:id="@+id/map_descr"
@@ -30,16 +31,15 @@
 				android:layout_gravity="center_vertical"
 				android:src="@drawable/download_button"
 				android:background="@drawable/dashboard_button"
-				android:layout_width="50dp"
+				android:layout_width="@dimen/dashListItemHeight"
-				android:layout_height="50dp"/>
+				android:layout_height="@dimen/dashListItemHeight"/>
 	</LinearLayout>
 
 	<ProgressBar android:id="@+id/ProgressBar"
-				 android:layout_marginLeft="12dp"
+				 android:layout_marginLeft="@dimen/dashFavIconMargin"
-				 android:layout_marginRight="12dp"
+				 android:layout_marginRight="@dimen/dashFavIconMargin"
 				 android:visibility="gone"
 				 style="?android:attr/progressBarStyleHorizontal"
 				 android:layout_width="fill_parent"
 				 android:layout_height="wrap_content"/>
-
 </LinearLayout>

OsmAnd/res/layout/dashboard.xml

@@ -2,13 +2,14 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+	android:id="@+id/main_scroll"
     android:background="@color/dashboard_background" >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:padding="6dp" >
+        android:padding="@dimen/dashPadding" >
         <LinearLayout 
             android:orientation="vertical"
             android:layout_width="match_parent"
@@ -28,36 +29,42 @@
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:name="net.osmand.plus.dashboard.DashSearchFragment"
+                    android:layout_marginTop="@dimen/dashCardMargin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:name="net.osmand.plus.dashboard.DashFavoritesFragment"
-					android:layout_width="match_parent"
+                    android:layout_marginTop="@dimen/dashCardMargin"
+                    android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
+                    android:layout_marginTop="@dimen/dashCardMargin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
+                    android:layout_marginTop="@dimen/dashCardMargin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
+                    android:layout_marginTop="@dimen/dashCardMargin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:name="net.osmand.plus.dashboard.DashPluginsFragment"
+                    android:layout_marginTop="@dimen/dashCardMargin"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 		</LinearLayout>
@@ -67,7 +74,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:visibility="gone"
-            android:padding="6dp"
+            android:padding="@dimen/dashPadding"
             android:baselineAligned="false">
 
             <LinearLayout
@@ -82,35 +89,9 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="start|bottom"
                     android:text="@string/about_settings"
-                    android:textSize="20sp" />
+                    android:textSize="@dimen/dashAboutTextSize" />
             </LinearLayout>
 
-<!--   All Copyright notes and links have been put on the 'About' screen
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:orientation="vertical" >
-
-                <TextView
-                    android:id="@+id/Copyright"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:gravity="end"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/OpenStreetMaps"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginTop="5dp"
-                    android:gravity="end"
-                    android:text="@string/openstreetmap_copyright"
-                    android:textSize="14sp" />
-            </LinearLayout>
--->
         </LinearLayout>
     </LinearLayout>
 

OsmAnd/res/layout/editing_poi.xml

@@ -217,7 +217,6 @@
         </LinearLayout>
 
         <TextView
-            android:id="@+id/TextView"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"

OsmAnd/res/layout/navigate_point.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 

OsmAnd/res/layout/search_address.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -47,11 +47,9 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/TableRow"
                     android:layout_marginLeft="5dp">
 
                     <TextView
-                        android:id="@+id/TextView"
                         android:text="@string/search_address_city" />
 
                     <Button
@@ -71,11 +69,9 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/TableRow"
                     android:layout_marginLeft="5dp">
 
                     <TextView
-                        android:id="@+id/TextView"
                         android:text="@string/search_address_street" />
 
                     <Button
@@ -95,7 +91,6 @@
                 </TableRow>
 
                 <TableRow
-                    android:id="@+id/TableRow"
                     android:layout_marginLeft="5dp">
 
                     <TextView

OsmAnd/res/layout/send_gpx_osm.xml

@@ -34,7 +34,6 @@
     <TableRow android:layout_width="fill_parent">
 
         <TextView
-            android:id="@+id/TextView"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:text="@string/gpx_tags_txt" />
@@ -51,7 +50,6 @@
     <TableRow android:layout_width="fill_parent">
 
         <TextView
-            android:id="@+id/TextView"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:text="@string/gpx_visibility_txt" />

OsmAnd/res/values-be/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
     <string name="auto_zoom_close">Буйней</string>
     <string name="auto_zoom_far">Для сярэдняга маштаба</string>
@@ -950,7 +950,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="voice_not_use">Не карыстацца</string>
 	<string name="voice_not_specified">Няма</string>
 	<string name="installing_new_resources">Распакоўваюцца новыя дадзеныя…</string>
-	<string name="internet_connection_required_for_online_route">Абраны навігацыйны анлайн сэрвіс, але няма злучэньня з Інтэрнэтам.</string>
+	<string name="internet_connection_required_for_online_route">Абраны навігацыйны анлайн-сэрвіс, але няма злучэньня з Інтэрнэтам.</string>
 	<string name="tts_language_not_supported_title">Мова не падтрымліваецца</string>
 	<string name="tts_language_not_supported">Абраная мова не падтрымліваецца устаноўленым Android TTS (пераўтварэньне тэксту ў гук). Вы хочаце пашукаць іншы TTS? Калі не, то будзе выкарыстоўвацца другая ўстаноўленая мова TTS.</string>
 	<string name="tts_missing_language_data_title">Адсутнічаюць дадзеныя</string>
@@ -1629,14 +1629,13 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 		\n\t* Выпраўлена напісанне арабскаю, моваю каннада і мовамі, якія маюць пісьменнасць справа налева 
 	</string>
 	<string name="arrival_distance_descr">Як хутка вы хочаце чуць паведамленье пра прыбыцьцё?</string>
-    <string name="tip_update_index_t">Актуальныя картаграфічныя дадзеныя вельмі важныя для аўтаномнага прагляду карты і адраснага пошуку. OsmAnd мае ўбудаваны менеджэр файлаў мапаў, які можа правяраць наяўнасць абнаўленняў для лакальных карт.
+    <string name="tip_update_index_t">"Актуальныя картаграфічныя дадзеныя вельмі важныя для аўтаномнага прагляду мапы і адраснага пошуку. OsmAnd мае ўбудаваны мэнэджэр файлаў мапаў, які можа правяраць наяўнасць абнаўленьняў для лакальных мапаў.
-		\n\nКаб выканаць загрузку карт абярыце пункт меню \'Налады\' → \'Кіраванне файламі мапаў\' → \'Загрузка\'. ↵
+\n\nКаб выканаць загрузку мапаў абярыце пункт меню \'Налады\' → \'Кіраваньне файламі мапаў\' → \'Загрузка\'. ↵
-		\n\nПасля таго як спіс рэгіёнаў будзе загружаны з інтэрнэту, націсніце на любы пункт для загрузкі або абнаўлення файла. Звярніце ўвагу, селектар тыпу файла знаходзіцца ў верхняй частцы экрана, каб выбраць патрэбны тып файлаў для загрузкі (карты, слаі рэльефу і г.д.) ↵
+\n\nПасля таго як сьпіс рэгіёнаў будзе загружаны зь Інтэрнэту, націсьніце на любы пункт для загрузкі або абнаўленьня файла. Звярніце ўвагу, селектар тыпу файла знаходзіцца ў верхняй частцы экрана, каб выбраць патрэбны тып файлаў для загрузкі (карты, слаі рэльефу і г.д.) ↵
-		\n\nВы можаце паказаць толькі дадзеныя наяўныя на прыладзе \'Налады\' → \'Загружаныя\', каб пабачыць абнаўлення толькі для дадзеных, загружаных на прыладу. ↵
+\n\nВы можаце паказаць толькі дадзеныя прысутныя на прыстасаваньні \'Налады\' → \'Загружаныя\', каб пабачыць абнаўленьні толькі для дадзеных, загружаных на прыстасаваньне. ↵
-		\n\n\t* \'Зялёным\' паказваюцца дадзеныя, якія не патрабуюць абнаўлення ↵
+\n\n\t* \'Зялёным\' паказваюцца дадзеныя, якія не патрабуюць абнаўленьня ↵
-		\n\t* \'Блакітным\' - наяўныя абнаўленні ↵
+\n\t* \'Блакітным\' - наяўныя абнаўленьні ↵
-		\n\t* Элементы паказаны курсівам - дэактываваныя дадзеныя на прыладзе ↵
+\n\t* Элементы паказаныя курсівам - дэактываваныя дадзеныя на прыстасаваньні "</string>
-	</string>
 	<string name="tip_search_t">"Вы можаце шукаць аб\'екты непасрэдна на карце праз «Кантэкстнае меню» → «Шукаць побач» ці праз экран пошуку «Меню» → «Пошук»↵
 \n\nНа пошукавым экране ёсць шаблоны для пошуку ↵
 \n\t * па адрасе ↵
@@ -1801,7 +1800,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="none_selected_gpx">GPX файлы ня выбраныя. Каб выбраць націсьніце і ўтрымлівайце наяўны сьлед.</string>
     <string name="local_index_unselect_gpx_file">Ачысьціць</string>
     <string name="local_index_select_gpx_file">Выбраць для паказу</string>
-    <string name="no_index_file_to_download">Няма чаго сьцягваць, калі-ласка, праверце Інтэрнэт злучэньне.</string>
+    <string name="no_index_file_to_download">Няма чаго сьцягваць, калі-ласка, праверце ваша Інтэрнэт-злучэньне.</string>
     <string name="osmo_not_signed_in">Не ўдалося ўвайсьці ў OsMo</string>
     <string name="osmo_gpx_points_downloaded">Загружана %1$s кропак OsMo.</string>
     <string name="osmo_auto_connect_descr">Аўтаматычнае падключэньне да службы пасьля запуску праграмы</string>
@@ -1946,7 +1945,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="impassable_road">Пазьбягаць дарогі…</string>
     <string name="rendering_category_hide">Схаваць</string>
     <string name="wake_on_voice">Уключыць экран</string>
-    <string name="wake_on_voice_descr">Уключаць экран тэлефона пры набліжэньні да павароту</string>
+    <string name="wake_on_voice_descr">Уключаць экран прыстасаваньня пры набліжэньні да павароту</string>
     <string name="wake_on_voice_never">Ніколі</string>
     <string name="lock_screen_request_explanation">%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.</string>
     <string name="advanced_settings">Дадатковыя</string>
@@ -1963,7 +1962,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="use_opengl_render_descr">Выкарыстоўваць апаратнае паскарэньне OpenGL (можа не працаваць на некаторых прыстасаваньнях)</string>
     <string name="everything_up_to_date">Усе файлы ў актуальным стане</string>
     <string name="dismiss">Скасаваць</string>
-    <string name="no_internet_connection">Немагчыма спампаваць. Калі ласка, падлучыцеся да Wi-Fi, каб працягнуць.</string>
+    <string name="no_internet_connection">Немагчыма спампаваць. Калі ласка, праверце ваша Інтэрнэт-злучэньне.</string>
     <string name="download_tab_downloads">Усе загрузкі</string>
     <string name="download_tab_updates">Абнаўленьні</string>
     <string name="download_tab_local">Лякальны</string>
@@ -1980,8 +1979,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="rendering_value_orange_name">Аранжавы</string>
     <string name="rendering_value_germanRoadAtlas_name">Нямецкі атлас аўтадарог</string>
     <string name="rendering_value_americanRoadAtlas_name">Амерыканскі атлас аўтадарог</string>
-    <string name="routing_attr_no_new_routing_name">Не выкарыстоўваць маршрутызацыю v1.9</string>
+    <string name="routing_attr_no_new_routing_name">Без правілаў маршрутызацыі v1.9</string>
-    <string name="routing_attr_no_new_routing_description">Не выкарыстоўваць маршрутызацыю v1.9</string>
+    <string name="routing_attr_no_new_routing_description">Не выкарыстоўваць правілы маршрутызацыі ўведзеныя ў v1.9</string>
     <string name="rendering_value_default_name">Па змоўчаньні</string>
     <string name="rendering_attr_roadStyle_name">Стыль аўтадарог</string>
     <string name="show_pedestrian_warnings">Паказваць папярэджаньні для пешаходаў</string>

OsmAnd/res/values-ca/phrases.xml

@@ -53,7 +53,7 @@
 	<string name="poi_mobile_phone_shop">Botiga de telèfons mòbils</string>
 	<string name="poi_motorcycle_shop">Botiga de motocicletes</string>
 	<string name="poi_musical_instrument_shop">Instruments musicals</string>
-	<string name="poi_newsagent_shop">Agència de notícies</string>
+	<string name="poi_newsagent_shop">Quiosc</string>
 	<string name="poi_second_hand">Botiga de segona mà</string>
 	<string name="poi_electronics_shop">Botiga d\'electrodomèstics</string>
 	<string name="poi_police">Policia</string>
@@ -110,4 +110,5 @@
 	<string name="poi_public_transport_platform_tram">Parada de tramvia</string>
 	<string name="poi_tram_stop">Parada de tramvia (obsolet)</string>
 	<string name="poi_public_transport_station">Estació de transport públic</string>
+	<string name="poi_mine_historic">Mina històrica</string>
 	</resources>

OsmAnd/res/values-da/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
     <string name="av_def_action_video">Optag video</string>
     <string name="av_def_action_audio">Optag audio</string>
@@ -745,7 +745,7 @@
 	<string name="map_overlay_descr">Vælg kort til overlejring</string>
 	<string name="tile_source_already_installed">Kort er allerede installeret, indstillinger bliver opdateret</string>
 	<string name="select_tile_source_to_install">Vælg (del)kort der skal installeres eller opdateres</string>
-	<string name="internet_not_available">Internetforbindelse er nødvendig for handlingen, men er ikke tilgængelig</string>
+	<string name="internet_not_available">En internetforbindelse er nødvendig for handlingen, men er ikke tilgængelig</string>
 	<string name="install_more">Installer flere…</string>
 	<string name="level_to_switch_vector_raster_descr">Minimum zoomniveau for at bruge vektorkort</string>
 	<string name="level_to_switch_vector_raster">Min. vektor zoomniveau</string>
@@ -1851,7 +1851,7 @@
     <string name="use_opengl_render_descr">Brug hardware accelereret OpenGL optegning (virker muligvis ikke på alle enheder)</string>
     <string name="everything_up_to_date">Alt er opdateret</string>
     <string name="dismiss">Afvis</string>
-    <string name="no_internet_connection">Ikke muligt at hente. Opret forbindelse til WiFi for at fortsætte.</string>
+    <string name="no_internet_connection">Ikke muligt at hente, kontroller internetforbindelsen.</string>
     <string name="download_tab_downloads">Hent</string>
     <string name="download_tab_updates">Opdater</string>
     <string name="download_tab_local">Lokal</string>
@@ -1868,10 +1868,10 @@
 	<string name="rendering_attr_roadStyle_name">Vejstil</string>
     <string name="rendering_value_default_name">Standard</string>
     <string name="rendering_value_orange_name">Orange</string>
-    <string name="rendering_value_germanRoadAtlas_name">Tysk vejatlas</string>
+    <string name="rendering_value_germanRoadAtlas_name">Tysk vejkort</string>
-    <string name="rendering_value_americanRoadAtlas_name">Amerikansk vejatlas</string>
+    <string name="rendering_value_americanRoadAtlas_name">Amerikansk vejkort</string>
-    <string name="routing_attr_no_new_routing_name">Ver.1.9 routing</string>
+    <string name="routing_attr_no_new_routing_name">Ingen v1.9 routing regler</string>
-    <string name="routing_attr_no_new_routing_description">Brug ikke v1.9 routing</string>
+    <string name="routing_attr_no_new_routing_description">Brug ikke routing regler indført i v1.9</string>
     <string name="traffic_warning_railways">Jernbaner</string>
 	<string name="traffic_warning_pedestrian">Fodgænger</string>
 	<string name="show_railway_warnings">Jernbaneadvarsler</string>

OsmAnd/res/values-de/strings.xml

@@ -2046,5 +2046,5 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="show_pedestrian_warnings">Fußgänger-Übergänge anzeigen</string>
     <string name="rendering_value_americanRoadAtlas_name">Amerikanischer Straßenatlas</string>
     <string name="routing_attr_no_new_routing_name">Routing v1.9 nicht verwenden</string>
-    <string name="routing_attr_no_new_routing_description">Neue Routenberechnung nicht verwenden</string>
+    <string name="routing_attr_no_new_routing_description">Keine Routenberechnung nach dem neuen Algorithmus</string>
     </resources>

OsmAnd/res/values-es/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   
   <string name="layer_map_appearance">Configura pantalla</string>
@@ -246,7 +246,7 @@
   <string name="map_overlay_descr">Elige el mapa superpuesto</string>
   <string name="tile_source_already_installed">El mapa ya está instalado, se actualizarán las opciones</string>
   <string name="select_tile_source_to_install">Seleccione mapas (teselas) a instalar o actualizar</string>
-  <string name="internet_not_available">No está disponible la conexión a Internet que se necesita para la operación</string>
+  <string name="internet_not_available">Se necesita una conexión a Internet para esta operación pero no está disponible</string>
   <string name="install_more">Instalar más…</string>
   <string name="tip_update_index">Actualizar mapas descargados</string>
   <string name="tip_update_index_t">"Es esencial tener datos de mapa actualizados tanto para visualización de mapas, búsqueda de direcciones/PDI y navegación sin conexión. OsmAnd proporciona un gestor de mapas para descargar estos mapas (y otros archivos de datos) y comprobar las actualizaciones disponibles.
@@ -1261,7 +1261,7 @@ La lista de países incluídos (¡básicamente todo el mundo!): Afganistán, Alb
     <string name="cancel_route">Descartar ruta</string>
     <string name="cancel_navigation">Parar navegación</string>
     <string name="clear_destination">Borrar destino</string>
-    <string name="download_using_mobile_internet">Actualmente WiFi no está conectado. ¿Desea continuar la descarga con la conexión actual a Internet?</string>
+    <string name="download_using_mobile_internet">El Wi-Fi no está conectado en este momento. ¿Desea usar la conexión actual a Internet para descargar?</string>
     <string name="local_indexes_cat_srtm">Datos de curvas de nivel</string>
     <string name="wait_current_task_finished">Por favor, espera hasta que termine la tarea actual</string>
     <string name="downloading_file_new">Descargando…</string>
@@ -1731,7 +1731,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="none_selected_gpx">No hay archivos GPX seleccionados. Para seleccionar presione y mantenga presionado en la traza disponible.</string>
     <string name="local_index_unselect_gpx_file">No seleccionado</string>
     <string name="local_index_select_gpx_file">Seleccionar para mostrar</string>
-    <string name="no_index_file_to_download">No hay nada que descargar, compruebe la conexión a Internet.</string>
+    <string name="no_index_file_to_download">No se han encontrado descargas, comprueba tu conexión a Internet.</string>
     <string name="rendering_attr_hideBuildings_name">Ocultar edificios</string>
     <string name="rendering_attr_hideNonVehicleHighways_name">Ocultar vías no aptas para vehículos</string>
     <string name="rendering_attr_hideText_name">Ocultar textos</string>
@@ -1872,7 +1872,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="rendering_attr_busRoutes_name">Rutas de autobús</string>
     <string name="rendering_category_hide">Ocultar</string>
     <string name="wake_on_voice">Encender pantalla</string>
-    <string name="wake_on_voice_descr">Encender la pantalla al aproximarse a un giro</string>
+    <string name="wake_on_voice_descr">Encender la pantalla del dispositivo al aproximarse a un giro</string>
     <string name="lock_screen_request_explanation">%1$s necesita este permiso para apagar la pantalla para la característica de ahorro energético.</string>
     <string name="wake_on_voice_never">Nunca</string>
     <string name="advanced_settings">Avanzado</string>
@@ -1889,7 +1889,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="error_avoid_specific_road">No se ha encontrado circunvalación</string>
     <string name="everything_up_to_date">Todos los archivos actualizados</string>
     <string name="dismiss">Descartar</string>
-    <string name="no_internet_connection">Imposible descargar. Por favor, conéctate al WiFi para proceder.</string>
+    <string name="no_internet_connection">Imposible descargar. Por favor, comprueba tu conexión a Internet.</string>
     <string name="download_tab_downloads">Todas las Descargas</string>
     <string name="download_tab_updates">Actualizaciones</string>
     <string name="download_tab_local">Local</string>

OsmAnd/res/values-fr/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="offline_edition">Modifications hors-ligne</string>
   <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
   <string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :
@@ -227,7 +227,7 @@
   <string name="voice_not_use">Non utilisé</string>
   <string name="voice_not_specified">Aucun</string>
   <string name="installing_new_resources">Dépaquetage de nouvelles données…</string>
-  <string name="internet_connection_required_for_online_route">Vous avez sélectionné un moteur de calcul d\'itinéraire en ligne, mais vous n\'avez pas de connexion internet.</string>
+  <string name="internet_connection_required_for_online_route">Vous avez sélectionné un moteur de calcul d\'itinéraire en ligne, mais vous n\'avez pas de connexion Internet.</string>
   <string name="tts_language_not_supported_title">Langue non disponible</string>
   <string name="tts_language_not_supported">La langue sélectionnée n\'est pas disponible dans le moteur de synthèse vocale installé. Voulez-vous allez sur le Market et chercher d\'autres moteurs de synthèse vocale ? Sinon la langue par défaut sera utilisée.</string>
   <string name="tts_missing_language_data_title">Données manquantes</string>
@@ -257,7 +257,7 @@
   <string name="map_overlay_descr">Choisir la carte en sur-couche</string>
   <string name="tile_source_already_installed">Carte déjà installée, paramètres seront mis à jour</string>
   <string name="select_tile_source_to_install">Sélectionnez les cartes à installer ou mettre à jour</string>
-  <string name="internet_not_available">Connexion Internet nécessaire pour cette opération non disponible</string>
+  <string name="internet_not_available">Une connexion Internet est nécessaire pour cette opération mais est indisponible</string>
   <string name="install_more">Installer d\'autres langues …</string>
   <string name="tip_update_index">Mise à jour des cartes hors-ligne</string>
   <string name="tip_update_index_t">"Il est très important d\'avoir des données cartographiques à jour pour la visualisation des cartes hors-ligne, la recherche de points d\'intérêt ou d\'adresses, et la navigation hors-ligne. OsmAnd fournit un gestionnaire de données qui permet de télécharger ces cartes hors-ligne (et d\'autres données), et de vérifier si des mises à jour sont disponibles.
@@ -1292,7 +1292,7 @@ Couverture géographique et qualité :
 Liste des pays pris en charge (pratiquement le monde entier !) :
 Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et-Barbuda, Argentine, Arménie, Aruba, Australie, Autriche, Azerbaïdjan, Bahamas, Bahreïn, Bangladesh, Barbade, Bélarus, Belgique, Belize, Bénin, Bermudes, Bhoutan, Bolivie, Bonaire, Bosnie-Herzégovine, Botswana, Brésil, Îles Vierges britanniques, Brunei, Bulgarie, Burkina Faso, Burundi, Cambodge, Cameroun, Canada, Cap-Vert, République centrafricaine, Tchad, Chili, Chine, Colombie, Comores, Congo, Costa Rica , Côte d\'Ivoire, Croatie, Cuba, Curaçao, Chypre, République tchèque, Danemark, Djibouti, Dominique, République dominicaine, Équateur, Égypte, Érythrée, Espagne, Estonie, Éthiopie, Fidji, Finlande, France, Gabon, Gambie, Géorgie, Ghana, Gibraltar, Grèce, Groenland, Grenade, Guadeloupe, Guam, Guatemala, Guernsey, Guinée, Guinée-Bissau, Guinée équatoriale, Guyana, Guyane française, Haïti, Vatican, Honduras, Hong Kong, Hongrie, Islande, Inde , Indonésie, Iran, Irak, Irlande, Île de Man, Israël, Italie, Jamaïque, Japon, Jersey, Jordanie, Kazakhstan, Kenya, Kiribati, Corée du Nord et Corée du Sud, Koweït, Kirghizistan, Laos, Lettonie, Liban, Lesotho, Libéria , Libye, Liechtenstein, Lituanie, Luxembourg, Macao, Macédoine, Madagascar, Malaisie, Malawi, Maldives, Mali, Malte, Martinique, Maurice, Mauritanie, Mayotte, Mexique, Micronésie, Moldavie, Monaco, Mongolie, Monténégro, Montserrat, Maroc, Mozambique , Myanmar, Namibie, Nauru, Népal, Pays-Bas, les Antilles néerlandaises, Nicaragua, Niger, Nigéria, Norvège, Nouvelle-Calédonie, Nouvelle-Zélande, Oman, Pakistan, Palau, Territoire palestinien, Panama, Papouasie-Nouvelle-Guinée, Paraguay, Pérou, Philippines, Pologne , Portugal, Polynésie française, Puerto Rico, Qatar, Roumanie, Russie, Rwanda, Sahara occidental, Saint-Barthélemy, Sainte-Hélène, Saint-Kitts-et-Nevis, Sainte-Lucie, Saint-Marin, Saint-Martin, Saint-Pierre-et-Miquelon, Saint-Vincent-et-les Grenadines, Samoa, Salvador, Arabie saoudite, Sénégal, Serbie, Seychelles, Sierra Leone, Singapour, Slovaquie, Slovénie, Somalie, Afrique du Sud, Géorgie du Sud, Soudan du Sud, Sri Lanka, Soudan, Suriname, Swaziland, Suède, Suisse, Syrie, Taiwan, Tadjikistan, Tanzanie, Thaïlande , le Timor-Leste, Togo, Tokelau, Tonga, Trinité-et-Tobago, Tunisie, Turkménistan, Turquie, Tuvalu, Ouganda, Ukraine, Émirats arabes unis, Royaume-Uni (UK), États-Unis d\'Amérique (USA), Uruguay, Ouzbékistan, Vanuatu , Venezuela, Vietnam, Wallis et Futuna, Yémen, Zambie, Zimbabwe.
 	</string>
-	<string name="download_using_mobile_internet">Le WiFi n\\\'est pas activé en ce moment. Voulez-vous continuer le téléchargement avec la connexion actuelle ?</string>
+	<string name="download_using_mobile_internet">Le WiFi n\'est pas activé. Voulez-vous effectuer le téléchargement avec la connexion Internet actuelle ?</string>
     <string name="cancel_route">Arrêter la navigation</string>
     <string name="cancel_navigation">Arrêter la navigation</string>
     <string name="clear_destination">Supprimer la destination</string>
@@ -1706,7 +1706,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="visible_element">Afficher sur la carte</string>
     <string name="sort_by_distance">Trier par distance</string>
     <string name="sort_by_name">Trier par nom</string>
-    <string name="no_index_file_to_download">Rien à télécharger, veuillez vérifier votre connexion Internet.</string>
+    <string name="no_index_file_to_download">Aucun téléchargement trouvé, veuillez vérifier votre connexion Internet.</string>
     <string name="none_selected_gpx">Aucun fichier GPX sélectionné. Pour sélectionner, presser longuement sur une trace disponible.</string>
     <string name="local_index_unselect_gpx_file">Désélectionner</string>
     <string name="local_index_select_gpx_file">Sélectionnez pour afficher</string>
@@ -1868,7 +1868,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="use_opengl_render_descr">Utiliser le rendu matériel accéléré OpenGL (cette option peut être inefficace sur certains appareils)</string>
     <string name="everything_up_to_date">Tous les fichiers sont à jour</string>
     <string name="dismiss">Ignorer</string>
-    <string name="no_internet_connection">Téléchargement impossible. Veuillez vous connecter en Wifi pour poursuivre.</string>
+    <string name="no_internet_connection">Téléchargement impossible. Veuillez vous connecter à Internet (Wifi ou données mobiles) pour poursuivre.</string>
     <string name="download_tab_downloads">Tous les téléchargements</string>
     <string name="download_tab_updates">Mises à jour</string>
     <string name="navigate_point_zone">Zone</string>
@@ -1878,7 +1878,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="map_locale">Langue pour la carte</string>
     <string name="rendering_attr_transportStops_name">Arrêts de transports en commun</string>
     <string name="voices">Guidage vocal</string>
-	<string name="dash_download_msg_none">Souhaitez-vous télécharger des cartes ?</string>
+	<string name="dash_download_msg_none">Souhaitez-vous télécharger des cartes hors-ligne ?</string>
     <string name="dash_download_msg">Vous avez téléchargé %1$s carte(s)</string>
     <string name="dash_download_new_one">Télécharger une nouvelle carte</string>
     <string name="dash_download_manage">Gérer</string>
@@ -1891,6 +1891,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="show_pedestrian_warnings">Afficher les alertes de passage piéton</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlas de routes allemandes</string>
 	<string name="rendering_value_americanRoadAtlas_name">Atlas des routes américaines</string>
-    <string name="routing_attr_no_new_routing_description">Ne pas utiliser la navigation dans sa version 1.9</string>
+    <string name="routing_attr_no_new_routing_description">Ne pas utiliser les nouvelles règles de routage de la version 1.9</string>
-    <string name="routing_attr_no_new_routing_name">Ne pas utiliser la navigation dans sa version 1.9</string>
+    <string name="routing_attr_no_new_routing_name">Ne pas utiliser la version 1.9 des calculs de route</string>
     </resources>

OsmAnd/res/values-it/phrases.xml

@@ -11,18 +11,18 @@
 	<string name="poi_bakery">Panificio</string>
 	<string name="poi_alcohol">Alcolici</string>
 	<string name="poi_convenience">Drogheria</string>
-	<string name="poi_beverages">Negozio bevande</string>
+	<string name="poi_beverages">Negozio di bevande</string>
 	<string name="poi_butcher">Macelleria</string>
 	<string name="poi_deli">Gastronomia</string>
 	<string name="poi_shop_farm">Vendita prodotti di fattoria</string>
 	<string name="poi_greengrocer">Fruttivendolo</string>
-	<string name="poi_confectionery">Negozio dolciumi</string>
+	<string name="poi_confectionery">Negozio di dolciumi</string>
 	<string name="poi_ice_cream">Gelateria</string>
 	<string name="poi_shop_tea">Negozio di té</string>
 	<string name="poi_dairy">Latteria</string>
 	<string name="poi_antiques_shop">Antiquariato</string>
 	<string name="poi_art_shop">Galleria</string>
-	<string name="poi_baby_goods">Negozio bambini</string>
+	<string name="poi_baby_goods">Articoli per l\'infanzia</string>
 	<string name="poi_bag_shop">Valigeria</string>
 	<string name="poi_bathroom_furnishing_shop">Arredo bagno</string>
 	<string name="poi_bed_shop">Arredamento camera da letto</string>
@@ -40,7 +40,7 @@
 	<string name="poi_doityourself_shop">Negozio per fai-da-te</string>
 	<string name="poi_erotic_shop">Sexy shop</string>
 	<string name="poi_fishing_shop">Negozio pesca</string>
-	<string name="poi_florist">Fioreria-fiorista</string>
+	<string name="poi_florist">Fioreria / fiorista</string>
 	<string name="poi_frame_shop">Cornici</string>
 	<string name="poi_furniture_shop">Negozio mobili</string>
 	<string name="poi_garden_centre">Articoli per Giardinaggio</string>
@@ -52,7 +52,7 @@
 	<string name="poi_lift_gate">Ponte levatoio</string>
 	<string name="poi_traffic_calming_bump">Dosso</string>
 	<string name="poi_traffic_calming_chicane">Chicane</string>
-	<string name="poi_traffic_calming_rumble_strip">Striscie rallentatrici</string>
+	<string name="poi_traffic_calming_rumble_strip">Strisce rallentatrici</string>
 	<string name="poi_car_repair">Autoriparatore</string>
 	<string name="poi_service_tyres">Gommista</string>
 	<string name="poi_vehicle_inspection">Centro revisioni</string>
@@ -79,14 +79,14 @@
 	<string name="poi_bicycle_parking">Parcheggio bici</string>
 
 	<string name="poi_anime_shop">Negozio anime</string>
-	<string name="poi_boutique">Boutique moda</string>
+	<string name="poi_boutique">Boutique</string>
 	<string name="poi_general_shop">Emporio</string>
 	<string name="poi_gift_shop">Negozio regali</string>
 	<string name="poi_glaziery_shop">Vetreria</string>
 	<string name="poi_hardware_shop">Ferramenta</string>
 	<string name="poi_hearing_aids_shop">Negozi apparecchi acustici</string>
 	<string name="poi_herbalist">Negozio erba</string>
-	<string name="poi_hifi_shop">Negozio HiFi</string>
+	<string name="poi_hifi_shop">Negozio di HiFi</string>
 	<string name="poi_hunting_shop">Negozio caccia-pesca</string>
 	<string name="poi_interior_decoration_shop">Negozio decorazione d\'interni</string>
 	<string name="poi_jewelry_shop">Gioielleria</string>
@@ -204,7 +204,7 @@
 	<string name="poi_healthcare_centre">Centro medico</string>
 	<string name="poi_midwife">Levatrice</string>
 	<string name="poi_optometrist">Optometrista</string>
-	<string name="poi_physiotherapist">Fisioterpista</string>
+	<string name="poi_physiotherapist">Fisioterapista</string>
 	<string name="poi_psychotherapist">Psicoterapeuta</string>
 	<string name="poi_speech_therapist">Logopedista</string>
 	<string name="poi_insurance">Assicurazione</string>
@@ -356,7 +356,7 @@
 	<string name="poi_tram_stop">Fermata tram (absoleta)</string>
 	<string name="poi_aeroway_terminal">Terminal aeroporto</string>
 	<string name="poi_slipway">Scivolo</string>
-	<string name="poi_ferry_terminal">Terminal traghetto</string>
+	<string name="poi_ferry_terminal">Terminal traghetti</string>
 	<string name="poi_lighthouse">Faro</string>
 
 	<string name="poi_aerialway_station">Stazione skilift</string>
@@ -426,8 +426,8 @@
 	<string name="poi_club_chess">Club scacchistico</string>
 	<string name="poi_club_cinema">Club cinefili</string>
 	<string name="poi_club_fan">Fan club</string>
-	<string name="poi_club_fishing">Club pesca</string>
+	<string name="poi_club_fishing">Club di pesca</string>
-	<string name="poi_club_veterans">Club veterani</string>
+	<string name="poi_club_veterans">Club di veterani</string>
 	<string name="poi_club_linux">Club Linux Lug</string>
 	<string name="poi_club_theatre">Club teatrale</string>
 	<string name="poi_club_photography">Club fotografico</string>
@@ -514,4 +514,43 @@
 	<string name="poi_telecommunication_office">Ufficio telecomunicazioni</string>
 	<string name="poi_american_football">Football americano</string>
 	<string name="poi_bmx_sport">BMX</string>
+	<string name="poi_taxi">Posteggio taxi</string>
+
+	<string name="poi_motorway_junction">Svincolo autostradale</string>
+
+	<string name="poi_customs">Dogana</string>
+	<string name="poi_podiatrist">Podologo</string>
+	<string name="poi_company">Azienda</string>
+	<string name="poi_lawyer">Avvocato</string>
+	<string name="poi_golf_course">Campo da golf</string>
+	<string name="poi_horse_track">Ippodromo</string>
+	<string name="poi_9pin">Bowling a nove birilli</string>
+	<string name="poi_10pin">Bowling a dieci birilli</string>
+	<string name="poi_climbing">Arrampicata</string>
+	<string name="poi_croquet">Croquet</string>
+	<string name="poi_scuba_diving">Immersioni subacquee</string>
+	<string name="poi_ice_stock">Stock sport</string>
+	<string name="poi_korfbal">Korfball</string>
+	<string name="poi_orienteering">Orientamento</string>
+	<string name="poi_paddle_tennis">Paddle tennis</string>
+	<string name="poi_surfing">Surf</string>
+	<string name="poi_artwork">Opera d\'arte</string>
+	<string name="poi_cannon">Cannone storico</string>
+	<string name="poi_ferris_wheel">Ruota panoramica</string>
+	<string name="poi_carousel">Giostra</string>
+	<string name="poi_maze">Labirinto</string>
+	<string name="poi_roller_coaster">Montagne russe</string>
+	<string name="poi_summer_toboggan">Toboga estivo</string>
+	<string name="poi_place_of_worship_jewish">Luogo di culto: ebreo</string>
+	<string name="poi_geyser">Geyser</string>
+	<string name="poi_arts_centre">Centro artistico</string>
+	<string name="poi_fishing_place">Postazione di pesca</string>
+	<string name="poi_harbour">Porto</string>
+	<string name="poi_biergarten">Biergarten</string>
+	<string name="poi_agricultural_engines_craft">Motori agricoli</string>
+	<string name="poi_basket_maker">Cestaio</string>
+	<string name="poi_cape">Capo</string>
+	<string name="poi_strait">Stretto</string>
+	<string name="poi_seamark_anchorage">Ancoraggio</string>
+	<string name="poi_seamark_harbour">Porto</string>
 	</resources>

OsmAnd/res/values-it/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
   <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
   <string name="offline_edition">Modifiche offline</string>
@@ -252,7 +252,7 @@
   <string name="map_overlay_descr">Scegli la mappa sovrapposta</string>
   <string name="tile_source_already_installed">La mappa è già installata, le impostazioni verranno aggiornate</string>
   <string name="select_tile_source_to_install">Seleziona le mappe (mattonella) da installare o aggiornare</string>
-  <string name="internet_not_available">La connessione internet è richiesta per questa operazione ma non è disponibile</string>
+  <string name="internet_not_available">Una connessione internet è richiesta per questa operazione ma non è disponibile</string>
   <string name="install_more">Installa altro…</string>
   <string name="tip_update_index">Aggiornamento Mappe Offline</string>
   <string name="tip_update_index_t">"Mappe aggiornate aggiornati sono essenziali per la visione offline delle mappe, la ricerca dei PDI/indirizzi e la navigazione offline. OsmAnd fornisce un gestore delle mappe che le scarica e le rende disponibili offline e inoltre può controllare la disponibilità di aggiornamenti.
@@ -1079,27 +1079,7 @@
 →
 	</string>
 <string name="osmand_plus_short_description_80_chars">Visualizzazione &amp; navigazione mobile con le mappe mondiali OSM online e offline</string>
-<string name="osmand_plus_long_description_1000_chars">
+<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automatizzate Navigazione e Direzioni) OsmAnd+ è un\'applicazione di navigazione open source con accesso a una grande varietà di dati mondiali di OpenStreetMap (OSM). Tutte le mappe (vettoriali o a tasselli) possono essere memorizzate nella scheda di memoria del telefono per essere utilizzate offline. OsmAnd offre anche la funzionalità di calcolo dell\'itinerario sia online che offline, compresa la voce guida svolta per svolta. OsmAnd+ è la versione a pagamento, tramite l\'acquisto dell\'applicazione sostieni il progetto, finanzi lo sviluppo di nuove funzionalità, e ricevi gli ultimi aggiornamenti. Alcune delle caratteristiche principali: - Funzionalità completa anche disconnessi dalla rete (conserva le mappe vettoriali o a tasselli in una cartella selezionabile) - Mappe vettoriali offline compatte per tutto il mondo a disposizione - Scarica le mappe delle nazioni o delle regioni direttamente dall\'applicazione, senza limiti - Wikipedia Offline (scarica i PDI Wikipedia), ottimo per i giri turistici - Possibilità di sovrapposizione di diversi strati, come tracce GPX o di navigazione, punti di interesse, preferiti, curve di livello, fermate dei mezzi pubblici, mappe aggiuntive con trasparenza personalizzabile - Ricerca offline per indirizzi e luoghi (PDI) - Calcolo del percorso per brevi distanze (sperimentale) - Modalità automobile, bicicletta e pedonale con: - commutazione opzionale automatica della vista giorno/notte - zoom automatico opzionale in base alla velocità - allineamento della mappa in base alla direzione o alla bussola - opzionali indicazione di corsia, indicazione del limite di velocità, voci registrate e TTS "</string>
-		OsmAnd+ (OSM Automatizzate Navigazione e Direzioni)
-
-		OsmAnd+ è un\'applicazione di navigazione open source con accesso a una grande varietà di dati mondiali di OpenStreetMap (OSM). Tutte le mappe (vettoriali o a tasselli) possono essere memorizzate nella scheda di memoria del telefono per essere utilizzate offline. OsmAnd offre anche la funzionalità di calcolo dell\'itinerario sia online che offline, compresa la voce guida svolta per svolta.
-
-		OsmANd+ è la versione a pagamento, tramite l\'acquisto dell\'applicazione sostieni il progetto, finanzi lo sviluppo di nuove funzionalità, e ricevi gli ultimi aggiornamenti.
-
-		Alcune delle caratteristiche principali:
-		- Funzionalità completa anche disconnessi dalla rete (conserva le mappe vettoriali o a tasselli in una cartella selezionabile)
-		- Mappe vettoriali offline compatte per tutto il mondo a disposizione
-		- Scarica le mappe delle nazioni o delle regioni direttamente dall\'applicazione, senza limiti
-		- Wikipedia Offline (scarica i PDI Wikipedia), ottimo per i giri turistici
-		- Possibilità di sovrapposizione di diversi strati, come tracce GPX o di navigazione, punti di interesse, preferiti, curve di livello, fermate dei mezzi pubblici, mappe aggiuntive con trasparenza personalizzabile
-		- Ricerca offline per indirizzi e luoghi (PDI)
-		- Calcolo del percorso per brevi distanze (sperimentale)
-		- Modalità automobile, bicicletta e pedonale con:
-		- commutazione opzionale automatica della vista giorno/notte
-		- zoom automatico opzionale in base alla velocità
-		- allineamento della mappa in base alla direzione o alla bussola
-		- opzionali indicazione di corsia, indicazione del limite di velocità, voci registrate e TTS
-	</string>
 <string name="tip_recent_changes_0_8_3_t">Novità nella versione 0.8.3:
 	\n\t* Punti intermedi
 	\n\t* Migliorata la guida dell\'itinerario
@@ -1880,7 +1860,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="local_index_unselect_gpx_file">Deseleziona</string>
     <string name="local_index_select_gpx_file">Seleziona per visualizzarlo</string>
     <string name="route_descr_destination">Destinazione</string>
-    <string name="no_index_file_to_download">Nulla da scaricare, per favore controllare la connessione internet.</string>
+    <string name="no_index_file_to_download">Niente da scaricare, per favore controllare la connessione internet.</string>
     <string name="osmo_gpx_points_downloaded">Scaricati %1$s punti OsMo.</string>
     <string name="osmo_auto_connect_descr">Connettiti al servizio automaticamente dopo l\'accensione</string>
     <string name="osmo_auto_connect">Connesione automatica</string>
@@ -2026,19 +2006,19 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="lock_screen_request_explanation">%1$s necessita di questa autorizzazione per spegnere lo schermo per la funzionalità di risparmio energetico.</string>
     <string name="advanced_settings">Avanzato</string>
 	<string name="osmo_use_https">Usa HTTPS</string>
-	<string name="osmo_use_https_descr">Usa la connessione sicura con il server</string>
+	<string name="osmo_use_https_descr">Usa la connessione sicura al server</string>
     <string name="show_all">MOSTRA TUTTO</string>
 	<string name="coordinates">Coordinate</string>
 	<string name="home_button">Schermata iniziale</string>
-    <string name="map_update">Hai %1$s mappe aggiornabili</string>
+    <string name="map_update">Ci sono %1$s aggiornamenti per le mappe</string>
 	<string name="search_for">Cerca</string>
 	<string name="show_map">MOSTRA LA MAPPA</string>
-	<string name="error_avoid_specific_road">Non è stata trovata una strada nelle vicinanze</string>
+	<string name="error_avoid_specific_road">Nessuna alternativa trovata</string>
     <string name="use_opengl_render">Utilizzare il rendering OpenGL</string>
     <string name="use_opengl_render_descr">Utilizzare il rendering OpenGL accelerato via hardware (potrebbe non funzionare in alcuni dispositivi)</string>
-    <string name="everything_up_to_date">Tutto aggiornato</string>
+    <string name="everything_up_to_date">Tutti i file sono aggiornati</string>
     <string name="dismiss">Tralascia</string>
-    <string name="no_internet_connection">Non è possibile scaricare. Prego, connettersi al Wi-Fi per procedere.</string>
+    <string name="no_internet_connection">Non è possibile scaricare. Prego, verifica la connessione a internet.</string>
     <string name="download_tab_downloads">Tutti i download</string>
     <string name="download_tab_updates">Aggiornabili</string>
     <string name="download_tab_local">Nel dispositivo</string>
@@ -2048,8 +2028,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="map_locale">Lingua della mappa</string>
     <string name="rendering_attr_transportStops_name">Fermate mezzi pubblici</string>
     <string name="voices">Annunci vocali</string>
-	<string name="dash_download_msg_none">Vuoi scaricare una mappa offline?</string>
+	<string name="dash_download_msg_none">Vuoi scaricare delle mappe offline?</string>
-    <string name="dash_download_msg">Hai %1$s mappe scaricate</string>
+    <string name="dash_download_msg">Hai scaricato %1$s mappe</string>
     <string name="dash_download_new_one">Scarica una nuova mappa</string>
     <string name="dash_download_manage">Gestisci</string>
     <string name="rendering_attr_roadStyle_name">Stile disegno delle strade</string>
@@ -2061,6 +2041,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="routing_attr_no_new_routing_description">Non usare il calcolo del percorso v1.9</string>
     <string name="traffic_warning_railways">Ferrovie</string>
 	<string name="traffic_warning_pedestrian">Pedonale</string>
-	<string name="show_railway_warnings">Mostra gli avvisi ferroviari</string>
+	<string name="show_railway_warnings">Mostra i passaggi a livello</string>
-	<string name="show_pedestrian_warnings">Mostra gli avvisi pedonali</string>
+	<string name="show_pedestrian_warnings">Mostra gli attraversamenti pedonali</string>
     </resources>

OsmAnd/res/values-ko/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
 	
 	<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
@@ -323,7 +323,7 @@
 \n\t- UI 개선 및 큰 버그 수정 "</string>
 	<string name="voice_not_use">사용하지 않음</string>
 	<string name="installing_new_resources">새로운 데이터 풀기(Unpacking)…</string>
-	<string name="internet_connection_required_for_online_route">온라인 라우팅 서비스가 선택되었지만 인터넷 연결을 할 수 없습니다.</string>
+	<string name="internet_connection_required_for_online_route">온라인 라우팅 서비스가 선택되었지만 인터넷이 연결되지 않았습니다.</string>
 	<string name="tts_language_not_supported_title">지원되지 않은 언어</string>
 	<string name="tts_language_not_supported">선택한 언어는  설치된 안드로이드 TTS (text-to-speech) 엔진이 지원되지 않습니다. 다른 TTS 엔진을 찾기 위해 구글마켓으로 가시겠습니까? 아니면 미리설정된 TTS 언어가 사용될 것입니다.</string>
 	<string name="tts_missing_language_data_title">누락된 데이터</string>
@@ -355,7 +355,7 @@
 	<string name="map_overlay_descr">오버레이 맵을 선택합니다</string>
 	<string name="tile_source_already_installed">맵이 이미 설치되어, 설정이 업데이트될 것입니다</string>
 	<string name="select_tile_source_to_install">설치할 또는 업데이트할 (타일) 맵을 선택합니다</string>
-	<string name="internet_not_available">동작에 필요한 인터넷 연결이 되지 않습니다</string>
+	<string name="internet_not_available">인터넷 연결이 필요하지만 연결되지 않았습니다</string>
 	<string name="install_more">추가 설치…</string>
 
 	<string name="tip_update_index">오프라인 지도 업데이트중</string>
@@ -1116,7 +1116,7 @@
     <string name="cancel_route">경로 해제</string>
     <string name="cancel_navigation">운행 중지</string>
     <string name="clear_destination">목적지 지우기</string>
-    <string name="download_using_mobile_internet">현재 와이파이가 연결되어 있지 않습니다. 현재의 인터넷 연결(3G)을 통해서 계속 다운로드 하시겠습니까?</string>
+    <string name="download_using_mobile_internet">현재 와이파이(WiFi)가 연결되어 있지 않습니다. 현재의 인터넷 연결(3G)을 통해서 계속 다운로드 하시겠습니까?</string>
     <string name="street_name">거리</string>
 	<string name="hno">주택 수</string>
     <string name="tip_recent_changes_1_3_t">버전 1.3 의 변경 사항 :
@@ -1650,22 +1650,23 @@
 \n\t* 아랍어, 칸나다어 스크립트와 RTL (오른쪽에서 작성) 언어 수정 "</string>
 	<string name="osmand_extended_description_4000_chars">" OsmAnd 은 전세계에 무료로, 고품질의 OpenStreetMap 데이터에 액세스가 가능한 지도 및 운행 앱입니다.
 \n모든 지도 데이터를 오프라인으로 사용할수 있도록 메모리 카드에 저장할 수 있습니다. 장치의 GPS 를 통해,
-\nOsmAnd 는 자동차, 자전거 및 보행자을 위한 광센서 및 음성 안내와 함께 라우팅(길찾기)을 제공합니다. 모든 주요 기능은 온라인과 오프라인(인터넷연결 필요없음)에서 모두 작동합니다.
+\nOsmAnd 는 자동차, 자전거 및 보행자를 위한 광센서 및 음성 안내와 함께 라우팅(길찾기)을 제공합니다.
+\n모든 주요 기능은 온라인과 오프라인에서 모두 작동합니다.
 \nOsmAnd+ 는 유료 버전 앱입니다.
 \nOsmAnd+ 를 구입하므로써 새로운 기능의 프로젝트와 개발을 지원하게 됩니다.
 \n\n주요 기능 중 일부 :
 \n\nNavigation : 운행
-\n- 온라인 또는 오프라인 작업
+\n- 온라인 또는 오프라인으로 작업
 \n- 턴바이턴 음성안내
 \n- 선택적 길안내, 거리이름 표시, 도착예상시각 표시
-\n- 트래킹하는 동안 중간 포인트 지원
+\n- 트래킹하는 동안 중간 경유지 지원
 \n- 루트를 이탈하였을 때 자동으로 길찾기 재실행
-\n- 주소 또는 좌표로 장소를 검색(또는 레스토랑, 호텔, 주유소, 박물관 등등)
+\n- 주소 또는 좌표로 장소를 검색 (또는 레스토랑, 호텔, 주유소, 박물관 등등)
 \n\nMap Viewing :지도 보기
 \n- 지도에 현재위치와 방향을 표시
 \n- 선택적으로 나침반 또는 GPS로 진행방향를 지도에 표시 가능
 \n- 즐겨찾기로 중요한 장소를 저장하기
-\n- 주의에 있는 POI를 표시하기
+\n- 주위에 있는 POI를 표시하기
 \n- 특정 온라인 타일맵 표시하기
 \n- 위성지도(Bing) 보기
 \n- 다른 오버레이 지도 표시
@@ -1927,7 +1928,7 @@
     <string name="sort_by_name">이름으로 정렬</string>
     <string name="visible_element">지도에서 보기</string>
     <string name="route_descr_destination">목적지</string>
-    <string name="no_index_file_to_download">아무것도 다운로드 되지 않았다면, 인터넷 연결을 확인 하십시오.</string>
+    <string name="no_index_file_to_download">다운로드 되지 않았습니다, 인터넷 연결을 체크하세요.</string>
     <string name="osmo_auth_error_short">인증 실패</string>
     <string name="osmo_auth_error">OsMo 인증 오류가 발생 했습니다: %1$s.\n임시로 서비스가 다운되었거나 또는 등록 만료가 되었습니다.\n신규 등록을 진행 하시겠습니까?</string>
     <string name="osmo_group_by_invite">메시지를 입력하세요</string>
@@ -2094,7 +2095,7 @@
     <string name="use_opengl_render_descr">하드웨어로 가속된 OpenGL 렌더링 사용 (일부 장치에는 작동 하지 않을 수 있습니다)</string>
     <string name="dismiss">해제</string>
     <string name="everything_up_to_date">모든 파일 업데이트</string>
-    <string name="no_internet_connection">다운로드가 불가능 합니다. WiFi를 연결하여 진행해 주시기 바랍니다.</string>
+    <string name="no_internet_connection">다운로드가 불가능 합니다. 인터넷 연결을 체크해 주세요.</string>
     <string name="navigate_point_zone">존(지역)</string>
     <string name="navigate_point_northing">북향</string>
     <string name="navigate_point_easting">동향</string>
@@ -2113,8 +2114,8 @@
     <string name="rendering_value_orange_name">오렌지</string>
     <string name="rendering_value_germanRoadAtlas_name">독일 도로 지도</string>
     <string name="rendering_value_americanRoadAtlas_name">미국 도로 지도</string>
-    <string name="routing_attr_no_new_routing_name">V1.9 라우팅을 사용하지 마십시오</string>
+    <string name="routing_attr_no_new_routing_name">No v1.9 라우팅 룰</string>
-    <string name="routing_attr_no_new_routing_description">V1.9 라우팅을 사용하지 마십시오</string>
+    <string name="routing_attr_no_new_routing_description">v1.9에서 도입된 라우팅 룰을 사용하지 마십시오</string>
     <string name="traffic_warning_railways">철도</string>
 	<string name="traffic_warning_pedestrian">보행자</string>
 	<string name="show_railway_warnings">철도 경고 표시</string>

OsmAnd/res/values-large/sizes.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dashHeaderHeight">60dp</dimen>
+    <dimen name="subHeaderPadding">3dp</dimen>
+    <dimen name="subHeaderMarginLeft">22dp</dimen>
+    <dimen name="showAllButtonMarginRight">21dp</dimen>
+    <dimen name="showAllButtonHeight">54dp</dimen>
+    <dimen name="dashListItemHeight">75dp</dimen>
+    <dimen name="dashFavIconSize">42dp</dimen>
+    <dimen name="dashFavIconMargin">18dp</dimen>
+    <dimen name="dashFavDirectionSize">15dp</dimen>
+    <dimen name="dashMapHeight">165dp</dimen>
+    <dimen name="dashMapMargin">3dp</dimen>
+    <dimen name="dashProgressTextSize">27sp</dimen>
+    <dimen name="dashNoteIconSize">42dp</dimen>
+    <dimen name="dashPluginPadding">6dp</dimen>
+    <dimen name="dashPluginMargin">12dp</dimen>
+    <dimen name="dashSearchBtnHeight">135dp</dimen>
+    <dimen name="dashSearchPaddingTop">25dp</dimen>
+    <dimen name="dashSearchPaddingBot">15dp</dimen>
+    <dimen name="dashPadding">9dp</dimen>
+    <dimen name="dashAboutTextSize">30sp</dimen>
+    <dimen name="dashCardMargin">6dp</dimen>
+
+    <!-- TextSizes -->
+    <dimen name="showAllButtonTextSize">18sp</dimen>
+    <dimen name="subHeaderTextSize">21sp</dimen>
+    <dimen name="dashFavNameTextSize">24sp</dimen>
+</resources>

OsmAnd/res/values-lt/strings.xml

@@ -1283,7 +1283,7 @@
     <string name="cancel_route">Atšaukti maršrutą</string>
     <string name="cancel_navigation">Stabdyti navigaciją</string>
     <string name="clear_destination">Išvalyti tikslą</string>
-    <string name="download_using_mobile_internet">Šiuo metu WiFi neprijungta. Ar norite tęsti siuntimąsį dabartiniu interneto ryšiu?</string>
+    <string name="download_using_mobile_internet">Šiuo metu Wi-Fi neprijungta. Ar norite tęsti siuntimąsį dabartiniu interneto ryšiu?</string>
     <string name="use_magnetic_sensor_descr">Maudoti magnetinį sensorių naudoti vietoje pokrypio sensoriaus kompaso reikšmei nustatyti</string>
     <string name="use_magnetic_sensor">Naudoti magnetinį sensorių (kompasą)</string>
     <string name="use_kalman_filter_compass_descr">Naudoti Kalmano fltrą kompaso parodymų išlyginimui</string>
@@ -1854,7 +1854,7 @@
     <string name="use_opengl_render">Naudoti OpenGL vaizdavimą</string>
     <string name="use_opengl_render_descr">Naudoti aparatinį OpenGL vaizdavimą (gali neveikti kai kurioje įrangoje)</string>
     <string name="everything_up_to_date">Viskas atnaujinta</string>
-    <string name="no_internet_connection">Parsisiųsti nepavyko. Prašome prisijungti prie Wi-Fi, jei norite tęsti.</string>
+    <string name="no_internet_connection">Parsisiųsti nepavyko. Prašome patikrinti, ar prisijungėte prie interneto.</string>
     <string name="map_locale">Žemėlapio kalba</string>
     <string name="rendering_attr_transportStops_name">Transporto stotelės</string>
     <string name="navigate_point_zone">Zona</string>

OsmAnd/res/values-lv/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
   <string name="select_plugin_to_activate">Atzīmējiet spraudni, lai to aktivizētu (varētu būt nepieciešams OsmAnd restarts)</string>
   <string name="prefs_plugins_descr">Spraudņi iespējo aplikācijas papildus funkcijas un uzstādījumus kā piemēram sekošana, enerģijas taupīšana, pieejamība un daudzas citas</string>
@@ -346,12 +346,11 @@
   <string name="tip_app_mode">Lietotāja profils</string>
   
   <string name="tip_navigation">Navigācija</string>
-  <string name="tip_navigation_t">Pirms sākt navigāciju, jums jāizvēlas galapunkts, tad nospiediet \'Izvēlne\' -&gt; \'Navigācija\' uz kartes un izvēlieties navigācijas veidu.
+  <string name="tip_navigation_t">"Pirms sākt navigāciju, jums jāizvēlas galapunkts, tad nospiediet \'Izvēlne\' -&gt; \'Navigācija\' un izvēlieties navigācijas veidu.
-		\n\nGalapunkts ir atzīmēts uz kartes kā oranžs punkts un OsmAnd rāda attālumu līdz tam and norādes.
+\n\nGalapunkts ir atzīmēts kā oranžs punkts uz kartes, līdz kuram OsmAnd rāda attālumu un norādes.
-		\n\nJūs varat izvēlēties "sākt navigāciju", kas dos jums balss instrukcijas vai "rādīt maršrutu" bez vadības.
+\n\nJūs varat izvēlēties sākt navigāciju, kas dos jums balss instrukcijas vai rādīt maršrutu bez vadības.
-		\n\nLai parādītu maršrutu no jebkura punkta uz jūsu pašreizējo atrašanās vietu, iezīmejiet punktu uz kartes un izvēlieties "norādes uz...".
+\n\nLai parādītu maršrutu no jebkura punkta uz jūsu pašreizējo atrašanās vietu, iezīmējiet punktu uz kartes un izvēlieties norādes uz....
-		\n\nJa lietosiet "norādes uz..." kopā ar "sākt navigāciju", OsmAnd pārslēgsies uz jūsu pašreizējo ātrašanās vietu, tiklīdz tā būs noteikta, kamēr "norādes uz..." kopā ar "rādīt maršrutu" tikai parādīs maršrutu no jebkura punkta, jūs esat izvēlējies, bez automātiskas kartes atjauinošanās.
+\n\nJa lietosiet norādes uz... kopā ar sākt navigāciju, OsmAnd pārslēgsies uz jūsu pašreizējo atrašanās vietu, tiklīdz tā būs noteikta, kamēr norādes uz... kopā ar rādīt maršrutu tikai parādīs maršrutu no jebkura punkta, ko jūs esat izvēlējies, bez automātiskas kartes atjaunošanās. "</string>
-	</string>
   <string name="tip_search">Meklē</string>
   <string name="tip_search_t">\tJūs variet meklēt vietas tieši kartē, pēc adreses, atrašanās vietas, kā POI, vai arī kā iepriekš definētu izlases punktu.
 \n\tNospiežot galvenajā izvēlnē \'Meklēt\' atver meklēšanas logu. Katram atrastajam ierakstam tiek piedāvātas divas iespējas: \'Izvēlēties kā galamērķi\' vai \'Rādīt kartē\'.</string>
@@ -1027,7 +1026,7 @@
 	<string name="day_night_info_description">Saullēkts: %1$s\nSaulriets: %2$s</string>
 	<string name="day_night_info">Dienas/nakts info</string>
 	<string name="map_widget_day_night">Dienas/nakts karte</string>
-	<string name="map_widget_vector_attributes">Renderēšanas attribūti:</string>
+	<string name="map_widget_vector_attributes">Renderēšanas attribūti</string>
 	<string name="map_widget_renderer">Renderēšananas veids</string>
 	<string name="int_continuosly">Nepārtraukti</string>
 	<string name="map_widget_show_destination_arrow">Rādīt mērķa virzienu</string>
@@ -1464,7 +1463,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="android_19_location_disabled">Pēc KitKat jauninājuma vecā karšu krātuve (%s) vairs nav pieejama. Vai vēlaties to nomainīt uz pieejamu vietu un pārkopēt visus failus?
 …………\n Piezīme: vecie faili netiks aiztikti.
 …………\n Piezīme: nebūs iespējams koplietot failus starp OsmAnd un OsmAnd+. </string>
-    <string name="application_dir_change_warning2">OsmAnd var mēģināt pārsūtīt failus uz jauno vietu. Vai vēlaties to darīt?</string>
+    <string name="application_dir_change_warning2">Vai kopēt OsmAnd datus uz jauno vietu? Nospiežot \'Nē\', OsmAnd izveidos jaunu datu mapi.</string>
     <string name="copying_osmand_one_file_descr">Kopē (%s) failu uz jauno vietu...</string>
     <string name="copying_osmand_files_descr">Kopē OsmAnd failus uz jauno vietu (%s)</string>
     <string name="copying_osmand_files">Kopē OsmAnd failus</string>
@@ -1803,7 +1802,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="osmo_specify_tracker_id">Lūdzu norādiet id</string>
     <string name="continue_navigation">Turpināt navigāciju</string>
     <string name="pause_navigation">Nopauzēt navigāciju</string>
-    <string name="rendering_attr_subwayMode_name">Tuneļu režīms</string>
+    <string name="rendering_attr_subwayMode_name">Metro maršruti</string>
  	<string name="keep_navigation_service">Paturēt</string>
 	<string name="gps_wake_up_timer">GPS pamošanās intervāls</string>
 	<string name="local_map_names">Vietējie nosaukumi</string>
@@ -1843,4 +1842,88 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="local_index_unselect_gpx_file">Neatzīmēt</string>
     <string name="local_index_select_gpx_file">Atzīmēt rādīšanai</string>
     <string name="visible_element">Rādīt uz kartes</string>
-    </resources>
+    <string name="rendering_value_default_name">Noklusētais</string>
+    <string name="rendering_value_orange_name">Oranžs</string>
+    <string name="rendering_value_germanRoadAtlas_name">Vāciešu ceļu karte</string>
+	<string name="traffic_warning_railways">Dzelzceļš</string>
+	<string name="traffic_warning_pedestrian">Gājēju ceļš</string>
+	<string name="show_railway_warnings">Rādīt dzelzceļa pārejas</string>
+	<string name="show_pedestrian_warnings">Rādīt gājēju pārejas</string>
+    <string name="rendering_value_americanRoadAtlas_name">Amerikāņu ceļu karte</string>
+    <string name="routing_attr_no_new_routing_name">Ne v1.9 maršruta nosacījumi</string>
+    <string name="routing_attr_no_new_routing_description">Nelietot jaunos maršruta nosacījumus, kas atrodami 1.9 versijā</string>
+    <string name="dash_download_msg_none">Vai lejupielādēt kartes telefonā?</string>
+    <string name="dash_download_msg">Lejupielādēti %1$s no kartēm</string>
+    <string name="dash_download_new_one">Lejupielādēt jaunu karti</string>
+    <string name="dash_download_manage">Pārvaldīt</string>
+    <string name="map_locale">Kartes valoda</string>
+    <string name="rendering_attr_transportStops_name">Sabiedriskā transporta pieturas</string>
+    <string name="navigate_point_zone">Zona</string>
+    <string name="navigate_point_northing">Ziemeļvirziens</string>
+    <string name="navigate_point_easting">Austrumvirziens</string>
+    <string name="download_tab_downloads">Visas lejupielādes</string>
+    <string name="download_tab_updates">Atjauninājumi</string>
+    <string name="download_tab_local">Vietējie</string>
+	<string name="no_internet_connection">Lejupielāde neizdevās, lūdzu pārbaudiet interneta savienojumu.</string>
+    <string name="dismiss">Atcelt</string>
+    <string name="everything_up_to_date">Visi faili ir atjaunoti</string>
+    <string name="use_opengl_render">Lietot OpenGL renderēšanu</string>
+    <string name="use_opengl_render_descr">Lietot iebūvēto paātrināto OpenGL renderēšanu (jābūt saderīgai ierīcei)</string>
+    <string name="error_avoid_specific_road">Apvedceļš nav atrasts</string>
+    <string name="home_button">Mājas</string>
+    <string name="osmo_use_https_descr">Lietot drošo savienojumu ar serveri</string>
+    <string name="osmo_use_https">Lietot HTTPS</string>
+	<string name="advanced_settings">Papildus</string>
+	<string name="map_update">Ir pieejami atjauninājumi %1$s kartēm</string>
+	<string name="search_for">Ko meklēt</string>
+	<string name="show_map">Rādīt karti</string>
+	<string name="show_all">Rādīt visu</string>
+	<string name="coordinates">Koordinātas</string>
+	<string name="rendering_attr_publicTransportMode_name">Autobusu, mikroautobusu un trolejbusu maršruti</string>
+	<string name="rendering_attr_tramTrainRoutes_name">Tramvaju un vilcienu maršruti</string>
+	<string name="lock_screen_request_explanation">%1$s ir nepieciešama šī atļauja, lai izslēgtu ekrānu enerģijas taupīšanai.</string>
+    <string name="wake_on_voice">Ieslēgt ekrānu</string>
+    <string name="wake_on_voice_descr">Ieslēgt ekrānu, kad tuvojas pagrieziens</string>
+    <string name="wake_on_voice_never">Nekad</string>
+    <string name="select_impassable_road">Arzīmēt kartē</string>
+    <string name="impassable_road">Izvairīties no ceļiem…</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Vilciena maršruti</string>
+    <string name="rendering_attr_tramRoutes_name">Tramvaja maršruti</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">"Kopīgot  taksometru maršrutus"</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Trolejbusu maršruti</string>
+    <string name="rendering_attr_busRoutes_name">Autobusu maršruti</string>
+    <string name="rendering_category_hide">Paslēpt</string>
+    <string name="rendering_category_routes">Maršruti</string>
+    <string name="rendering_category_details">Detaļas</string>
+    <string name="rendering_category_transport">Transports</string>
+    <string name="rendering_category_others">Citi kartes atribūti</string>
+    <string name="map_widget_appearance_rem">Atlikušie elementi</string>
+    <string name="map_widget_top">Statusa josla</string>
+	<string name="map_widget_right">Labais panelis</string>
+	<string name="map_widget_left">Kreisais panelis</string>
+    <string name="layers_category_show">Rādīt</string>
+	<string name="configure_map">Konfigurēt karti</string>
+    <string name="osmo_device_not_found">Ierīce nav atrasta</string>
+    <string name="anonymous_user">Anonīms lietotājs</string>
+    <string name="anonymous_user_hint">Anonīms lietotājs nevar pārvaldīt grupas.</string>
+    <string name="osmo_no_connection_msg">OsMo serviss nav pieejams, pārbaudiet interneta savienojumu un uzstādījumus, vairāk Twitter vietnē: https://twitter.com/OsMomobi</string>
+    <string name="logged_as">Pievienojies kā %1$s</string>
+	<string name="speed_limit_exceed">Braukšanas ātruma pieļaujamās robežas</string>
+	<string name="speed_limit_exceed_message">Pārsniedzot noteikto robežu, saņemsiet balss brīdinājumu.</string>
+	<string name="fav_point_emoticons_message">Izlases vietas vārds tika pārdēvēts uz %1$s, lai varētu saglabāt kopu ar sejiņām failā.</string>
+    <string name="print_route">Printēt maršrutu</string>
+    <string name="fav_point_dublicate">Šāds vārds izlasē jau eksistē</string>
+    <string name="fav_point_dublicate_message">Mēs pārdēvējām izlases vietas vārdu uz %1$s, lai izvairītos no vienādiem vārdiem.</string>
+    <string name="text_size_descr">Teksta lielums uz kartes.</string>
+    <string name="text_size">Teksta lielums</string>
+    <string name="traffic_warning_speed_limit">Ātruma robeža</string>
+    <string name="traffic_warning_border_control">Robežkontrole</string>
+    <string name="traffic_warning_payment">Nodevu stends</string>
+    <string name="traffic_warning_stop">STOP zīme</string>
+    <string name="traffic_warning_calming">Satiksmes intensitāte</string>
+    <string name="traffic_warning_speed_camera">Fotoradars</string>
+    <string name="traffic_warning">Satiksmes brīdinājums</string>
+	<string name="speak_favorites">Ziņot tuvumā esošas izlases vietas</string>
+	<string name="speak_poi">Ziņot tuvumā esošus POI</string>
+	<string name="way_alarms">Satiksmes brīdinājumi</string>
+	</resources>

OsmAnd/res/values-nb/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?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>
@@ -310,7 +310,7 @@
 	<string name="map_text_size">Skriftstørrelse for kart</string>
 	<string name="voice_not_use">Ikke bruk</string>
 	<string name="voice_not_specified">Ingen</string>
-	<string name="internet_connection_required_for_online_route">En nettbasert navigeringstjeneste er valgt, men ingen internett-tilkobling er tilgjengelig.</string>
+	<string name="internet_connection_required_for_online_route">En nettbasert navigeringstjeneste er valgt, men ingen internettforbindelse er tilgjengelig.</string>
 	<string name="tts_language_not_supported_title">Språk ikke støttet</string>
 	<string name="tts_language_not_supported">Det valgte språket støttes ikke av den installerte Android TTS (tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.</string>
 	<string name="tts_missing_language_data_title">Manglende data</string>
@@ -768,7 +768,7 @@
 	<string name="index_item_world_basemap">Oversiktskart (verden)</string>
     <string name="index_item_world_ski">Skikart (verden)</string>
     <string name="lang_hr">Kroatisk</string>
-    <string name="calculate_osmand_route_without_internet">Beregn OsmAnd rutesegment uten internett</string>
+    <string name="calculate_osmand_route_without_internet">Beregn OsmAnd-rutesegment uten internett</string>
     <string name="gpx_option_calculate_first_last_segment">Beregn OsmAnd-rute for første og siste rutesegment</string>
     <string name="osmo_settings_uuid">Unik enhets-id</string>
     <string name="osmo_settings_descr">Still inn overvåking og personlig overvåkingskanal</string>
@@ -844,7 +844,7 @@
     <string name="targets">Reisemål</string>
     <string name="rendering_attr_hideBuildings_name">Skjul bygninger</string>
     <string name="osmand_parking_warning">Varsel</string>
-	<string name="wake_on_voice_descr">Slå på telefonskjermen når du nærmer deg en sving</string>
+	<string name="wake_on_voice_descr">Slå på enhetens skjerm når du nærmer deg en sving</string>
     <string name="wake_on_voice_never">Aldri</string>
     <string name="search_radius_proximity">I nærhet av</string>
     <string name="speed_limit_exceed_message">Velg toleransemargin for fartsgrense, overskrides denne vil du få talevarsel.</string>
@@ -1076,7 +1076,7 @@
 	<string name="coordinates">Koordinater</string>
 	<string name="download_tab_downloads">Alle nedlastinger</string>
     <string name="download_tab_updates">Oppdateringer</string>
-    <string name="no_internet_connection">Ikke mulig å laste ned. Koble til Wi-Fi for å fortsette.</string>
+    <string name="no_internet_connection">Ikke mulig å laste ned, kontroller internettforbindelsen.</string>
     <string name="dismiss">Avvis</string>
     <string name="everything_up_to_date">Alle filer er oppdaterte</string>
     <string name="use_opengl_render">Bruk OpenGL-opptegning</string>
@@ -1181,10 +1181,10 @@
     <string name="rendering_value_default_name">Standard</string>
     <string name="rendering_value_orange_name">Orange</string>
     <string name="rendering_value_germanRoadAtlas_name">Tysk veiatlas</string>
-	<string name="traffic_warning_railways">Jernbaner</string>
+	<string name="traffic_warning_railways">Jernbane</string>
-	<string name="traffic_warning_pedestrian">Fotgjenger</string>
+	<string name="traffic_warning_pedestrian">Fotgjengere</string>
-	<string name="show_railway_warnings">Vis jernbanevarsler</string>
+	<string name="show_railway_warnings">Vis jernbaneoverganger</string>
-	<string name="show_pedestrian_warnings">Vis fotgjengervarsler</string>
+	<string name="show_pedestrian_warnings">Vis fotgjengeroverganger</string>
     <string name="rendering_value_americanRoadAtlas_name">Amerikansk veiatlas</string>
     <string name="av_camera_focus_hiperfocal">Hyperfokal fokus</string>
 	<string name="lock_screen_request_explanation">%1$s trenger denne tillatelsen til å slå av skjermen (Strømsparingsfunksjon).</string>

OsmAnd/res/values-nl/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   
   <string name="layer_map_appearance">Configureer scherm</string>
@@ -1434,7 +1434,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="favourites_list_activity">Kies favoriet</string>
     <string name="local_openstreetmap_act_title">OSM-wijzigingen</string>
     <string name="default_buttons_other_actions">Andere acties</string>
-    <string name="download_using_mobile_internet">Er is geen WiFi-verbinding. Wil je doorgaan met downloaden via huidige internetverbinding?</string>
+    <string name="download_using_mobile_internet">Er is geen WiFi-verbinding. Wil je de huidige internetverbinding gebruiken voor het downloaden?</string>
     <string name="other_location">Andere</string>
     <string name="files_limit">%1$d bestanden over</string>
     <string name="available_downloads_left">%1$d bestanden beschikbaar voor downloaden</string>
@@ -1859,7 +1859,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="local_index_unselect_gpx_file">Deselecteer</string>
     <string name="local_index_select_gpx_file">Selecteer om te bekijken</string>
     <string name="route_descr_destination">Bestemming</string>
-    <string name="no_index_file_to_download">Geen bestand gevonden: controleer de internetverbinding.</string>
+    <string name="no_index_file_to_download">Geen bestanden gevonden: controleer de internetverbinding.</string>
     <string name="osmo_gpx_points_downloaded">OsMo punten: %1$s opgehaald.</string>
     <string name="osmo_auto_connect_descr">Verbind automatisch met OsMo service bij het opstarten van de applicatie</string>
     <string name="osmo_auto_connect">Automatisch verbinding maken</string>
@@ -1997,7 +1997,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="rendering_attr_busRoutes_name">Buslijnen</string>
     <string name="rendering_attr_tramTrainRoutes_name">Tram- en treinverbindingen</string>
     <string name="wake_on_voice">Zet het scherm aan</string>
-    <string name="wake_on_voice_descr">Zet het scherm aan bij nieuwe instructies</string>
+    <string name="wake_on_voice_descr">Zet het scherm aan bij het naderen van een bocht</string>
     <string name="select_impassable_road">Selecteer op kaart</string>
     <string name="impassable_road">Vermijd wegen…</string>
     <string name="rendering_category_hide">Verberg</string>
@@ -2005,19 +2005,19 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="lock_screen_request_explanation">%1$s heeft toestemming nodig om het scherm uit te kunnen schakelen (als onderdeel van de stroombesparende functie).</string>
     <string name="advanced_settings">Geavanceerd</string>
 	<string name="osmo_use_https_descr">Gebruik beveiligde verbinding met server</string>
-    <string name="osmo_use_https">Gebruik https</string>
+    <string name="osmo_use_https">Gebruik HTTPS</string>
-	<string name="home_button">Start</string>
+	<string name="home_button">Beginscherm</string>
     <string name="search_for">Zoek naar</string>
 	<string name="show_map">TOON KAART</string>
 	<string name="show_all">TOON ALLES</string>
 	<string name="coordinates">Coördinaten</string>
 	<string name="map_update">Updates beschikbaar voor %1$s kaart(en)</string>
-	<string name="everything_up_to_date">Alles is up-to-date</string>
+	<string name="everything_up_to_date">Alle bestanden zijn up-to-date</string>
     <string name="use_opengl_render">Gebruik OpenGL</string>
     <string name="use_opengl_render_descr">Gebruik snelle, hardware-gebaseerde OpenGL weergave (werkt niet op alle apparaten)</string>
-    <string name="error_avoid_specific_road">Er is in de buurt geen weg gevonden</string>
+    <string name="error_avoid_specific_road">Er is geen alternatieve weg gevonden</string>
     <string name="dismiss">Sluiten</string>
-    <string name="no_internet_connection">Kan niet downloaden. Maak verbinding met Wifi om verder te gaan.</string>
+    <string name="no_internet_connection">Kan niet downloaden. Maak verbinding met internet om verder te gaan.</string>
     <string name="download_tab_downloads">Alle downloads</string>
     <string name="download_tab_updates">Updates</string>
     <string name="download_tab_local">Geïnstalleerd</string>
@@ -2038,7 +2038,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="rendering_value_americanRoadAtlas_name">Amerikaanse wegenkaart</string>
     <string name="routing_attr_no_new_routing_name">Gebruik routeberekening v1.9 niet</string>
     <string name="routing_attr_no_new_routing_description">Gebruik routeberekening v1.9 niet</string>
-    <string name="traffic_warning_railways">Spoorwegen</string>
+    <string name="traffic_warning_railways">Spoorweg</string>
 	<string name="traffic_warning_pedestrian">Voetgangers</string>
 	<string name="show_railway_warnings">Waarschuw voor spoorwegovergangen</string>
 	<string name="show_pedestrian_warnings">Waarschuw voor oversteekplaatsen</string>

OsmAnd/res/values-ru/phrases.xml

@@ -557,7 +557,7 @@
 	<string name="poi_seamark_beacon_cardinal"/>
 	<string name="poi_seamark_beacon_lateral"/>
 	<string name="poi_seamark_beacon_safe_water"/>
-	<string name="poi_seamark_beacon_special_purpose"/>
+	<string name="poi_seamark_beacon_special_purpose">Бакен специального назначения</string>
 	<string name="poi_seamark_berth">Причал</string>
 	<string name="poi_seamark_building"/>
 	<string name="poi_seamark_bridge"/>

OsmAnd/res/values-ru/strings.xml

@@ -353,7 +353,7 @@
   <string name="voice_not_use">Не использовать</string>
   <string name="voice_not_specified">Нет</string>
   <string name="installing_new_resources">Распаковываются новые данные…</string>
-  <string name="internet_connection_required_for_online_route">Вы собираетесь использовать Интернет-маршрутизацию, но у вас нет активного Интернет соединения.</string>
+  <string name="internet_connection_required_for_online_route">Вы собираетесь использовать Интернет-маршрутизацию, но у Вас нет активного Интернет соединения.</string>
   <string name="tts_language_not_supported_title">Язык не поддерживается</string>
   <string name="tts_language_not_supported">Выбранный язык не поддерживается активным Android TTS (text-to-speech). Будет использован язык по-умолчанию. Хотите найти в Google Play другой TTS? Иначе будет использоваться предустановленный язык TTS.</string>
   <string name="tts_missing_language_data_title">Данные отсутствуют</string>
@@ -383,7 +383,7 @@
   <string name="map_overlay_descr">Выберите слой для покрытия основной карты</string>
   <string name="tile_source_already_installed">Карта уже установлена, настройки будут обновлены</string>
   <string name="select_tile_source_to_install">Выберите карты для установки или обновления</string>
-  <string name="internet_not_available">Интернет-соединение недоступно</string>
+  <string name="internet_not_available">Требуется Интернет-соединение для данной операции, но оно недоступно</string>
   <string name="install_more">Загрузить ещё…</string>
   <string name="level_to_switch_vector_raster_descr">Максимальный масштаб для использования векторных карт вместо растровых</string>
   <string name="level_to_switch_vector_raster">Масштаб векторных карт</string>
@@ -961,7 +961,7 @@
   <string name="tip_update_index">Обновление локальных данных</string>
   <string name="tip_update_index_t">"Актуальные картографические данные крайне важны для автономного просмотра карты, поиска POI/адресов и навигации. OsmAnd имеет встроенный менеджер локальных данных, который позволяет проверить наличие обновлений для установленных карт.
 \n\nЧтобы проверить наличие обновлений, перейдите в \"Настройки\" → \"Управление файлами карт\" → \"Загрузить\".
-\n\nПосле загрузки из интернета глобального списка регионов, нажмите на любую запись для загрузки или обновления файла. Обратите внимание на селектор типа файлов в верхней части экрана, в котором можно выбрать необходимый для загрузки тип файлов (полные карты, голосовые данные и т.д.).
+\n\nПосле загрузки из Интернет глобального списка регионов, нажмите на любую запись для загрузки или обновления файла. Обратите внимание на селектор типа файлов в верхней части экрана, в котором можно выбрать необходимый для загрузки тип файлов (полные карты, голосовые данные и т.д.).
 \n\nВы можете отфильтровать список регионов, введя несколько букв, или выбрать опцию \"Настройки\" → \"Загруженные\", чтобы увидеть обновления только для уже установленных на вашем устройстве карт.\n\n\t* \"Зелёным\" показываются данные на устройстве, которые не нуждаются в обновлении
 \n\t* \"Синим\" показываются данные, для которых доступна обновленная версия
 \n\t* курсивом отмечаются данные, деактивированные на вашем устройстве "</string>
@@ -1226,7 +1226,7 @@
     
 	<string name="street_name">Улица</string>
 	<string name="hno">Номер дома</string>
-    <string name="download_using_mobile_internet">В настоящее время нет соединения по WiFi. Хотите продолжить загрузку по текущему интернет-соединению?</string>
+    <string name="download_using_mobile_internet">В настоящее время нет соединения по Wi-Fi. Хотите использовать текущее интернет-соединение для загрузки?</string>
     <string name="tip_recent_changes_1_3_t">Изменения в 1.3:
 	\n\t* Переработана поддержка планшетов и крупных экранов
 	\n\t* Тема Holo (настройка тем)
@@ -1703,7 +1703,7 @@
 	<string name="osmo_auth_error">Ошибка авторизации OsMo : %1$s.↵\n Это может быть временно недоступный сервис или срок вашей регистрации истек.↵\n Желаете продолжить с новой регистрацией?</string>
     <string name="osmo_not_signed_in">Не удалось войти в OsMo</string>
     <string name="osmo_gpx_track_downloaded">OsMo трек %1$s загружен.</string>
-    <string name="no_index_file_to_download">Ничего не загружено, пожалуйста, проверьте подключение к Интернету.</string>
+    <string name="no_index_file_to_download">Загрузок не найдено. Проверьте подключение к Интернет.</string>
     <string name="osmo_expire_group">Истекает</string>
     <string name="osmo_gpx_points_downloaded">Точки OsMo %1$s загружены.</string>
     <string name="osmo_session_not_available">Сессия недоступна, пожалуйста проверьте, что \"отправка местоположения\" включена.</string>
@@ -1810,7 +1810,7 @@
     <string name="wake_on_voice_never">Никогда</string>
     <string name="lock_screen_request_explanation">%1$s необходимо это разрешение, чтобы выключить экран для экономии энергии.</string>
     <string name="wake_on_voice">Авто-включение экрана</string>
-    <string name="wake_on_voice_descr">Включать экран телефона при приближении к повороту</string>
+    <string name="wake_on_voice_descr">Включать экран устройства при приближении к повороту</string>
     <string name="advanced_settings">Расширенные</string>
 	<string name="map_update">Карты доступные для обновления: %1$s</string>
 	<string name="coordinates">Координаты</string>
@@ -1821,7 +1821,7 @@
     <string name="use_opengl_render_descr">Использовать аппаратное ускорение OpenGL для рендеринга (может не работать на некоторых устройствах)</string>
     <string name="show_map">ПОКАЗАТЬ КАРТУ</string>
 	<string name="show_all">ПОКАЗАТЬ ВСЕ</string>
-	<string name="no_internet_connection">Загрузка невозможна. Подключите Wi-Fi для продолжения.</string>
+	<string name="no_internet_connection">Загрузка невозможна. Проверьте подключение к Интернет.</string>
     <string name="download_tab_downloads">Загрузки</string>
     <string name="download_tab_updates">Обновления</string>
     <string name="download_tab_local">Локальные</string>
@@ -1843,8 +1843,9 @@
     <string name="rendering_value_germanRoadAtlas_name">Атлас дорог Германии</string>
     <string name="rendering_value_americanRoadAtlas_name">Атлас дорог Америки</string>
     <string name="routing_attr_no_new_routing_name">Не использовать маршрутизацию версии 1.9</string>
-    <string name="routing_attr_no_new_routing_description">Не использовать для построение маршрута алгоритм версии 1.9</string>
+    <string name="routing_attr_no_new_routing_description">Не использовать для построение маршрута алгоритм представленный в версии 1.9</string>
     <string name="show_railway_warnings">Показывать ж/д переезды</string>
 	<string name="show_pedestrian_warnings">Показывать пешеходные переходы</string>
     <string name="traffic_warning_railways">Железная дорога</string>
+	<string name="traffic_warning_pedestrian">Пешеходы</string>
 	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
     <string name="voice_pref_title">Boghe</string>
     <string name="misc_pref_title">Mistura</string>
@@ -1217,7 +1217,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="map_overlay_descr">Issèbera mapa de subrapositzione</string>
 	<string name="tile_source_already_installed">Sa mapa est giai installata, sas impostaduras ant a èssere agiornadas</string>
 	<string name="select_tile_source_to_install">Issèbera sas mapas (tasseddos) da installare o agiornare</string>
-	<string name="internet_not_available">Sa connessione ìnternet est netzessària pro custa operatzione ma no est disponìbile</string>
+	<string name="internet_not_available">Una connessione ìnternet est netzessària pro custa operatzione, ma no nde bi sunt disponìbiles</string>
 	<string name="install_more">Installa àteru…</string>
 	<string name="level_to_switch_vector_raster_descr">Livellu mìnimu de zoom pro impreare sas mapas vetoriales</string>
 	<string name="level_to_switch_vector_raster">Liv. min. zoom vetoriale</string>
@@ -1786,13 +1786,13 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="show_map">AMMUSTRA SA MAPA</string>
 	<string name="show_all">AMMUSTRA TOTU</string>
 	<string name="coordinates">Coordinatas</string>
-	<string name="map_update">Tenes %1$s mapas de agiornare</string>
+	<string name="map_update">Podes agiornare %1$s mapas</string>
-	<string name="error_avoid_specific_road">No est istada agatada peruna istrada a curtzu</string>
+	<string name="error_avoid_specific_road">No est istada agatada peruna tangentziale</string>
     <string name="everything_up_to_date">Totu agiornadu</string>
     <string name="use_opengl_render">Imprea sa renderizatzione OpengL</string>
     <string name="use_opengl_render_descr">Imprea sa renderizatzione OpengL tràmite hardware (diat pòdere non funtzionare in carchi dispositivu)</string>
     <string name="dismiss">Abbandona</string>
-    <string name="no_internet_connection">Impossìbile iscarrigare. Pro piaghere allue su Wi-fi pro sighire.</string>
+    <string name="no_internet_connection">Impossìbile iscarrigare. Pro piaghere còmpida sa cunnessione tua pro sighire.</string>
     <string name="download_tab_downloads">Iscarrigàbiles</string>
     <string name="download_tab_updates">Agiornamentos</string>
     <string name="download_tab_local">Iscarrigadas</string>
@@ -1802,8 +1802,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="rendering_attr_transportStops_name">Firmadas traspòrtu pùblicu</string>
     <string name="map_locale">Limba de sa mapa</string>
     <string name="voices">Indicatziones vocales</string>
-	<string name="dash_download_msg_none">Boles iscarrigare carchi mapa non in lìnia?</string>
+	<string name="dash_download_msg_none">Boles iscarrigare una mapa non in lìnia?</string>
-    <string name="dash_download_msg">Tenes %1$s mapas iscarrigadas</string>
+    <string name="dash_download_msg">As iscarrigadu %1$s mapas</string>
     <string name="dash_download_new_one">Iscàrriga una mapa noa</string>
     <string name="dash_download_manage">Gesti</string>
     <string name="rendering_attr_roadStyle_name">Istile disinnu de sas istradas</string>
@@ -1813,8 +1813,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="rendering_value_americanRoadAtlas_name">Atlante de sas istradas americanas</string>
     <string name="routing_attr_no_new_routing_name">No impreare su càlculu de s\'àndala v1.9</string>
     <string name="routing_attr_no_new_routing_description">No impreare su càlculu de s\'àndala v1.9</string>
-    <string name="traffic_warning_railways">Ferrovias</string>
+    <string name="traffic_warning_railways">Ferrovia</string>
 	<string name="traffic_warning_pedestrian">Pedonale</string>
-	<string name="show_railway_warnings">Ammustra sos avisos ferroviàrios</string>
+	<string name="show_railway_warnings">Ammustra sas rugradas ferroviàrias</string>
-	<string name="show_pedestrian_warnings">Ammustra sos avisos pedonales</string>
+	<string name="show_pedestrian_warnings">Ammustra sas istrìscias pedonales</string>
     </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="recording_context_menu_show">Zobraziť</string>
   <string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
   <string name="av_def_action_picture">Zachytiť fotografiu</string>
@@ -403,7 +403,7 @@
   <string name="voice_not_use">Nepoužívať</string>
   <string name="voice_not_specified">Žiadny</string>
   <string name="installing_new_resources">Rozbaľujú sa nové údaje…</string>
-  <string name="internet_connection_required_for_online_route">Je vybratá online navigačná služba, ale nie je dostupné internetové pripojenie.</string>
+  <string name="internet_connection_required_for_online_route">Je vybratá online navigačná služba, ale nie je dostupné pripojenie na Internet.</string>
   <string name="tts_language_not_supported_title">Nepodporovaný jazyk</string>
   <string name="tts_language_not_supported">Zvolený jazyk nie je podporovaný nainštalovaným TTS (text-to-speech) v Androide. Chcete ísť na Market pozrieť iný TTS? Inak bude použitý prednastavený TTS jazyk.</string>
   <string name="tts_missing_language_data_title">Chýbajúce údaje</string>
@@ -437,17 +437,16 @@
   <string name="map_overlay_descr">Výber mapy na prekrytie</string>
   <string name="tile_source_already_installed">Mapa je už nainštalovaná, nastavenia budú zaktualizované</string>
   <string name="select_tile_source_to_install">Vyberte mapy na inštaláciu alebo aktualizáciu</string>
-  <string name="internet_not_available">Internetové pripojenie potrebné pre operáciu nie je dostupné</string>
+  <string name="internet_not_available">Pre túto operáciu je potrebné internetové pripojenie, avšak nie je dostupné</string>
   <string name="install_more">Inštalovať viac…</string>
   <string name="tip_update_index">Aktualizácia offline máp</string>
-  <string name="tip_update_index_t">Veľmi dôležité je mať aktuálne mapové údaje, aby bolo možné zobrazovať mapu, hľadať adresy, body záujmu a navigovať. OsmAnd je vybavený sťahovacím manažérom, ktorý môže sťahovať offline mapy (a iné súbory) a zistiť, či sú dostupné aktualizácie.
+  <string name="tip_update_index_t">"Veľmi dôležité je mať aktuálne mapové údaje, aby bolo možné zobrazovať mapu, hľadať adresy, body záujmu a navigovať. OsmAnd je vybavený sťahovacím manažérom, ktorý môže sťahovať offline mapy (a iné súbory) a zistiť, či sú dostupné aktualizácie.
-		\n\nPre stiahnutie máp choďte do "Nastavenia" → "Správca mapových súborov" → "Stiahnuť offline údaje".
+\n\nPre stiahnutie máp choďte do Nastavenia → Správca mapových súborov → Stiahnuť offline údaje.
-		\n\nPo načítaní zoznamu oblastí z internetu, vyberte ktorýkoľvek súbor pre jeho stiahnutie alebo aktualizovanie. Všimnite si tiež výber typu súborov v hornej časti obrazovky, kde je potrebé zvoliť aký typ dát chcete stiahnuť (bežné mapy, tieňované reliéfy, atď.).
+\n\nPo načítaní zoznamu oblastí z Internetu, vyberte ktorýkoľvek súbor pre jeho stiahnutie alebo aktualizovanie. Všimnite si tiež výber typu súborov v hornej časti obrazovky, kde je potrebé zvoliť aký typ dát chcete stiahnuť (bežné mapy, tieňované reliéfy, atď.).
-		\n\nZoznam oblastí môžete filtrovať napísaním niekoľkých písmen alebo vyberte možnosť "Zobraziť stiahnuté". Potom uvidíte len aktualizácie pre súbory, ktoré už máte vo svojom zariadení.
+\n\nZoznam oblastí môžete filtrovať napísaním niekoľkých písmen alebo vyberte možnosť Zobraziť stiahnuté. Potom uvidíte len aktualizácie pre súbory, ktoré už máte vo svojom zariadení.
-		\n\n\t* "Zelená" - indikuje, že súbor je aktuálny (na serveri rovnaký ako v zariadení)
+\n\n\t* Zelená - indikuje, že súbor je aktuálny (na serveri rovnaký ako v zariadení)
-		\n\t* "Modrá" - indikuje, že pre súbor existuje aktualizácia na serveri
+\n\t* Modrá - indikuje, že pre súbor existuje aktualizácia na serveri
-		\n\t* Súbory šikmým písmom sú v zariadení deaktivované
+\n\t* Súbory šikmým písmom sú v zariadení deaktivované "</string>
-	</string>
   <string name="level_to_switch_vector_raster_descr">Max. úroveň priblíženia použitá pri vektorovom vykresľovaní a nie rastrovom</string>
   <string name="level_to_switch_vector_raster">Úroveň vektorového zoomu</string>
   <string name="tip_day_night_mode">Denný/Nočný režim</string>
@@ -1238,7 +1237,7 @@
     <string name="favourites_list_activity">Vybrať obľúbený bod</string>
     <string name="local_openstreetmap_act_title">OSM úpravy</string>
     <string name="default_buttons_other_actions">Ostatné akcie</string>
-    <string name="download_using_mobile_internet">Momentálne nie ste pripojený cez WiFi. Chcete pokračovať so sťahovaním pomocou aktuálneho internetového pripojenia?</string>
+    <string name="download_using_mobile_internet">Momentálne nie ste pripojený na WiFi. Chcete použiť aktuálne internetové pripojenie na sťahovanie?</string>
     <string name="tip_recent_changes_1_3_t">Zmeny vo verzii 1.3:
     \n\t* Prepracovaná podpora tabletov a veľkých obrazoviek
     \n\t* Téma Holo (prispôsobenie témy)

OsmAnd/res/values-sv/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
 <string name="ChooseCountry">Välj land</string>
 <string name="choose_city">Välj stad</string>
@@ -151,7 +151,7 @@
 
 <string name="index_settings_descr">Ladda ner och hantera offline-kartor lagrade på din enhet</string>
 <string name="online_map_settings">Online-kartor</string>
-<string name="osmand_accessibility_description">Visa inställningar för speciella tillgänglighetsanpassning.</string>
+<string name="osmand_accessibility_description">Visa inställningar för speciella tillgänglighetsanpassningar.</string>
 <string name="extra_settings">Avancerade inställningar</string>
 <string name="osmand_monitoring_description">Visa inställningar som underlättar att spela in dina resor till GPX-filer eller att leva spår med hjälp av en webbtjänst.</string>
 <string name="debugging_and_development">Utveckling av OsmAnd</string>
@@ -259,7 +259,7 @@
 \n\t - Offline-ruttning blir mer robust↵
 \n\t *Användbarhet och UIerfarenhet*↵
 \n\t - Förbättrats på många områden "</string>
-<string name="osm_editing_plugin_description">Visa inställningar som behövs för OSM-återkoppling såsom samlande/modifierade av OSM POI-objekt, öppnande/kommenterande av OSM-buggar, och bidragande med inspelade GPX-filer (kräver OSM-referenser).</string>
+<string name="osm_editing_plugin_description">Visa inställningar som behövs för OSM-återkoppling såsom samlande/modifierande av OSM POI-objekt, öppnande/kommenterande av OSM-buggar, och bidragande med inspelade GPX-filer (kräver OSM-referenser).</string>
 <string name="vector_maps_may_display_faster_on_some_devices">Vektorkartor ritas sannolikt upp snabbare. Fungerar kanske inte så bra på vissa enheter.</string>
 <string name="play_commands_of_currently_selected_voice">Spela upp kommandon med aktuell röst</string>
 <string name="test_voice_prompts">Test av röstmeddelanden</string>
@@ -489,7 +489,7 @@
 <string name="voice_not_use">Använd inte</string>
 <string name="voice_not_specified">Ingen</string>
 <string name="installing_new_resources">Packar upp nya data …</string>
-<string name="internet_connection_required_for_online_route">En online-navigeringstjänst är vald men ingen internet-anslutning är tillgänglig.</string>
+<string name="internet_connection_required_for_online_route">En online-navigeringstjänst är vald men ingen internetanslutning är tillgänglig.</string>
 <string name="tts_language_not_supported_title">Språket stöds inte</string>
 <string name="tts_language_not_supported">Det valda språket stöds inte av den installerade Android TTS (text-till-tal)-motorn. Vill du söka efter en annan TTS-motor på Market? Annars kommer det förinställda TTS-språket att användas.</string>
 <string name="tts_missing_language_data_title">Data saknas</string>
@@ -518,7 +518,7 @@
 <string name="map_overlay_descr">Välj överläggskarta</string>
 <string name="tile_source_already_installed">Kartan är redan installerad; inställningarna kommer att uppdateras</string>
 <string name="select_tile_source_to_install">Välj kartor/kartrutor att installera eller uppdatera</string>
-<string name="internet_not_available">Internetanslutning krävs för åtgärden men är inte tillgänglig</string>
+<string name="internet_not_available">En anslutning till Internet krävs för denna åtgärd men någon sådan är inte tillgänglig</string>
 <string name="install_more">Installera fler …</string>
 <string name="level_to_switch_vector_raster_descr">Minsta zoomnivå för att använda vektorkartor</string>
 <string name="level_to_switch_vector_raster">Minsta vektor-zoomnivå</string>
@@ -810,7 +810,7 @@
 	<string name="show_transport_over_map_description">Visa hållplatser för kollektivtrafik på kartan</string>
 	<string name="show_transport_over_map">Visa hållplatser</string>
 	<string name="hello">Navigationsappen OsmAnd</string>
-	<string name="update_poi_success">POI-data har uppdaterats ({0} laddades)</string>
+	<string name="update_poi_success">POI-data har uppdaterats utan problem ({0} laddades)</string>
 	<string name="update_poi_error_local">Fel vid uppdatering av lokal POI-lista</string>
 	<string name="update_poi_error_loading">Fel vid laddning av data från servern</string>
 	<string name="update_poi_no_offline_poi_index">Inga offline POI-data tillgängliga för detta område</string>
@@ -865,7 +865,7 @@
 	<string name="loading_postcodes">Laddar postnummer …</string>
 	<string name="loading_streets">Laddar gator …</string>
 	<string name="loading_cities">Laddar städer …</string>
-	<string name="poi">POI</string>
+	<string name="poi">Intressepunkter (POI)</string>
 	<string name="arrived_at_destination">Du har anlänt till din destination</string>
 	<string name="close">Stäng</string>
 	<string name="loading_data">Laddar data …</string>
@@ -1154,7 +1154,7 @@
     <string name="cancel_route">Avbryt rutten</string>
     <string name="cancel_navigation">Avbryt navigeringen</string>
     <string name="clear_destination">Ta bort destinationen</string>
-    <string name="download_using_mobile_internet">Wi-Fi är för tillfället inte anslutet. Vill du fortsätta att ladda ned med nuvarande anslutning till Internet?</string>
+    <string name="download_using_mobile_internet">Wi-Fi är för tillfället inte anslutet. Vill du ladda ned med din nuvarande anslutning till Internet?</string>
     <string name="street_name">Gata</string>
 	<string name="hno">Husnummer</string>
     <string name="osmand_monitoring_plugin_name">Loggningstjänster</string>
@@ -1706,7 +1706,7 @@
 	<string name="configure_map">Konfigurera karta</string>
     <string name="search_radius_proximity">Närmare än</string>
     <string name="rendering_category_details">Detaljer</string>
-    <string name="rendering_category_transport">Transport</string>
+    <string name="rendering_category_transport">Kollektivtrafik</string>
     <string name="rendering_category_others">Andra kartattribut</string>
     <string name="map_widget_appearance_rem">Kvarvarande element</string>
     <string name="map_widget_top">Statusfält</string>
@@ -1714,7 +1714,7 @@
 	<string name="map_widget_left">Vänster panel</string>
     <string name="layers_category_show">Visa</string>
 	<string name="rendering_category_routes">Rutter</string>
-    <string name="tip_recent_changes_1_9_t">"Nyheter i 1.9: * Uppdaterade kartstilar med återgivning av vägbeläggning, transportlager och vandringssymboler * Sök efter POI längs rutten * Markera väg som avstängd per session * Lättare hämtning och uppdatering av kartor * Få visuell och ljudnotifiering när du närmar dig en waypoint * Skriv ut information om resväg * Stöd för vändningsfiler * Stöd för Android Wear * En mängd förändringar i gränssnittet * Separat zoom för textstorlek på kartan * Speciella ljudnotifieringar när du lämnat rutten * Logga in på OsMo * Fix av OsMo- inkompatibilitet "</string>
+    <string name="tip_recent_changes_1_9_t">"Nyheter i 1.9: * Uppdaterade kartstilar med återgivning av vägbeläggning, kollektivtrafikslager och vandringssymboler * Sök efter POI längs rutten * Markera väg som avstängd per session * Lättare hämtning och uppdatering av kartor * Få visuell notifiering och ljudnotifiering när du närmar dig en waypoint * Skriv ut information om resväg * Stöd för vändningsfiler * Stöd för Android Wear * En mängd förändringar i gränssnittet * Separat zoom för textstorlek på kartan * Speciella ljudnotifieringar när du lämnat rutten * Logga in på OsMo * Fix av OsMo- inkompatibilitet "</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Tåglinjer</string>
     <string name="rendering_attr_tramRoutes_name">Spårvagnsrutter</string>
     <string name="rendering_attr_shareTaxiRoutes_name">\"Delad taxi\"-rutter</string>
@@ -1738,22 +1738,22 @@
 	<string name="coordinates">Koordinater</string>
 	<string name="map_update">Det finns uppdateringar av %1$s kartor</string>
 	<string name="error_avoid_specific_road">Hittar ingen förbifart</string>
-    <string name="dismiss">Avfärda</string>
+    <string name="dismiss">Avvisa</string>
     <string name="everything_up_to_date">Alla filer är uppdaterade</string>
     <string name="use_opengl_render">Använd OpenGL-rendering</string>
     <string name="use_opengl_render_descr">Använd hårdvaruaccelererad OpenGL-rendering (fungerar kanske inte på vissa enheter)</string>
-    <string name="no_internet_connection">Kan inte ladda ner. Anslut till Wi-Fi för att fortsätta.</string>
+    <string name="no_internet_connection">Kan inte ladda ner; kontrollera din internetsanslutning.</string>
-    <string name="rendering_attr_roadStyle_name">Vägstil</string>
+    <string name="rendering_attr_roadStyle_name">Vägtyp</string>
     <string name="rendering_value_default_name">Standard</string>
     <string name="rendering_value_orange_name">Brandgul</string>
     <string name="rendering_value_germanRoadAtlas_name">Tysk vägkarta</string>
-	<string name="traffic_warning_railways">Järnvägar</string>
+	<string name="traffic_warning_railways">Järnväg</string>
 	<string name="traffic_warning_pedestrian">Fotgängare</string>
-	<string name="show_railway_warnings">Visa järnvägsvarningar</string>
+	<string name="show_railway_warnings">Visa järnvägsövergångar</string>
-	<string name="show_pedestrian_warnings">Visa fotgängarvarningar</string>
+	<string name="show_pedestrian_warnings">Visa övergångsställen</string>
     <string name="rendering_value_americanRoadAtlas_name">Amerikansk vägkarta</string>
-    <string name="routing_attr_no_new_routing_name">Använd inte ruttning från v 1.9</string>
+    <string name="routing_attr_no_new_routing_name">Inga regler från version 1.9-ruttning</string>
-    <string name="routing_attr_no_new_routing_description">Använd inte ruttning från v 1.9</string>
+    <string name="routing_attr_no_new_routing_description">Använd inte de ruttningsregler som infördes i version 1.9</string>
     <string name="dash_download_msg_none">Vill du hämta offline-kartor?</string>
     <string name="dash_download_msg">Du har hämtat %1$s kartor</string>
     <string name="dash_download_new_one">Hämta ny karta</string>
@@ -1761,8 +1761,8 @@
     <string name="map_locale">Kartspråk</string>
     <string name="rendering_attr_transportStops_name">Hållplatser</string>
     <string name="navigate_point_zone">Zon</string>
-    <string name="navigate_point_northing">Nordlig</string>
+    <string name="navigate_point_northing">Nordlig (y-koord.)</string>
-    <string name="navigate_point_easting">Östlig</string>
+    <string name="navigate_point_easting">Östlig (x-koord.)</string>
     <string name="download_tab_downloads">Alla hämtningar</string>
     <string name="download_tab_updates">Uppdateringar</string>
     <string name="download_tab_local">Hämtat</string>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
 	<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
     <string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@@ -474,7 +474,7 @@
 	<string name="voice_not_use">不要使用</string>
 	<string name="voice_not_specified">無</string>
 	<string name="installing_new_resources">安裝新資料…</string>
-	<string name="internet_connection_required_for_online_route">選用線上導航服務，但是沒有能使用的網路連線。</string>
+	<string name="internet_connection_required_for_online_route">選用線上導航服務，但是無可用的網路連線。</string>
 	<string name="tts_language_not_supported_title">該語言未支援</string>
 	<string name="tts_language_not_supported">選用的語言 Android TTS 引擎未支援，您要到 Play 商場找其它引擎嗎？否則使用之前設定的語言。</string>
 	<string name="tts_missing_language_data_title">資料遺失</string>
@@ -502,7 +502,7 @@
 	<string name="map_overlay_descr">選擇上層地圖</string>
 	<string name="tile_source_already_installed">地圖已安裝，設定將被更新</string>
 	<string name="select_tile_source_to_install">選擇要安裝或更新的(圖磚)地圖</string>
-	<string name="internet_not_available">因網際網路無法連線，所以無法操作</string>
+	<string name="internet_not_available">此操作無法使用，因為需要網路連線</string>
 	<string name="install_more">安裝更多…</string>
 	<string name="level_to_switch_vector_raster_descr">向量地圖使用最小的縮放比級別</string>
 	<string name="level_to_switch_vector_raster">最小向量縮放比級別</string>
@@ -1025,7 +1025,7 @@
     <string name="cancel_route">排除路線</string>
     <string name="cancel_navigation">停止導航</string>
     <string name="clear_destination">清除目的地</string>
-    <string name="download_using_mobile_internet">現在 WiFi 並未連線。您想要使用目前的網路連線繼續下載嗎？</string>
+    <string name="download_using_mobile_internet">WiFi 現在並未連線。您想要使用目前的網路連線下載嗎？</string>
     <string name="street_name">街道</string>
 	<string name="hno">門牌號碼</string>
     <string name="monitoring_settings">旅程記錄</string>
@@ -1472,7 +1472,7 @@
     <string name="route_info">路線資訊</string>
     <string name="keep_and_add_destination_point">加為目的地標點</string>
     <string name="use_displayed_track_for_navigation">您是否要將顯示軌跡使用於導航？</string>
-    <string name="calculate_osmand_route_without_internet">OsmAnd 預估的路段沒有網際網路</string>
+    <string name="calculate_osmand_route_without_internet">OsmAnd 預計的路段沒有網際網路</string>
     <string name="gpx_option_calculate_first_last_segment">OsmAnd 預估最初和最後路段的路線</string>
     <string name="tip_recent_changes_1_7_1_t">"在1.7的變更：
 \n\t* 重要，地圖應該會比 2014 年 2 月更新。
@@ -1684,7 +1684,7 @@
     <string name="local_index_unselect_gpx_file">取消選擇</string>
     <string name="local_index_select_gpx_file">選取要顯示的</string>
     <string name="route_descr_destination">目的地</string>
-    <string name="no_index_file_to_download">無法下載，請檢查網路連線。</string>
+    <string name="no_index_file_to_download">無法下載，請檢查您的網路連線。</string>
     <string name="osmo_gpx_points_downloaded">OsMo 標點 %1$s 已下載。</string>
     <string name="osmo_auto_connect_descr">自動連線至服務，隨後啟動應用程式</string>
     <string name="osmo_auto_connect">自動連線</string>
@@ -1826,24 +1826,24 @@
     <string name="rendering_attr_tramTrainRoutes_name">有軌電車和火車路線</string>
     <string name="rendering_category_hide">隱藏</string>
     <string name="wake_on_voice">開啟螢幕</string>
-    <string name="wake_on_voice_descr">當接近轉彎時，開啟手機螢幕</string>
+    <string name="wake_on_voice_descr">當接近轉彎時，開啟裝置螢幕</string>
     <string name="lock_screen_request_explanation">為了節電作用 %1$s 需要此許可權才能關閉螢幕。</string>
     <string name="wake_on_voice_never">永不</string>
     <string name="advanced_settings">進階</string>
-	<string name="osmo_use_https_descr">使用安全協定連線於伺服器</string>
+	<string name="osmo_use_https_descr">使用安全協定連線到伺服器</string>
     <string name="osmo_use_https">使用 HTTPS</string>
-	<string name="map_update">您有 %1$ 個地圖更新</string>
+	<string name="map_update">有 %1$ 個地圖可更新</string>
 	<string name="search_for">查尋</string>
 	<string name="show_map">顯示地圖</string>
 	<string name="show_all">全部顯示</string>
 	<string name="coordinates">座標</string>
 	<string name="home_button">首頁</string>
-    <string name="error_avoid_specific_road">找不到最近的路</string>
+    <string name="error_avoid_specific_road">沒發現支道</string>
-    <string name="everything_up_to_date">一切都為最新的</string>
+    <string name="everything_up_to_date">全部都是最新的檔案</string>
     <string name="use_opengl_render">使用 OpenGL 繪製</string>
     <string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製（可能在某些裝置上無法工作）</string>
     <string name="dismiss">排除</string>
-    <string name="no_internet_connection">不能下載。請連接到 Wifi 網路進行。</string>
+    <string name="no_internet_connection">不能下載。請檢查您的網路連線。</string>
     <string name="download_tab_downloads">全部下載</string>
     <string name="download_tab_updates">更新</string>
     <string name="download_tab_local">本機</string>
@@ -1853,12 +1853,12 @@
     <string name="map_locale">地圖上的語言</string>
     <string name="rendering_attr_transportStops_name">候車亭</string>
     <string name="voices">提示語音</string>
-	<string name="dash_download_msg_none">您想要下載任何的離線地圖嗎？</string>
+	<string name="dash_download_msg_none">您想要下載離線地圖嗎？</string>
-    <string name="dash_download_msg">您有 %1$s 的地圖已下載</string>
+    <string name="dash_download_msg">您已下載了 %1$s 的地圖</string>
-    <string name="dash_download_new_one">下載新地圖</string>
+    <string name="dash_download_new_one">下載新的地圖</string>
     <string name="dash_download_manage">管理</string>
-    <string name="routing_attr_no_new_routing_name">不使用 v1.9 的路徑</string>
+    <string name="routing_attr_no_new_routing_name">不用 v1.9 的路徑規則</string>
-    <string name="routing_attr_no_new_routing_description">不使用 v1.9 的路徑</string>
+    <string name="routing_attr_no_new_routing_description">在 v1.9 不使用路徑規則引導</string>
     <string name="rendering_attr_roadStyle_name">道路樣式</string>
     <string name="rendering_value_default_name">預設</string>
     <string name="rendering_value_orange_name">橙色</string>
@@ -1866,6 +1866,6 @@
     <string name="rendering_value_americanRoadAtlas_name">美國道路地圖集</string>
     <string name="traffic_warning_railways">鐵路</string>
 	<string name="traffic_warning_pedestrian">步行</string>
-	<string name="show_railway_warnings">顯示鐵路警告</string>
+	<string name="show_railway_warnings">顯示鐵路平交道</string>
-	<string name="show_pedestrian_warnings">顯示步行警告</string>
+	<string name="show_pedestrian_warnings">顯示行人穿越道</string>
     </resources>

OsmAnd/res/values/sizes.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dashHeaderHeight">40dp</dimen>
+    <dimen name="subHeaderPadding">2dp</dimen>
+    <dimen name="subHeaderMarginLeft">15dp</dimen>
+    <dimen name="showAllButtonMarginRight">14dp</dimen>
+    <dimen name="showAllButtonHeight">36dp</dimen>
+    <dimen name="dashListItemHeight">50dp</dimen>
+    <dimen name="dashFavIconSize">28dp</dimen>
+    <dimen name="dashFavIconMargin">12dp</dimen>
+    <dimen name="dashFavDirectionSize">10dp</dimen>
+    <dimen name="dashMapHeight">110dp</dimen>
+    <dimen name="dashMapMargin">2dp</dimen>
+    <dimen name="dashNoteIconSize">28dp</dimen>
+    <dimen name="dashPluginPadding">4dp</dimen>
+    <dimen name="dashPluginMargin">8dp</dimen>
+    <dimen name="dashSearchBtnHeight">90dp</dimen>
+    <dimen name="dashSearchPaddingTop">17dp</dimen>
+    <dimen name="dashSearchPaddingBot">11dp</dimen>
+    <dimen name="dashPadding">6dp</dimen>
+    <dimen name="dashAboutTextSize">20sp</dimen>
+    <dimen name="dashCardMargin">4dp</dimen>
+
+
+    <!-- TextSizes -->
+    <dimen name="showAllButtonTextSize">12sp</dimen>
+    <dimen name="subHeaderTextSize">14sp</dimen>
+    <dimen name="dashFavNameTextSize">16sp</dimen>
+    <dimen name="dashProgressTextSize">18sp</dimen>
+</resources>

OsmAnd/res/values/strings.xml

@@ -18,8 +18,8 @@
 	<string name="show_railway_warnings">Show railroad crossings</string>
 	<string name="show_pedestrian_warnings">Show pedestrian crosswalks</string>
     <string name="rendering_value_americanRoadAtlas_name">American road atlas</string>
-    <string name="routing_attr_no_new_routing_name">Do not use v1.9 routing</string>
+    <string name="routing_attr_no_new_routing_name">No v1.9 routing rules</string>
-    <string name="routing_attr_no_new_routing_description">Do not use v1.9 routing</string>
+    <string name="routing_attr_no_new_routing_description">Do not use routing rules introduced in v1.9</string>
     <string name="dash_download_msg_none">Do you want to download offline maps?</string>
     <string name="dash_download_msg">You have downloaded %1$s maps</string>
     <string name="dash_download_new_one">Download new map</string>

OsmAnd/res/values/styles.xml

@@ -12,33 +12,33 @@
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:layout_height">fill_parent</item>
-        <item name="android:paddingTop">2dp</item>
+        <item name="android:paddingBottom">@dimen/subHeaderPadding</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:textColor">@color/dashboard_black</item>
-        <item name="android:layout_marginLeft">15dp</item>ll
+        <item name="android:layout_marginLeft">@dimen/subHeaderMarginLeft</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">@dimen/subHeaderTextSize</item>
     </style>
 
     <style name="DashboardGeneralButton">
-        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_marginRight">@dimen/showAllButtonMarginRight</item>
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">36dp</item>
+        <item name="android:layout_height">@dimen/showAllButtonHeight</item>
         <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">@dimen/showAllButtonTextSize</item>
         <item name="android:textColor">@color/dashboard_blue</item>
         <item name="android:background">@drawable/dashboard_button</item>
     </style>
 
     <style name="DashboardSearchButton">
-        <item name="android:paddingTop">17dp</item>
+        <item name="android:paddingTop">@dimen/dashSearchPaddingTop</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">@dimen/showAllButtonTextSize</item>
         <item name="android:textColor">@color/dashboard_black</item>
         <item name="android:background">@drawable/dashboard_button</item>
 		<item name="android:gravity">bottom|center_horizontal</item>
-		<item name="android:paddingBottom">11dp</item>
+		<item name="android:paddingBottom">@dimen/dashSearchPaddingBot</item>
     </style>
 
     <style name="ListText">

OsmAnd/src/net/osmand/core/android/MapRendererContext.java

@@ -1,7 +1,11 @@
 package net.osmand.core.android;
 
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import net.osmand.core.jni.IMapTiledSymbolsProvider;
@@ -17,6 +21,7 @@ import net.osmand.core.jni.MapStylesCollection;
 import net.osmand.core.jni.ObfMapObjectsProvider;
 import net.osmand.core.jni.QStringStringHash;
 import net.osmand.core.jni.ResolvedMapStyle;
+import net.osmand.core.jni.SwigUtilities;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
@@ -30,7 +35,8 @@ import net.osmand.util.Algorithms;
  * @author Alexey Pelykh
  *
  */
-public class MapRendererContext {
+public class MapRendererContext implements RendererRegistry.IRendererLoadedEventListener {
+    private static final String TAG = "MapRendererContext";
 
 	private static final int OBF_RASTER_LAYER = 0;
 	private OsmandApplication app;
@@ -101,7 +107,7 @@ public class MapRendererContext {
 	}
 
 	protected float getDisplayDensityFactor() {
-		return (float) (app.getSettings().MAP_DENSITY.get()) * Math.max(1, density);
+		return app.getSettings().MAP_DENSITY.get() * Math.max(1, density);
 	}
 
 	protected int getRasterTileSize() {
@@ -126,7 +132,28 @@ public class MapRendererContext {
 			rendName = "default";
 		}
 		if (!mapStyles.containsKey(rendName)) {
-			mapStyles.put(rendName, mapStylesCollection.getResolvedStyleByName(rendName));
+            Log.d(TAG, "Style '" + rendName + "' not in cache");
+            if (mapStylesCollection.getStyleByName(rendName) == null) {
+                Log.d(TAG, "Unknown '" + rendName + "' style, need to load");
+
+                // Ensure parents are loaded (this may also trigger load)
+                app.getRendererRegistry().getRenderer(rendName);
+
+                if (mapStylesCollection.getStyleByName(rendName) == null) {
+                    try {
+                        loadStyleFromStream(rendName, app.getRendererRegistry().getInputStream(rendName));
+                    } catch (IOException e) {
+                        Log.e(TAG, "Failed to load '" + rendName + "'", e);
+                    }
+                }
+            }
+            ResolvedMapStyle mapStyle = mapStylesCollection.getResolvedStyleByName(rendName);
+            if (mapStyle != null) {
+                mapStyles.put(rendName, mapStyle);
+            } else {
+                Log.d(TAG, "Failed to resolve '" + rendName + "', will use 'default'");
+                rendName = "default";
+            }
 		}
 		ResolvedMapStyle mapStyle = mapStyles.get(rendName);
 		CachedMapPresentation pres = new CachedMapPresentation(langId, langPref, mapStyle, displayDensityFactor);
@@ -163,10 +190,9 @@ public class MapRendererContext {
 		}
 
 		QStringStringHash convertedStyleSettings = new QStringStringHash();
-		for (Iterator<Map.Entry<String, String>> itSetting = props.entrySet().iterator(); itSetting.hasNext();) {
+        for (Map.Entry<String, String> setting : props.entrySet()) {
-			Map.Entry<String, String> setting = itSetting.next();
+            convertedStyleSettings.set(setting.getKey(), setting.getValue());
-			convertedStyleSettings.set(setting.getKey(), setting.getValue());
+        }
-		}
 		if (nightMode) {
 			convertedStyleSettings.set("nightMode", "true");
 		}
@@ -200,7 +226,7 @@ public class MapRendererContext {
 		}
 		// Create new OBF map symbols provider
 		obfMapSymbolsProvider = new MapObjectsSymbolsProvider(mapPrimitivesProvider, getReferenceTileSize(),
-				app.getSettings().TEXT_SCALE.get() / Math.max(1, density) );
+				app.getSettings().TEXT_SCALE.get());
 		// If there's bound view, add new provider
 		if (mapRendererView != null) {
 			mapRendererView.addSymbolsProvider(obfMapSymbolsProvider);
@@ -221,8 +247,7 @@ public class MapRendererContext {
 			mapRendererView.addSymbolsProvider(obfMapSymbolsProvider);
 		}
 	}
-	
+
-	
 	private class CachedMapPresentation {
 		String langId ;
 		LanguagePreference langPref;
@@ -257,7 +282,45 @@ public class MapRendererContext {
 				return false;
 			return true;
 		}
-		
 	}
-	
+
+    public void onRendererLoaded(String name, RenderingRulesStorage rules, InputStream source) {
+        loadStyleFromStream(name, source);
+    }
+
+    private void loadStyleFromStream(String name, InputStream source) {
+        if (RendererRegistry.DEFAULT_RENDER.equals(name)) {
+            if (source != null) {
+                try {
+                    source.close();
+                } catch(IOException e) {}
+            }
+            return;
+        }
+
+        Log.d(TAG, "Going to pass '" + name + "' style content to native");
+        byte[] content;
+        try {
+            ByteArrayOutputStream intermediateBuffer = new ByteArrayOutputStream();
+            int nRead;
+            byte[] data = new byte[16384];
+            while ((nRead = source.read(data, 0, data.length)) != -1) {
+                intermediateBuffer.write(data, 0, nRead);
+            }
+            intermediateBuffer.flush();
+            content = intermediateBuffer.toByteArray();
+        } catch(IOException e) {
+            Log.e(TAG, "Failed to read style content", e);
+            return;
+        } finally {
+            try {
+                source.close();
+            } catch(IOException e) {}
+        }
+
+        if (!mapStylesCollection.addStyleFromByteArray(
+                SwigUtilities.createQByteArrayAsCopyOf(content), name)) {
+            Log.w(TAG, "Failed to add style from byte array");
+        }
+    }
 }

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

@@ -9,6 +9,8 @@ import java.util.Random;
 import android.graphics.Color;
 import android.os.Build;
 import android.view.Gravity;
+import android.view.ViewTreeObserver;
+import android.widget.LinearLayout;
 import net.osmand.Location;
 import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.OsmAndAppCustomization;
@@ -113,7 +115,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 		setupContributionVersion();
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-			FloatingActionButton fabButton = new FloatingActionButton.Builder(this)
+			final FloatingActionButton fabButton = new FloatingActionButton.Builder(this)
 					.withDrawable(getResources().getDrawable(R.drawable.ic_action_map))
 					.withButtonColor(Color.parseColor("#ff8f00"))
 					.withGravity(Gravity.BOTTOM | Gravity.RIGHT)
@@ -125,6 +127,37 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 					startMapActivity();
 				}
 			});
+
+			final ScrollView mainScroll = (ScrollView) findViewById(R.id.main_scroll);
+			if (mainScroll == null){
+				return;
+			}
+			mainScroll.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() {
+				private int previousScroll = 0;
+
+				@Override
+				public void onScrollChanged() {
+					int scrollY = mainScroll.getScrollY();
+					if (previousScroll == scrollY || mainScroll.getChildCount() == 0){
+						return;
+					}
+
+					if (scrollY > previousScroll && previousScroll >= 0){
+						if (!fabButton.isHidden() ){
+							fabButton.hideFloatingActionButton();
+						}
+					} else {
+						int layoutHeight = mainScroll.getChildAt(0).getMeasuredHeight();
+						int scrollHeight = scrollY + mainScroll.getHeight();
+						//scroll can actually be more than entire layout height
+						if (fabButton.isHidden() && scrollHeight < layoutHeight){
+							fabButton.showFloatingActionButton();
+						}
+					}
+					previousScroll = scrollY;
+				}
+
+			});
 		}
 	}
 

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

@@ -141,7 +141,7 @@ public class MapActivityActions implements DialogProvider {
 		builder.setTitle(R.string.add_waypoint_dialog_title);
 		FrameLayout parent = new FrameLayout(mapActivity);
 		final EditText editText = new EditText(mapActivity);
-		editText.setId(R.id.TextView);
+		editText.setId(android.R.id.edit);
 		parent.setPadding(15, 0, 15, 0);
 		parent.addView(editText);
 		builder.setView(parent);
@@ -540,7 +540,7 @@ public class MapActivityActions implements DialogProvider {
 					args.getDouble(KEY_LATITUDE), args.getDouble(KEY_LONGITUDE),args.getString(KEY_NAME));
 			break;
 		case DIALOG_ADD_WAYPOINT:
-			EditText v = (EditText) dialog.getWindow().findViewById(R.id.TextView);
+			EditText v = (EditText) dialog.getWindow().findViewById(android.R.id.edit);
 			v.setPadding(5, 0, 5, 0);
 			if(args.getString(KEY_NAME) != null) {
 				v.setText(args.getString(KEY_NAME));

OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java

@@ -29,9 +29,6 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
 		plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
-		if (plugin == null) {
-			return super.onCreateView(inflater, container, savedInstanceState);
-		}
 
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_audio_video_notes_plugin, container, false);
 		Typeface typeface = FontCache.getRobotoMedium(getActivity());
@@ -51,6 +48,9 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 	@Override
 	public void onResume() {
 		super.onResume();
+		if (plugin == null) {
+			plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
+		}
 		setupNotes();
 	}
 
@@ -61,6 +61,10 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 
 	public void setupNotes() {
 		View mainView = getView();
+		if (plugin == null){
+			(mainView.findViewById(R.id.main_notes)).setVisibility(View.GONE);
+			return;
+		}
 
 		List<AudioVideoNotesPlugin.Recording> notes = new ArrayList<AudioVideoNotesPlugin.Recording>(plugin.getAllRecordings());
 		if (notes.size() == 0){

OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java

@@ -84,6 +84,9 @@ public class DashDownloadMapsFragment extends DashBaseFragment {
 			}
 
 			protected void updateCount(String s) {
+				if (DashDownloadMapsFragment.this.isDetached()){
+					return;
+				}
 				File ms = getMyApplication().getAppPath(s);
 				if (ms.exists()) {
 					File[] lf = ms.listFiles();
@@ -101,6 +104,9 @@ public class DashDownloadMapsFragment extends DashBaseFragment {
 			@Override
 			protected void onPostExecute(Void result) {
 				super.onPostExecute(result);
+				if (DashDownloadMapsFragment.this.isDetached()){
+					return;
+				}
 				if(countMaps > 0) {
 					long mb = 1 << 20;
 					long gb = 1 << 30;

OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java

@@ -148,10 +148,6 @@ public class DashFavoritesFragment extends DashBaseFragment {
 					MapActivity.launchMapActivityMoveToTop(getActivity());
 				}
 			});
-			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
-
-			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
-			view.setLayoutParams(lp);
 			favorites.addView(view);
 		}
 	}

OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java

@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import android.graphics.Typeface;
 import android.media.Image;
 import android.widget.*;
 import net.osmand.plus.R;
@@ -19,6 +20,7 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import net.osmand.plus.helpers.FontCache;
 
 /**
  * Created by Denis on 21.11.2014.
@@ -37,7 +39,11 @@ public class DashUpdatesFragment extends DashBaseFragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_updates_fragment, container, false);
-		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
+		Typeface typeface = FontCache.getRobotoMedium(getActivity());
+		((TextView) view.findViewById(R.id.header)).setTypeface(typeface);
+		Button showAll = (Button) view.findViewById(R.id.show_all);
+		showAll.setTypeface(typeface);
+		showAll.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				final Intent intent = new Intent(view.getContext(), getMyApplication().getAppCustomization().getDownloadIndexActivity());
@@ -81,7 +87,6 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		progressBars.clear();
 		baseNames.clear();
 		downloadButtons.clear();
-		mainView.findViewById(R.id.main_progress).setVisibility(View.GONE);
 		((TextView) mainView.findViewById(R.id.header)).setText(getString(R.string.map_update ,String.valueOf(list.size())));
 
 		LinearLayout updates = (LinearLayout) mainView.findViewById(R.id.updates_items);
@@ -161,7 +166,6 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			});
 			boolean intermediate = basicProgressAsyncTask.isIndeterminate();
 			currentProgress.setVisibility(intermediate ? View.GONE : View.VISIBLE);
-			//getView().findViewById(R.id.main_progress).setVisibility(intermediate ? View.VISIBLE : View.GONE);
 			if (!intermediate) {
 				currentProgress.setProgress(basicProgressAsyncTask.getProgressPercentage());
 			}

OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java

@@ -479,12 +479,16 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		//fixes issue when local files not shown after switching tabs
-		if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0){
+		//temporarily separate this if statement to identify NPE on soma installations
+		//if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0){
+		if (listAdapter.getGroupCount() == 0){
+		  if (getDownloadActivity().getLocalIndexInfos().size() > 0){
 			for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()){
 				listAdapter.addLocalIndexInfo(info);
 			}
 			listAdapter.sortData();
 			getExpandableListView().setAdapter(listAdapter);
+		  }
 		}
 		ActionBar actionBar = getDownloadActivity().getSupportActionBar();
 		//hide action bar from downloadindexfragment

OsmAnd/src/net/osmand/plus/render/RendererRegistry.java

@@ -32,6 +32,12 @@ public class RendererRegistry {
 	private Map<String, String> internalRenderers = new LinkedHashMap<String, String>();
 	
 	private Map<String, RenderingRulesStorage> renderers = new LinkedHashMap<String, RenderingRulesStorage>();
+
+    public interface IRendererLoadedEventListener {
+        void onRendererLoaded(String name, RenderingRulesStorage rules, InputStream source);
+    }
+
+    private IRendererLoadedEventListener rendererLoadedEventListener;
 	
 	public RendererRegistry(){
 		internalRenderers.put(DEFAULT_RENDER, "default.render.xml");
@@ -126,12 +132,16 @@ public class RendererRegistry {
 		} finally {
 			is.close();
 		}
+
+        if (rendererLoadedEventListener != null)
+            rendererLoadedEventListener.onRendererLoaded(name, main, getInputStream(name));
+
 		return main;
 	}
 
 	@SuppressWarnings("resource")
-	private InputStream getInputStream(String name) throws FileNotFoundException {
+	public InputStream getInputStream(String name) throws FileNotFoundException {
-		InputStream is = null;
+		InputStream is;
 		if("default".equalsIgnoreCase(name)) {
 			name = DEFAULT_RENDER;
 		} 
@@ -169,5 +179,11 @@ public class RendererRegistry {
 		this.currentSelectedRender = currentSelectedRender;
 	}
 
-	
+    public void setRendererLoadedEventListener(IRendererLoadedEventListener listener) {
+        rendererLoadedEventListener = listener;
+    }
+
+    public IRendererLoadedEventListener getRendererLoadedEventListener() {
+        return rendererLoadedEventListener;
+    }
 }

OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java

@@ -11,12 +11,12 @@ public class AlarmInfo implements LocationPoint {
 		SPEED_CAMERA(1),
 		SPEED_LIMIT(2),
 		BORDER_CONTROL(3),
-		TRAFFIC_CALMING(4),
+		RAILWAY(4),
-		TOLL_BOOTH(5),
+		TRAFFIC_CALMING(5),
-		STOP(6),
+		TOLL_BOOTH(6),
-		MAXIMUM(7),
+		STOP(7),
 		PEDESTRIAN(8),
-		RAILWAY(9);
+		MAXIMUM(9);
 		
 		private int priority;
 
@@ -118,6 +118,10 @@ public class AlarmInfo implements LocationPoint {
 			}
 		} else if("traffic_calming".equals(ruleType.getTag())) {
 			alarmInfo = new AlarmInfo(AlarmInfoType.TRAFFIC_CALMING, locInd);
+		} else if ("railway".equals(ruleType.getTag()) && "level_crossing".equals(ruleType.getValue())) {
+			alarmInfo = new AlarmInfo(AlarmInfoType.RAILWAY, locInd);
+		} else if ("crossing".equals(ruleType.getTag()) && "uncontrolled".equals(ruleType.getValue())){
+			alarmInfo = new AlarmInfo(AlarmInfoType.PEDESTRIAN, locInd);
 		}
 		if(alarmInfo != null) {
 			alarmInfo.setLatLon(loc.getLatitude(), loc.getLongitude());

OsmAnd/src/net/osmand/plus/views/corenative/NativeCoreContext.java

@@ -58,37 +58,15 @@ public class NativeCoreContext {
 				
 				ObfsCollection obfsCollection = new ObfsCollection();
 				obfsCollection.addDirectory(directory.getAbsolutePath(), false);
-				
+
-				MapStylesCollection mapStylesCollection = setupMapStyleCollection(app);
+                mapRendererContext = new MapRendererContext(app, dm.density);
-				mapRendererContext = new MapRendererContext(app, dm.density);
+				mapRendererContext.setupObfMap(new MapStylesCollection(), obfsCollection);
-				mapRendererContext.setupObfMap(mapStylesCollection, obfsCollection);
+                app.getRendererRegistry().setRendererLoadedEventListener(mapRendererContext);
 				init = true;
 			}
 		}
 	}
 
-	private static MapStylesCollection setupMapStyleCollection(
-			OsmandApplication app) {
-		MapStylesCollection mapStylesCollection = new MapStylesCollection();
-		// Alexey TODO
-//		internalRenderers.put("Touring-view_(more-contrast-and-details)", "Touring-view_(more-contrast-and-details)" +".render.xml");
-//		internalRenderers.put("UniRS", "UniRS" + ".render.xml");
-//		internalRenderers.put("LightRS", "LightRS" + ".render.xml");
-//		internalRenderers.put("High-contrast-roads", "High-contrast-roads" + ".render.xml");
-//		internalRenderers.put("Winter-and-ski", "Winter-and-ski" + ".render.xml");
-		File renderers = app.getAppPath(IndexConstants.RENDERERS_DIR);
-		File[] lf = renderers.listFiles();
-		if(lf != null) {
-			for(File f : lf) {
-				if(f.getName().endsWith(IndexConstants.RENDERER_INDEX_EXT)) {
-					mapStylesCollection.addStyleFromFile(f.getAbsolutePath());
-				}
-			}
-		}
-		return mapStylesCollection;
-	}
-
-	
 	public static MapRendererContext getMapRendererContext() {
 		return mapRendererContext;
 	}

OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java

@@ -743,6 +743,10 @@ public class RouteInfoWidgetsFactory {
 							locimgId = R.drawable.warnings_stop;
 							text = "";
 							//text = "STOP";
+						} else if(alarm.getType() == AlarmInfoType.RAILWAY) {
+							locimgId = R.drawable.warnings_railways;
+						} else if(alarm.getType() == AlarmInfoType.PEDESTRIAN) {
+							locimgId = R.drawable.warnings_pedestrian;
 						}
 						visible = (text != null &&  text.length() > 0) || locimgId != 0;
 						if (visible) {