Merge branch 'master' into add_description_to_route_parameters

# Conflicts:
#	OsmAnd/res/values-zh-rCN/strings.xml
#	OsmAnd/res/values/strings.xml

OsmAnd-api/src/net/osmand/aidlapi/map/ALocation.java

@@ -25,6 +25,24 @@ public class ALocation extends AidlParams {
     private ALocation() {
     }
 
+    public ALocation(double latitude, double longitude, long time, boolean hasAltitude, double altitude,
+                     boolean hasSpeed, float speed, boolean hasBearing, float bearing,
+                     boolean hasAccuracy, float accuracy, boolean hasVerticalAccuracy, float verticalAccuracy) {
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.time = time;
+        this.hasAltitude = hasAltitude;
+        this.altitude = altitude;
+        this.hasSpeed = hasSpeed;
+        this.speed = speed;
+        this.hasBearing = hasBearing;
+        this.bearing = bearing;
+        this.hasAccuracy = hasAccuracy;
+        this.accuracy = accuracy;
+        this.hasVerticalAccuracy = hasVerticalAccuracy;
+        this.verticalAccuracy = verticalAccuracy;
+    }
+
     public ALocation(Parcel in) {
         readFromParcel(in);
     }

OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java

@@ -1255,6 +1255,10 @@ public class GPXUtilities {
 			return g;
 		}
 
+		public boolean containsRoutePoint(WptPt point) {
+			return getRoutePoints().contains(point);
+		}
+
 		public List<WptPt> getRoutePoints() {
 			List<WptPt> points = new ArrayList<>();
 			for (int i = 0; i < routes.size(); i++) {

OsmAnd-java/src/main/java/net/osmand/osm/RouteActivityType.java

@@ -1,42 +1,76 @@
 package net.osmand.osm;
 
-public enum RouteActivityType {
-	WATER("Water", "yellow"),  WINTER("Winter", "yellow"), SNOWMOBILE("Snowmobile", "yellow"), RIDING("Riding", "yellow"), RACING("Racing", "yellow"),
-	MOUNTAINBIKE("Mountainbike", "blue"), CYCLING("Cycling", "blue"),
-	HIKING("Hiking", "orange"),  RUNNING("Running", "orange"), WALKING("Walking", "orange"),
-	OFFROAD("Off-road", "yellow"), 
-	MOTORBIKE("Motorbike", "green"), CAR("Car", "green");
-	// less specific bottom order
+import java.util.ArrayList;
+import java.util.List;
 
+public class RouteActivityType {
+	private static final List<RouteActivityType> values = new ArrayList<>();
+	public static final String DEFAULT_ICON = "special_marker";
+	public static final String DEFAULT_COLOR = "orange";
+
+	public static final RouteActivityType WATER = createType("water", "yellow").icon("special_kayak").reg();
+	public static final RouteActivityType WINTER = createType("winter", "yellow").icon("special_skiing").reg();
+	public static final RouteActivityType SNOWMOBILE = createType("snowmobile", "yellow").icon("special_snowmobile").reg();
+	public static final RouteActivityType RIDING = createType("riding", "yellow").icon("special_horse").reg();
+	public static final RouteActivityType RACING = createType("racing", "yellow").icon("raceway").reg();
+	public static final RouteActivityType MOUNTAINBIKE = createType("mountainbike", "blue").icon("sport_cycling").reg();
+	public static final RouteActivityType CYCLING = createType("cycling", "blue").icon("special_bicycle").reg();
+	public static final RouteActivityType HIKING = createType("hiking", "orange").icon("special_trekking").reg();
+	public static final RouteActivityType RUNNING = createType("running", "orange").icon("running").reg();
+	public static final RouteActivityType WALKING = createType("walking", "orange").icon("special_walking").reg();
+	public static final RouteActivityType OFFROAD = createType("offroad", "yellow").icon("special_offroad").reg();
+	public static final RouteActivityType MOTORBIKE = createType("motorbike", "green").icon("special_motorcycle").reg();
+	public static final RouteActivityType CAR = createType("car", "green").icon("shop_car").reg();
+	// less specific bottom order
 	String name;
 	String color;
+	String icon;
 
-	private RouteActivityType(String nm, String clr) {
+	RouteActivityType(String nm, String clr) {
 		this.name = nm;
 		this.color = clr;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public String getColor() {
 		return color;
 	}
-	
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public static RouteActivityType getOrCreateTypeFromName(String name) {
+		for (RouteActivityType rat : values) {
+			if (rat.name.equalsIgnoreCase(name)) {
+				return rat;
+			}
+		}
+		return createType(name.toLowerCase(), DEFAULT_COLOR).icon(DEFAULT_ICON).reg();
+	}
+
+	private static RouteActivityTypeBuilder createType(String name, String color) {
+		RouteActivityTypeBuilder builder = new RouteActivityTypeBuilder();
+		builder.routeActivityType = new RouteActivityType(name, color);
+		return builder;
+	}
+
 	public static RouteActivityType getTypeFromTags(String[] tags) {
 		RouteActivityType activityType = null;
 		for (String tg : tags) {
 			RouteActivityType rat = RouteActivityType.convertFromOsmGPXTag(tg);
 			if (rat != null) {
-				if (activityType == null || activityType.ordinal() > rat.ordinal()) {
+				if (activityType == null || values.indexOf(activityType) > values.indexOf(rat)) {
 					activityType = rat;
 				}
 			}
 		}
 		return activityType;
 	}
-	
+
 	public static RouteActivityType convertFromOsmGPXTag(String tg) {
 		String t = tg.toLowerCase();
 		if ("mountain hiking".equalsIgnoreCase(t)) {
@@ -215,4 +249,18 @@ public enum RouteActivityType {
 		return null;
 	}
 
+	public static class RouteActivityTypeBuilder {
+
+		private RouteActivityType routeActivityType;
+
+		public RouteActivityTypeBuilder icon(String icon) {
+			routeActivityType.icon = icon;
+			return this;
+		}
+
+		private RouteActivityType reg() {
+			values.add(routeActivityType);
+			return routeActivityType;
+		}
+	}
 }

OsmAnd-java/src/main/java/net/osmand/osm/edit/EntityParser.java

@@ -21,7 +21,7 @@ import net.osmand.osm.edit.Relation.RelationMember;
 import net.osmand.util.Algorithms;
 
 public class EntityParser {
-	
+
 	public static void parseMapObject(MapObject mo, Entity e, Map<String, String> tags) {
 		mo.setId(e.getId());
 		if(mo instanceof Amenity) {
@@ -123,7 +123,7 @@ public class EntityParser {
 			mo.setName(ref);
 		}
 	}
-	
+
 	private static void setNameFromBrand(MapObject mo, Map<String, String> tags) {
 		String ref = tags.get(OSMTagKey.BRAND.getValue());
 		if(ref != null){
@@ -140,7 +140,7 @@ public class EntityParser {
 			op += " [" + ref + "]";
 		mo.setName(op);
 	}
-	
+
 
 	private static String getWebSiteURL(Map<String, String> tagValues, boolean checkWikipedia) {
 		String siteUrl = null;
@@ -170,14 +170,14 @@ public class EntityParser {
 		}
 		return siteUrl;
 	}
-	
-	
+
+
 	public static List<Amenity> parseAmenities(MapPoiTypes poiTypes, Entity entity, Map<String, String> tags,
 			List<Amenity> amenitiesList) {
 		amenitiesList.clear();
 		// it could be collection of amenities
 		boolean relation = entity instanceof Relation;
-		boolean purerelation = relation && 
+		boolean purerelation = relation &&
 				!("multipolygon".equals(tags.get("type")) || "boundary".equals(tags.get("type")));
 		Collection<Map<String, String>> it = MapRenderingTypes.splitTagsIntoDifferentObjects(tags);
 		for (Map<String, String> ts : it) {
@@ -201,9 +201,7 @@ public class EntityParser {
 		}
 		return amenitiesList;
 	}
-	
-	
-	
+
 	private static boolean checkAmenitiesToAdd(Amenity a, List<Amenity> amenitiesList){
 		// check amenity for duplication
 		for(Amenity b : amenitiesList){
@@ -212,9 +210,9 @@ public class EntityParser {
 			}
 		}
 		return true;
-		
+
 	}
-	
+
 	public static Building parseBuilding(Entity e){
 		Building b = new Building();
 		parseMapObject(b, e, e.getTags());
@@ -228,7 +226,7 @@ public class EntityParser {
 			List<Node> nodes = ((Way) e).getNodes();
 			for(int i = 0; i < nodes.size(); i++) {
 				Node node = nodes.get(i);
-				if(node != null && "yes".equals(node.getTag(OSMTagKey.ENTRANCE)) && 
+				if(node != null && "yes".equals(node.getTag(OSMTagKey.ENTRANCE)) &&
 						!Algorithms.isEmpty(node.getTag(OSMTagKey.REF))) {
 					b.addEntrance(node.getTag(OSMTagKey.REF), node.getLatLon());
 				}
@@ -236,11 +234,11 @@ public class EntityParser {
 		}
 		return b;
 	}
-	
+
 	public static City parseCity(Node el) {
 		return parseCity(el, CityType.valueFromString(el.getTag(OSMTagKey.PLACE.getValue())));
 	}
-	
+
 	public static City parseCity(Entity el, CityType t) {
 		if(t == null) {
 			return null;
@@ -252,15 +250,15 @@ public class EntityParser {
 		c.setIsin(isin);
 		return c;
 	}
-	
-	
+
+
 	public static TransportRoute parserRoute(Relation r, String ref){
 		TransportRoute rt = new TransportRoute();
 		parseMapObject(rt, r, r.getTags());
 		rt.setRef(ref);
 		return rt;
 	}
-	
+
 	public static TransportStop parseTransportStop(Entity e){
 		TransportStop st = new TransportStop();
 		parseMapObject(st, e, e.getTags());

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

@@ -658,7 +658,7 @@ public class BinaryRoutePlanner {
 							break;
 						}
 					}
-					if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
+					if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
 						type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
 						break;
 					}
@@ -675,7 +675,7 @@ public class BinaryRoutePlanner {
 						}
 					}
 
-					if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
+					if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
 						type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
 						break;
 					}

OsmAnd-telegram/res/values-uk/strings.xml

@@ -135,10 +135,10 @@
     <string name="mile">мл</string>
     <string name="km">км</string>
     <string name="m">м</string>
-    <string name="nm">мор.м.</string>
+    <string name="nm">nmi</string>
     <string name="min_mile">хв/м</string>
     <string name="min_km">хв/км</string>
-    <string name="nm_h">вузл</string>
+    <string name="nm_h">вузлів</string>
     <string name="m_s">м/с</string>
     <string name="km_h">км/г</string>
     <string name="mile_per_hour">мл/г</string>

OsmAnd/.gitignore

@@ -39,8 +39,6 @@ mx_*
 valgrind/
 bin/
 dist/
-res/values/no_translate.xml
-res/values/skip_translate.xml
 assets/specialphrases/*
 assets/voice/*
 assets/fonts/*

OsmAnd/AndroidManifest-gplayFree.xml

@@ -4,7 +4,7 @@
 
     <application
         android:icon="@mipmap/icon_free"
-		android:label="@string/app_name_free"
+		android:label="@string/app_name"
         tools:replace="android:icon, android:label">
 
         <meta-data

OsmAnd/AndroidManifest-huawei.xml

@@ -4,7 +4,7 @@
 
 	<application
 		android:icon="@mipmap/icon_free"
-		android:label="@string/app_name_free"
+		android:label="OsmAnd — Offline Maps &amp; GPS Navigation"
 		tools:replace="android:icon, android:label">
 
 		<meta-data

OsmAnd/AndroidManifest-library.xml

@@ -40,9 +40,6 @@
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
 	<uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/>
 
-	<uses-sdk android:targetSdkVersion="26"
-		tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/>
-
 	<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
 		android:xlargeScreens="true" android:anyDensity="true" />
 

OsmAnd/AndroidManifest-nightlyFree.xml

@@ -5,9 +5,6 @@
     <application
         android:icon="@mipmap/icon_nightly"
         tools:replace="android:icon">
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="fb792288460976727"/>
         <activity
             android:name="net.osmand.plus.activities.MapActivity"
             android:theme="@style/FirstSplashScreenNightlyFree"

OsmAnd/build-common.gradle

@@ -106,15 +106,6 @@ android {
 	}
 }
 
-task updateNoTranslate(type: Copy) {
-	from('.') {
-		include 'no_translate.xml'
-		filter {
-			line -> replaceNoTranslate(line);
-		}
-	}
-	into 'res/values/'
-}
 
 task validateTranslate {
 	println "Validating translations"
@@ -147,10 +138,6 @@ task collectVoiceAssets(type: Sync) {
 	include "**/*.js"
 }
 
-task cleanNoTranslate(type: Delete) {
-	delete('res/values/no_translate.xml')
-}
-
 task collectFonts(type: Copy) {
 	from "../../resources/fonts"
 	from "../../resources/rendering_styles/fonts"
@@ -262,7 +249,6 @@ task collectExternalResources {
 			copyMapShaderIcons,
 			copyMapPOIIcons,
 			copyLargePOIIcons,
-			updateNoTranslate,
 			validateTranslate,
 			copyWidgetIcons,
 			copyWidgetIconsHdpi,

OsmAnd/build-library.gradle

@@ -24,14 +24,11 @@ android {
 		// Build that doesn't include 3D OpenGL
 		legacy {
 			dimension "coreversion"
+			resValue "string", "app_edition", ""
 		}
 	}
 }
 
-def replaceNoTranslate(line) {
-	return line;
-}
-
 afterEvaluate {
 	android.libraryVariants.all { variant ->
 		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)

OsmAnd/build.gradle

@@ -36,9 +36,9 @@ android {
 
 	defaultConfig {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 15
-		versionCode 390
+		versionCode 400
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
-		versionName "3.9.0"
+		versionName "4.0.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
 	}
@@ -105,31 +105,45 @@ android {
 		nightlyFree {
 			dimension "version"
 			applicationId "net.osmand.dev"
+			resValue "string", "app_name", "OsmAnd Nightly"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 			// resConfig "en"
 		}
 		androidFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
+			resValue "string", "app_name", "OsmAnd~"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 		}
 		gplayFree {
 			dimension "version"
 			applicationId "net.osmand"
+			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 		}
 		gplayFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
+			resValue "string", "app_name", "OsmAnd+"
+			resValue "string", "app_edition", System.getenv("APP_EDITION") ? System.getenv("APP_EDITION") : ""
 		}
 		amazonFree {
 			dimension "version"
 			applicationId "net.osmand"
+			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", ""
 		}
 		amazonFull {
 			dimension "version"
 			applicationId "net.osmand.plus"
+			resValue "string", "app_name", "OsmAnd+"
+			resValue "string", "app_edition", ""
 		}
 		huawei {
 			dimension "version"
 			applicationId "net.osmand.huawei"
+			resValue "string", "app_name", "OsmAnd"
+			resValue "string", "app_edition", ""
 		}
 
         // Build that includes 3D OpenGL release
@@ -153,19 +167,6 @@ android {
 
 }
 
-def replaceNoTranslate(line) {
-	if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_NAME")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
-	}
-	if (line.contains("\"app_name_free\"") && System.getenv("TARGET_APP_NAME")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
-	}
-	if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")
-	}
-	return line;
-}
-
 afterEvaluate {
 	android.applicationVariants.all { variant ->
 		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)

OsmAnd/res/drawable/bottom_navigation_item_bg_dark.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:drawable="@color/wikivoyage_card_bg_dark" android:state_selected="false" />
+
+	<item android:drawable="@drawable/navigation_item_active_bg_dark" android:state_selected="true" />
+
+</selector>

OsmAnd/res/drawable/bottom_navigation_item_bg_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:drawable="@color/wikivoyage_card_bg_light" android:state_selected="false" />
+
+	<item android:drawable="@drawable/navigation_item_active_bg_light" android:state_selected="true" />
+
+</selector>

OsmAnd/res/drawable/navigation_item_active_bg_dark.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_color_primary_dark" />
+		</shape>
+	</item>
+
+	<item android:top="2dp">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/wikivoyage_card_bg_dark" />
+		</shape>
+	</item>
+
+</layer-list>

OsmAnd/res/drawable/navigation_item_active_bg_light.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@color/active_color_primary_light" />
+		</shape>
+	</item>
+
+	<item android:top="2dp">
+		<shape android:shape="rectangle">
+			<solid android:color="@color/wikivoyage_card_bg_light" />
+		</shape>
+	</item>
+
+</layer-list>

OsmAnd/res/layout/favorite_category_dialog_item.xml

@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:orientation="horizontal">
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+	<Button
+		android:id="@+id/button"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="?attr/selectableItemBackground"
+		android:gravity="start|center_vertical"
+		android:letterSpacing="@dimen/text_button_letter_spacing"
+		android:paddingStart="10dp"
+		android:paddingLeft="10dp"
+		android:paddingEnd="10dp"
+		android:paddingRight="10dp"
+		android:textAllCaps="false"
+		android:textColor="?attr/textColorAlertDialogListItem"
+		android:textSize="@dimen/default_list_text_size"
 		osmand:drawableLeftCompat="@drawable/ic_action_folder"
 		osmand:drawableStartCompat="@drawable/ic_action_folder"
-		android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:background="?attr/selectableItemBackground"
-        android:text="Restaurant"
-        android:gravity="start|center_vertical"
-        android:textSize="@dimen/default_list_text_size"
-        android:textAllCaps="false"
-	    android:textColor="?attr/textColorAlertDialogListItem"
-	    android:paddingStart="10dp"
-	    android:paddingEnd="10dp" />
+		tools:text="@string/poi_filter_restaurants" />
 
 </LinearLayout>

OsmAnd/res/layout/gpx_overview_fragment.xml

@@ -6,6 +6,22 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/description"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:ellipsize="end"
+		android:letterSpacing="@dimen/description_letter_spacing"
+		android:maxLines="2"
+		android:minHeight="@dimen/default_desc_line_height"
+		android:textColor="?android:textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:lineHeight="@dimen/default_desc_line_height"
+		osmand:typeface="@string/font_roboto_regular"
+		tools:text="Amsterdam is the Netherlands' capital and financial, cultural and creative centre with more" />
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recycler_overview"
 		android:layout_width="match_parent"

OsmAnd/res/layout/gpx_track_item.xml

@@ -37,6 +37,7 @@
             android:layout_marginRight="@dimen/dialog_content_margin"
             android:layout_marginEnd="@dimen/dialog_content_margin"
             android:clickable="false"
+            android:scrollbars="none"
             android:focusableInTouchMode="false" />
 
         <androidx.appcompat.widget.AppCompatImageView

OsmAnd/res/layout/track_menu.xml

@@ -125,6 +125,49 @@
 
 	</LinearLayout>
 
+	<LinearLayout
+		android:id="@+id/back_button_container"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding_half"
+		android:layout_marginTop="@dimen/content_padding_half"
+		android:layout_marginRight="@dimen/content_padding_half"
+		android:background="?attr/flow_toolbar_bg"
+		android:visibility="gone"
+		tools:visibility="visible">
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="@dimen/setting_list_item_small_height"
+			android:orientation="horizontal"
+			android:paddingStart="@dimen/content_padding_half"
+			android:paddingLeft="@dimen/content_padding_half"
+			android:paddingEnd="@dimen/content_padding_small"
+			android:paddingRight="@dimen/content_padding_small">
+
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/back_button_icon"
+				android:layout_width="@dimen/standard_icon_size"
+				android:layout_height="@dimen/standard_icon_size"
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/content_padding_half"
+				android:layout_marginRight="@dimen/content_padding_half"
+				android:tint="?attr/active_color_basic"
+				osmand:srcCompat="@drawable/ic_arrow_back" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/back_button_text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:textColor="?attr/active_color_basic"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:text="@string/shared_string_tracks" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
 	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/context_menu_toolbar_container"
 		android:layout_width="match_parent"
@@ -206,7 +249,7 @@
 		android:layout_height="@dimen/context_menu_action_buttons_height"
 		android:layout_gravity="bottom"
 		android:background="?attr/wikivoyage_card_bg_color"
-		osmand:itemBackground="?attr/wikivoyage_card_bg_color"
+		osmand:itemBackground="?attr/bottom_navigation_item_background"
 		osmand:itemIconTint="@color/bottom_navigation_color_selector_light"
 		osmand:itemTextColor="@color/bottom_navigation_color_selector_light"
 		osmand:labelVisibilityMode="labeled"

OsmAnd/res/layout/travel_download_update_card.xml

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_marginLeft="@dimen/text_margin_small"
-	android:layout_marginRight="@dimen/text_margin_small"
-	android:background="?attr/wikivoyage_travel_card_bg"
-	android:orientation="vertical"
-	android:layout_marginEnd="@dimen/text_margin_small"
-	android:layout_marginStart="@dimen/text_margin_small">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/content_padding"
-		android:orientation="vertical">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/bottom_sheet_content_padding_small">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/title"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginEnd="@dimen/content_padding"
-				android:layout_marginRight="@dimen/content_padding"
-				android:layout_marginTop="4dp"
-				android:layout_weight="1"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_primary_text_color"
-				android:textSize="@dimen/travel_card_primary_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:text="Download file"/>
-
-			<androidx.appcompat.widget.AppCompatImageView
-				android:id="@+id/icon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				tools:ignore="ContentDescription"
-				tools:src="@drawable/travel_card_download_icon"/>
-
-		</LinearLayout>
-
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/description"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:lineSpacingMultiplier="@dimen/text_button_line_spacing_multiplier"
-			android:textColor="@color/wikivoyage_secondary_text"
-			android:textSize="@dimen/travel_card_primary_text_size"
-			osmand:typeface="@string/font_roboto_regular"
-			tools:text="Download this Wikivoyage travel guides file to view articles about places around the world without an internet connection."/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:id="@+id/file_data_container"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
-		android:background="?attr/wikivoyage_travel_card_stroke_bg"
-		android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding"
-		android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
-		android:paddingEnd="@dimen/content_padding"
-		android:paddingStart="@dimen/content_padding"
-		android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small">
-
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/file_icon"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
-			tools:ignore="ContentDescription"
-			tools:src="@drawable/ic_action_read_article"
-			tools:tint="?attr/wikivoyage_active_color"/>
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:orientation="vertical">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/file_title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_primary_text_color"
-				android:textSize="@dimen/default_list_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="Wikivoyage"/>
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/file_description"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textColor="@color/wikivoyage_secondary_text"
-				android:textSize="@dimen/default_sub_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="255 Mb • Update 11 April"/>
-
-			<ProgressBar
-				android:id="@+id/progress_bar"
-				style="?android:attr/progressBarStyleHorizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="2dp"
-				android:minHeight="0dp"
-				android:visibility="gone"
-				tools:visibility="visible"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginRight="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginEnd="@dimen/bottom_sheet_content_margin_small"
-		android:layout_marginStart="@dimen/bottom_sheet_content_margin_small">
-
-		<FrameLayout
-			android:id="@+id/secondary_btn_container"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:background="?attr/wikivoyage_secondary_btn_bg">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/secondary_button"
-				android:layout_width="match_parent"
-				android:layout_height="@dimen/wikivoyage_card_button_height"
-				android:layout_gravity="center"
-				android:background="?attr/selectableItemBackgroundBorderless"
-				android:ellipsize="end"
-				android:gravity="center"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_active_color"
-				android:textSize="@dimen/text_button_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:ignore="UnusedAttribute"
-				tools:text="Later"/>
-
-		</FrameLayout>
-
-		<View
-			android:id="@+id/buttons_divider"
-			android:layout_width="@dimen/bottom_sheet_content_margin_small"
-			android:layout_height="match_parent"/>
-
-		<FrameLayout
-			android:id="@+id/primary_btn_container"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:background="?attr/wikivoyage_primary_btn_bg">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/primary_button"
-				android:layout_width="match_parent"
-				android:layout_height="@dimen/wikivoyage_card_button_height"
-				android:layout_gravity="center"
-				android:background="?attr/selectableItemBackgroundBorderless"
-				android:ellipsize="end"
-				android:gravity="center"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
-				android:maxLines="1"
-				android:textColor="?attr/wikivoyage_primary_btn_text_color"
-				android:textSize="@dimen/text_button_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:ignore="UnusedAttribute"
-				tools:text="Update"/>
-
-		</FrameLayout>
-
-	</LinearLayout>
-
-</LinearLayout>

OsmAnd/res/layout/travel_needed_maps_card.xml

@@ -18,16 +18,34 @@
 		android:layout_margin="@dimen/content_padding"
 		android:orientation="vertical">
 
-		<net.osmand.plus.widgets.TextViewEx
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/content_padding"
-			android:ellipsize="end"
-			android:maxLines="1"
-			android:text="@string/maps_you_need"
-			android:textColor="?attr/wikivoyage_primary_text_color"
-			android:textSize="@dimen/travel_card_primary_text_size"
-			osmand:typeface="@string/font_roboto_medium"/>
+			android:layout_marginBottom="@dimen/bottom_sheet_content_padding_small">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_marginRight="@dimen/content_padding"
+				android:layout_marginTop="4dp"
+				android:layout_weight="1"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:textColor="?attr/wikivoyage_primary_text_color"
+				android:textSize="@dimen/travel_card_primary_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:text="Download file" />
+
+			<androidx.appcompat.widget.AppCompatImageView
+				android:id="@+id/icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				tools:ignore="ContentDescription"
+				tools:src="@drawable/travel_card_download_icon" />
+
+		</LinearLayout>
 
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/description"

OsmAnd/res/layout/wikivoyage_button_card.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="@dimen/content_padding"
+		android:background="?attr/wikivoyage_card_bg_color"
+		android:gravity="center_vertical">
+
+		<include
+			android:id="@+id/button"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dialog_button_height"
+			layout="@layout/bottom_sheet_dialog_button" />
+
+	</LinearLayout>
+
+	<include
+		android:id="@+id/shadow"
+		layout="@layout/card_bottom_divider"
+		android:visibility="visible" />
+</LinearLayout>

OsmAnd/res/layout/wikivoyage_travel_gpx_card.xml

@@ -139,31 +139,83 @@
 					<LinearLayout
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:orientation="vertical"
 						android:paddingTop="@dimen/content_padding_half"
 						android:paddingBottom="@dimen/content_padding_small">
 
-						<net.osmand.plus.widgets.TextViewEx
-							android:id="@+id/user_name"
+						<LinearLayout
+							android:id="@+id/user_label"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:background="@drawable/btn_border_bg_light"
-							android:gravity="center_vertical"
-							android:ellipsize="end"
-							android:maxLines="1"
-							android:paddingTop="@dimen/subHeaderPadding"
-							android:paddingBottom="@dimen/subHeaderPadding"
-							android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
-							android:paddingRight="@dimen/bottom_sheet_content_padding_small"
-							android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
-							android:textColor="?attr/active_color_basic"
-							android:textSize="@dimen/default_desc_text_size"
-							osmand:typeface="@string/font_roboto_medium"
-							android:drawablePadding="@dimen/content_padding_small_half"
-							android:drawableStart="@drawable/ic_action_user_account_16"
-							android:drawableLeft="@drawable/ic_action_user_account_16"
-							tools:drawableTint="?attr/wikivoyage_active_color"
-							tools:text="Lorem Ipsum" />
+							android:background="?attr/btn_border_bg"
+							android:layout_marginLeft="@dimen/content_padding_half"
+							android:layout_marginStart="@dimen/content_padding_half">
+
+							<androidx.appcompat.widget.AppCompatImageView
+								android:id="@+id/user_icon"
+								android:layout_width="@dimen/poi_icon_size"
+								android:layout_height="@dimen/poi_icon_size"
+								android:layout_gravity="center_vertical"
+								android:layout_marginLeft="@dimen/content_padding_small_half"
+								android:layout_marginStart="@dimen/content_padding_small_half"
+								android:contentDescription="@string/shared_string_icon"
+								tools:src="@drawable/ic_action_user_account_16" />
+
+							<net.osmand.plus.widgets.TextViewEx
+								android:id="@+id/user_name"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:gravity="center_vertical"
+								android:ellipsize="end"
+								android:maxLines="1"
+								android:paddingTop="@dimen/subHeaderPadding"
+								android:paddingBottom="@dimen/subHeaderPadding"
+								android:paddingLeft="@dimen/content_padding_small_half"
+								android:paddingRight="@dimen/content_padding_small_half"
+								android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+								android:textColor="?attr/active_color_basic"
+								android:textSize="@dimen/default_desc_text_size"
+								osmand:typeface="@string/font_roboto_medium"
+								tools:drawableTint="?attr/wikivoyage_active_color"
+								tools:text="@string/mapillary_menu_title_username" />
+						</LinearLayout>
+
+						<LinearLayout
+							android:id="@+id/activity_type_label"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:background="?attr/btn_border_bg"
+							android:visibility="gone"
+							android:layout_marginLeft="@dimen/content_padding_half"
+							android:layout_marginStart="@dimen/content_padding_half">
+
+							<androidx.appcompat.widget.AppCompatImageView
+								android:id="@+id/activity_type_icon"
+								android:layout_width="@dimen/poi_icon_size"
+								android:layout_height="@dimen/poi_icon_size"
+								android:layout_gravity="center_vertical"
+								android:layout_marginLeft="@dimen/content_padding_small_half"
+								android:layout_marginStart="@dimen/content_padding_small_half"
+								android:contentDescription="@string/shared_string_icon"
+								tools:src="@drawable/ic_action_bicycle_dark" />
+
+							<net.osmand.plus.widgets.TextViewEx
+								android:id="@+id/activity_type"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:gravity="center_vertical"
+								android:ellipsize="end"
+								android:maxLines="1"
+								android:paddingTop="@dimen/subHeaderPadding"
+								android:paddingBottom="@dimen/subHeaderPadding"
+								android:paddingLeft="@dimen/content_padding_small_half"
+								android:paddingRight="@dimen/content_padding_small_half"
+								android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+								android:textColor="?attr/active_color_basic"
+								android:textSize="@dimen/default_desc_text_size"
+								osmand:typeface="@string/font_roboto_medium"
+								tools:drawableTint="?attr/wikivoyage_active_color"
+								tools:text="@string/shared_string_profiles" />
+						</LinearLayout>
 					</LinearLayout>
 
 				</LinearLayout>
@@ -172,7 +224,6 @@
 
 			<View
 				android:layout_width="match_parent"
-				android:visibility="invisible"
 				android:layout_height="1dp"
 				android:background="?attr/wikivoyage_card_divider_color" />
 

OsmAnd/res/layout/wpt_list_item.xml

@@ -103,6 +103,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="2"
+                    android:scrollbars="none"
                     android:textColor="@color/wikivoyage_secondary_text"
                     android:textSize="@dimen/default_sub_text_size"
                     osmand:typeface="@string/font_roboto_regular"

OsmAnd/res/values-ar/phrases.xml

@@ -2133,7 +2133,7 @@
     <string name="poi_water_characteristic_mineral">المعدنيه</string>
     <string name="poi_pump_powered">تعمل بالطاقة</string>
     <string name="poi_pump_manual">يدوي</string>
-    <string name="poi_source_biomass">مصدر الطاقة: الكتلة الحيوية</string>
+    <string name="poi_generator_source_biomass">مصدر الطاقة: الكتلة الحيوية</string>
     <string name="poi_deadlock">طريق مسدود</string>
     <string name="poi_architecture_umgebinde">العمارة: umgebinde</string>
     <string name="poi_architecture_constructivism">العمارة: البنائية</string>
@@ -3075,7 +3075,7 @@
     <string name="poi_motorcar_destination">السماح بدخول السيارات: للعبور للوجهة</string>
     <string name="poi_motorcar_no">السماح بدخول السيارات: لا</string>
     <string name="poi_motorcar_private">السماح بدخول السيارات:خاص</string>
-    <string name="poi_motorcar_yes">السماح بدخول السيارات:</string>
+    <string name="poi_motorcar_yes">السماح بدخول السيارات:نعم</string>
     <string name="poi_vehicle_forestry">السماح بدخول المركبات: الخاصة بالغابات</string>
     <string name="poi_vehicle_delivery">السماح بدخول المركبات: لتسليم الطلبات</string>
     <string name="poi_vehicle_military">السماح بدخول المركبات: العسكرية</string>
@@ -3586,7 +3586,7 @@
     <string name="poi_internet_access_service">الوصول إلى الإنترنت: خدمة</string>
     <string name="poi_internet_access_public">الوصول إلى الإنترنت: عام</string>
     <string name="poi_internet_access_wired">ولوج الإنترنت: سلكي</string>
-    <string name="poi_internet_access_terminal">"ولوج  الإنترنت: terminal"</string>
+    <string name="poi_internet_access_terminal">ولوج الإنترنت: terminal</string>
     <string name="poi_internet_access_wlan">ولوج الإنترنت: wlan</string>
     <string name="poi_denomination_mahayana">ماهايانا</string>
     <string name="poi_denomination_maronite">ماروني</string>
@@ -3679,4 +3679,14 @@
     <string name="poi_wildlife_crossing_bat_bridge">جسر خفافيش</string>
     <string name="poi_wildlife_crossing">معبر الحيوانات البرية</string>
     <string name="poi_attraction_slide">شريط التمرير</string>
+    <string name="poi_craft_winery">مصنع شراب</string>
+    <string name="poi_hanami">هانامي</string>
+    <string name="poi_wayside_shrine">ضريح على جانب الطريق</string>
+    <string name="poi_wayside_cross">صليب جانبي</string>
+    <string name="poi_monastery">ديرصومعة</string>
+    <string name="poi_denomination_wesleyan">الديانة</string>
+    <string name="poi_denomination_dutch_reformed">كنيسة المصلحة الهولندية</string>
+    <string name="poi_denomination_united_methodist">الكنيسة الميثودية</string>
+    <string name="poi_denomination_pentecostal">الخمسينية</string>
+    <string name="poi_denomination_presbyterian">المشيخية</string>
 </resources>

OsmAnd/res/values-be/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_historic_tank">Танк</string>
     <string name="poi_charcoal_pile">Куча вуголля</string>
     <string name="poi_hookah_lounge">Кальянная</string>
-    <string name="poi_source_biomass">Крыніца энергіі: біямаса</string>
+    <string name="poi_generator_source_biomass">Крыніца энергіі: біямаса</string>
     <string name="poi_snowmobile_filter">Даступна для снегаходаў</string>
     <string name="poi_access_bus">Даступна для аўтобусаў</string>
     <string name="poi_access_caravan">Даступна для прычапных дамоў на колах</string>
@@ -3823,5 +3823,11 @@
     <string name="poi_recycling_small_electrical_appliances">Маленькія электрапрыборы</string>
     <string name="poi_beehive">Вулей</string>
     <string name="poi_nuts">Крама арэхаў</string>
-    <string name="poi_fuel_lng"></string>
+    <string name="poi_fuel_lng"/>
+    <string name="poi_diplomatic_services_citizen_services_filter">Паслугі для грамадзян</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Іміграцыйныя візы</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Неіміграцыйныя візы</string>
+    <string name="poi_liaison_filter">Сувязь</string>
+    <string name="poi_consulate_filter">Консульства</string>
+    <string name="poi_embassy_filter">Амбасада</string>
 </resources>

OsmAnd/res/values-be/strings.xml

@@ -88,7 +88,7 @@
     <string name="files_limit">засталося %1$d файлаў</string>
     <string name="available_downloads_left">Засталося %1$d файлаў для спампоўвання</string>
     <string name="install_paid">Поўная версія</string>
-    <string name="cancel_route">Скасаваць маршрут</string>
+    <string name="cancel_route">Скасаваць маршрут\?</string>
     <string name="cancel_navigation">Спыніць навігацыю</string>
     <string name="clear_destination">Выдаліць месца прызначэння</string>
     <string name="download_using_mobile_internet">Wi-Fi не падлучаны. Выкарыстаць дзейнае падлучэнне да Інтэрнэту для спампоўвання?</string>
@@ -514,7 +514,7 @@
     <string name="use_fluorescent_overlays">Флюарэсцэнтныя пласты</string>
     <string name="use_fluorescent_overlays_descr">Ужываць флюарэсцэнтныя колеры для слядоў і шляхоў.</string>
     <string name="offline_edition">Пазасеціўнае рэдагаванне</string>
-    <string name="offline_edition_descr">Заўсёды выкарыстоўваць аўтаномнае рэдагаванне.</string>
+    <string name="offline_edition_descr">Калі выкарыстоўваецца рэдагаванне на прыладзе, то змены будуць захаваныя лакальна і загружаныя на сервер толькі па запыце, інакш яны будуць загружацца неадкладна.</string>
     <string name="update_poi_does_not_change_indexes">Змены цікавых пунктаў (POI) у праграме не паўплываюць на cпампаваныя файлы мапаў, змены захоўваюцца як файлы на вашай прыладзе.</string>
     <string name="local_openstreetmap_uploading">Запампоўка…</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/нататкі запампаваныя</string>
@@ -1573,7 +1573,7 @@
     <string name="routing_attr_height_name">Абмежаванне па вышыні</string>
     <string name="routing_attr_height_description">Пазначыць вышыню транспартнага сродку для разліку маршруту.</string>
     <string name="use_fast_recalculation">Разумны пераразлік маршруту</string>
-    <string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту. Падыходзіць для доўгіх паездак.</string>
+    <string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту. Карысна для доўгіх паездак.</string>
     <string name="shared_string_logoff">Выйсці</string>
     <string name="rendering_value_disabled_name">Выключана</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка па пешаходнаму сімвалу OSMC</string>
@@ -1984,7 +1984,7 @@
     <string name="map_widget_bearing">Адносны азімут</string>
     <string name="map_widget_magnetic_bearing">Магнітны азімут</string>
     <string name="use_osm_live_routing">Навігацыя OsmAnd Live</string>
-    <string name="access_no_destination">Пункт прызначэння не зададзены</string>
+    <string name="access_no_destination">Убудова спецыяльных магчымасцей: Пункт прызначэння не зададзены</string>
     <string name="follow_us">Сачыце за намі</string>
     <string name="access_direction_audio_feedback">Гукавая напрамкі</string>
     <string name="access_direction_audio_feedback_descr">Індыцыраваць гукам кірунак на мэтавы пункт.</string>
@@ -2481,7 +2481,7 @@
     <string name="average">Сярэдняя</string>
     <string name="of">%1$d з %2$d</string>
     <string name="ascent_descent">Пад\'ём/Cпуск</string>
-    <string name="moving_time">Час руху</string>
+    <string name="moving_time">Час у руху</string>
     <string name="max_min">Макс/Мін</string>
     <string name="min_max">Мін/Макс</string>
     <string name="rendering_value_translucent_pink_name">Паўпразрысты ружовы</string>
@@ -2669,7 +2669,7 @@
     <string name="first_intermediate_dest_description">Дадае першы прыпынак</string>
     <string name="subsequent_dest_description">Перамясціць прызначэнне далей і стварыць яго</string>
     <string name="show_closed_notes">Паказаць закрытыя нататкі</string>
-    <string name="switch_osm_notes_visibility_desc">Паказаць/схаваць OSM-нататкі на мапе.</string>
+    <string name="switch_osm_notes_visibility_desc">Паказаць або схаваць OSM-нататкі на мапе.</string>
     <string name="gpx_file_desc">GPX падыходзіць для экспарту ў JOSM і іншыя OSM-рэдактары.</string>
     <string name="osc_file_desc">OSC падыходзіць для экспарту ў OpenStreetMap.</string>
     <string name="shared_string_gpx_file">GPX-файл</string>
@@ -3157,9 +3157,9 @@
     <string name="osmand_default_routing">Навігацыя OsmAnd</string>
     <string name="third_party_routing_type">Іншая навігацыя</string>
     <string name="quick_action_need_to_add_item_to_list">Дадаць прынамсі адзін элемент у спіс \"Хуткае дзеянне\" у наладах</string>
-    <string name="routing_attr_piste_type_downhill_name">Альпійская/горныя лыжы</string>
+    <string name="routing_attr_piste_type_downhill_name">Альпійскія і горныя лыжы</string>
     <string name="routing_attr_piste_type_downhill_description">Схілы для горных лыжаў і доступ да пад\'ёмнікаў.</string>
-    <string name="routing_attr_piste_type_nordic_name">Лыжныя гонкі / паўночныя тыпы</string>
+    <string name="routing_attr_piste_type_nordic_name">Бегавыя і скандынаўскія лыжы</string>
     <string name="routing_attr_piste_type_nordic_description">Трасы для лыжных гонак і іх паўночных тыпаў.</string>
     <string name="routing_attr_allow_intermediate_name">Дазволіць прамежкавыя маршруты</string>
     <string name="routing_attr_allow_intermediate_description">Больш складаныя трасы са стромкімі ўчасткамі. Пэўныя перашкоды, якіх варта пазбягаць.</string>
@@ -3427,9 +3427,9 @@
     <string name="osmand_purchases_item">Пакупкі OsmAnd</string>
     <string name="legend_item_description">Даведка па знаках мапы.</string>
     <string name="navigation_profiles_item">Профілі навігацыі</string>
-    <string name="create_edit_poi">Стварыць/Рэдагаваць POI</string>
+    <string name="create_edit_poi">Стварыць ці Рэдагаваць POI</string>
     <string name="parking_positions">Месца паркоўкі</string>
-    <string name="add_edit_favorite">Дадаць / рэдагаваць улюбёнае</string>
+    <string name="add_edit_favorite">Дадаць ці рэдагаваць улюбёнае</string>
     <string name="reset_deafult_order">Аднавіць прадвызначаны парадак элементаў</string>
     <string name="back_to_editing">Вярнуцца да рэдагавання</string>
     <string name="quick_action_transport_show">Паказаць грамадскі транспарт</string>
@@ -3437,7 +3437,7 @@
     <string name="shared_string_add_profile">Дадаць профіль</string>
     <string name="n_items_of_z">%1$s з %2$s</string>
     <string name="download_slope_maps">Схілы</string>
-    <string name="quick_action_show_hide_terrain">Паказаць/схаваць рэльеф</string>
+    <string name="quick_action_show_hide_terrain">Паказаць ці схаваць рэльеф</string>
     <string name="quick_action_terrain_hide">Схаваць рэльеф</string>
     <string name="quick_action_terrain_show">Паказаць рэльеф</string>
     <string name="delete_description">Выдаліць апісанне</string>
@@ -3515,7 +3515,7 @@
     <string name="change_application_profile">Змяніць профіль праграмы</string>
     <string name="index_item_world_basemap_detailed">Аглядная мапа свету (падрабязная)</string>
     <string name="quick_action_transport_hide">Схаваць грамадскі транспарт</string>
-    <string name="quick_action_show_hide_transport">Паказаць/схаваць грамадскі транспарт</string>
+    <string name="quick_action_show_hide_transport">Паказаць ці схаваць грамадскі транспарт</string>
     <string name="recalculate_route_in_deviation">Пералічыць маршрут у выпадку адхілення</string>
     <string name="shared_string_uninstall">Выдаліць</string>
     <string name="vessel_width_limit_description">Вызначце шырыню судна, каб пазбягаць вузкіх мастоў</string>
@@ -3529,7 +3529,7 @@
     <string name="item_deleted">Выдалена: %1$s</string>
     <string name="speed_cameras_restart_descr">Перазапусціце праграму для поўнага выдалення даных камер кантролю хуткасці.</string>
     <string name="use_volume_buttons_as_zoom_descr">Кіраванне ўзроўнем маштабавання мапы пры дапамозе кнопак рэгулявання гучнасці.</string>
-    <string name="plugin_wikipedia_description">Інфармацыя пра славутасці з Вікіпедыі. Гэта ваш кішэнны даведнік - уключыце ўбудову вікіпедыі і чытайце артыкулы пра аб’екты вакол вас.</string>
+    <string name="plugin_wikipedia_description">Інфармацыя пра славутасці з Вікіпедыі, вашага кішэннага даведніка з артыкуламі пра аб’екты вакол вас.</string>
     <string name="app_mode_enduro_motorcycle">Матацыкл Эндура</string>
     <string name="app_mode_motor_scooter">Мотаролер</string>
     <string name="shared_string_uninstall_and_restart">Выдаліць і перазапусціць</string>
@@ -3547,8 +3547,8 @@
     <string name="open_saved_track">Адкрыць захаваны след</string>
     <string name="shared_string_is_saved">захавана</string>
     <string name="save_track_to_gpx">Аўтаматычна запісваць след падчас навігацыі</string>
-    <string name="disable_recording_once_app_killed_descrp">Запіс GPX прыпыніцца, калі праграма будзе забітая (праз надаўнія праграмы). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
-    <string name="save_global_track_interval_descr">Вызначце інтэрвал запісу следу (уключаецца праз віджэт запісу GPX на мапе).</string>
+    <string name="disable_recording_once_app_killed_descrp">Спыненне запісу GPX, падчас прымусовага спынення (праз апошнія прыкладанні). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
+    <string name="save_global_track_interval_descr">Вызначце інтэрвал запісу трэка (уключаецца праз віджэт \"Запіс паездкі\" на мапе).</string>
     <string name="monitoring_control_start">ЗАПІС</string>
     <string name="shared_string_done">Завершана</string>
     <string name="shared_string_save_as_gpx">Захаваць як новы файл следу</string>
@@ -3653,7 +3653,7 @@
     <string name="previous_segment">Папярэдні сегмент</string>
     <string name="all_previous_segments">Усе папярэднія сегменты</string>
     <string name="only_selected_segment_recalc">Толькі абраны сегмент пералічыцца з выкарыстаннем абранага профілю.</string>
-    <string name="osm_edits_view_descr">Прагляд вашых правак альбо хібаў OSM, яшчэ не адпраўленых у %1$s. Запампаваныя пункты больш не будуць паказвацца.</string>
+    <string name="osm_edits_view_descr">Прагледзець усе вашы яшчэ не загружаныя паўкі OSM або памылкі ў %1$s. Ужо загружаныя змены больш не будуць паказвацца.</string>
     <string name="live_monitoring_adress_descr">Пазначце сеціўны адрас з наступнымі параметрамі: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
     <string name="monitoring_min_distance_descr_recommendation">Рэкамендацыя: наладка ў 5 метраў можа вас задаволіць, калі вам не патрэбна фіксаваць больш кароткія перамяшчэнні, і вы не хочаце відавочна збіраць даныя ў стане спакою.</string>
     <string name="monitoring_min_distance_descr_side_effect">Пабочныя эфекты: перыяды ў стане спакою не запісваюцца наогул альбо па адным пункце кожны. Невялікія (у рэальным свеце) перамяшчэнні (напрыклад, убок, што адзначаюць магчымы паварот у вашай паездцы) могуць быць адфільтраваныя. Файл змяшчае менш інфармацыі для наступнай апрацоўкі і мае горшую статыстыку, адфільтроўваючы відавочна лішнія пункты падчас запісу. Пры гэтым патэнцыйна захоўваюцца артэфакты, выкліканыя дрэнным прыёмам альбо эфектамі модуля GPS.</string>
@@ -3859,7 +3859,7 @@
     <string name="shared_string_redo">Вярнуць</string>
     <string name="release_3_8">• Абноўлена функцыя планавання маршруту. З’явілася магчымасць выкарыстоўваць розныя тыпы навігацыі для кожнага сегмента і прымацоўваць сляды
 \n
-\n • Новае меню \"Выгляд\" для слядоў. Можна абраць колер, таўшчыню, уключыць стрэлкі кірунку, адзнакі старту / фінішу
+\n • Новае меню \"Выгляд\" для слядоў. Можна абраць колер, таўшчыню, уключыць стрэлкі кірунку, адзнакі старту і фінішу
 \n
 \n • Палепшана бачнасць роварных вузлоў.
 \n
@@ -3890,12 +3890,199 @@
     <string name="use_native_pt">Натыўны грамадскі транспарт (у распрацоўцы)</string>
     <string name="perform_oauth_authorization">Увайсці праз OAuth</string>
     <string name="use_two_phase_routing">Выкарыстоўваць 2-фазны алгарытм маршрутызацыі A *</string>
-    <string name="use_native_pt_desc">Перайсці на разлік маршруту грамадскага транспарту на Java (бяспечны)</string>
+    <string name="use_native_pt_desc">Перайсці на разлік маршруту грамадскага транспарту з дапамогай Java (бяспечны)</string>
     <string name="file_already_imported">Файл ужо імпартаваны ў OsmAnd</string>
     <string name="start_finish_icons">Значкі старту і фінішу</string>
-    <string name="perform_oauth_authorization_description">Увайдзіце праз OAuth, каб выкарыстоўваць функцыі osmedit</string>
+    <string name="perform_oauth_authorization_description">Выканайце ўваход з дапамогай OAuth, каб выкарыстоўваць функцыі osmedit</string>
     <string name="clear_osm_token">Ачысціць токен OpenStreetMap OAuth</string>
-    <string name="osm_edit_logout_success">Выхад выкананы</string>
+    <string name="osm_edit_logout_success">Вы выйшлі</string>
     <string name="use_live_public_transport">Даныя OsmAnd Live</string>
     <string name="use_live_routing">Даныя OsmAnd Live</string>
+    <string name="voice_prompts_timetable">Час галасавых падказак</string>
+    <string name="lang_de_casual">Нямецкая (неафіцыйная)</string>
+    <string name="navigate_point_mgrs">MGRS</string>
+    <string name="snowmobile_render_descr">Для язды на снегаходах па вызначаных дарогах і трасах.</string>
+    <string name="navigate_point_format_mgrs">MGRS</string>
+    <string name="mgrs_format_descr">OsmAnd выкарыстоўвае MGRS, які падобны да фармату UTM NATO.</string>
+    <string name="shared_string_graph">Графік</string>
+    <string name="message_need_calculate_route_before_show_graph">Даныя %1$s даступныя толькі для дарог, разлічылі маршрут, выкарыстоўваючы \"Маршрут паміж кропкамі\", каб убачыць графікі.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Калі ласка пачакайце.
+\nГрафік будзе даступны пасля пераразліку маршруту.</string>
+    <string name="shared_string_local_maps">Лакальныя мапы</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="app_mode_gap">Разрыў</string>
+    <string name="icon_group_amenity">Выгады</string>
+    <string name="icon_group_special">Спецыяльныя</string>
+    <string name="icon_group_transport">Транспарт</string>
+    <string name="icon_group_service">Паслугі</string>
+    <string name="icon_group_symbols">Сімвалы</string>
+    <string name="icon_group_sport">Спорт</string>
+    <string name="icon_group_emergency">Экстраныя службы</string>
+    <string name="icon_group_travel">Вандроўка</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Дадайце прынамсі два пункты</string>
+    <string name="login_open_street_map">Увайсці ў OpenStreetMap</string>
+    <string name="login_open_street_map_org">Увайсці ў OpenStreetMap.org</string>
+    <string name="sign_in_with_open_street_map">Увайсці з дапамогай OpenStreetMap</string>
+    <string name="open_street_map_login_mode">Вам неабходна ўвайсці ў сістэму, каб загрузіць новыя або адрэдагаваныя змены.
+\n
+\nВы можаце ўвайсці, выкарыстоўваючы бяспечны метад OAuth, або з дапамогай сваіх імя карыстальніка і пароля.</string>
+    <string name="use_login_password">Выкарыстоўваць імя карыстальніка і пароль</string>
+    <string name="login_account">Уліковы запіс</string>
+    <string name="user_login">Аўтарызавацца</string>
+    <string name="manage_subscription">Кіраванне падпіскай</string>
+    <string name="subscription_payment_issue_title">Націсніце кнопку, каб перайсці ў налады падпіскі Google Play і выправіць спосаб аплаты.</string>
+    <string name="subscription_expired_title">Мінуў тэрмін дзеяння падпіскі OsmAnd Live</string>
+    <string name="subscription_paused_title">Падпіска OsmAnd Live была прыпынена</string>
+    <string name="subscription_on_hold_title">Падпіска OsmAnd Live прыпынена</string>
+    <string name="markers_history">Гісторыя маркераў</string>
+    <string name="send_files_to_openstreetmap">Адправіць файл GPX на OpenStreetMap</string>
+    <string name="enter_text_separated">Увадзіце тэгі праз коску.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Агульнадаступны\" азначае, што трасіроўка публічна адлюстроўваецца ў вашых GPS-трасіроўках і ў агульнадаступных спісах GPS-трасіровак, а таксама ў агульнадаступным спісе трасіровак з пазнакамі часу ў неапрацаваным выглядзе. Даныя, прадстаўленыя праз API, не спасылаюцца на вашу старонку трасіроўкі. Меткі часу трасіроўкі недаступныя праз агульнадаступны API GPS і не размяшчаюцца ў храналагічным парадку.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Прыватны\" азначае, што след не з\'явіцца ў любым агульнадаступным спісе, але кантрольныя пункты з яго даступныя ў адвольным парадку праз агульнадаступны GPS API без пазнак часу.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Ідэнтыфікаваны\" азначае, што трасіроўка будзе публічна адлюстроўвацца ў вашай GPS-трасіроўкі і ў агульнадаступных спісах GPS-трасіровак, гэта значыць, што іншыя карыстальнікі змогуць загрузіць неапрацаваны след і звязаць яго з вашым імем карыстальніка. Агульнадаступныя даныя трасіроўкі з GPS API, якія абслугоўваюцца з дапамогай API пунктаў адсочвання, спасылаюцца на пачатковую старонку трасіроўкі.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Адсочванне\" азначае, што трэк не з\'явіцца ў любым агульнадаступным спісе, але апрацоўка маршрутных пунктаў з яго (якія не могуць быць непасрэдна звязаны з вамі) ажыццяўляецца з выкарыстаннем загрузак з агульнадаступнага API GPS.</string>
+    <string name="osm_edit_close_note">Закрыць нататку OSM</string>
+    <string name="osm_edit_comment_note">Каментаваць нататку OSM</string>
+    <string name="osm_login_descr">Вы можаце ўвайсці, выкарыстоўваючы бяспечны метад OAuth або з дапамогай сваіх імя карыстальніка і пароля.</string>
+    <string name="shared_string_add_photo">Дадаць фотаздымак</string>
+    <string name="register_on_openplacereviews">Зарэгістравацца на
+\nOpenPlaceReviews.org</string>
+    <string name="register_on_openplacereviews_desc">Фотаздымкі прадастаўлены праектам з адкрытымі данымі OpenPlaceReviews.org. Каб загрузіць фатаграфіі, зарэгіструйцеся на іх сайце.</string>
+    <string name="register_opr_create_new_account">Стварыць уліковы запіс</string>
+    <string name="register_opr_have_account">У мяне ўжо ёсць уліковы запіс</string>
+    <string name="shared_string_search_history">Гісторыя пошуку</string>
+    <string name="app_mode_kayak">Каяк</string>
+    <string name="app_mode_motorboat">Маторная лодка</string>
+    <string name="cannot_upload_image">Немагчыма загрузіць выяву, паўтарыце спробу пазней</string>
+    <string name="select_picture">Выберыце выявы</string>
+    <string name="shared_string_resources">Рэсурсы</string>
+    <string name="approximate_file_size">Прыблізны памер файла</string>
+    <string name="select_data_to_export">Выберыце даныя, якія вы хочаце экспартаваць у файл.</string>
+    <string name="file_size_needed_for_import">Неабходна для імпартавання</string>
+    <string name="export_not_enough_space_descr">На вашай прыладзе свабодна толькі %1$s. Вызваліце месца альбо зніміце пазнаку з некаторых элементаў для экспартавання.</string>
+    <string name="export_not_enough_space">Недастаткова месца</string>
+    <string name="select_groups_for_import">Выберыце групы, якія трэба імпартаваць.</string>
+    <string name="select_items_for_import">Выберыце элементы, якія трэба імпартаваць.</string>
+    <string name="add_to_mapillary">Дадаць да Mapillary</string>
+    <string name="add_to_opr">Дадаць да OpenPlaceReviews</string>
+    <string name="use_dev_url_descr">Пераключыцца на выкарыстанне dev.openstreetmap.org замест openstreetmap.org для тэсціравання адпраўкі нататак OSM / POI / GPX.</string>
+    <string name="use_dev_url">Выкарыстоўваць dev.openstreetmap.org</string>
+    <string name="add_photos_descr">OsmAnd паказвае фотаздымкі з некалькіх крыніц;
+\nOpenPlaceReviews - фотаздымкі POI;
+\nMapillary - выявы вуліц;
+\nWeb / Wikimedia - фотаздымкі POI паводле дадзеных з OpenStreetMap.</string>
+    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
+    <string name="elevation_data">Вы можаце выкарыстоўваць даныя пра вышыні, каб улічыць ўздымы/спускі падчас вашай паездкі</string>
+    <string name="app_mode_light_aircraft">Лёгкі самалёт</string>
+    <string name="plan_route_join_segments">Аб\'яднаць сегменты</string>
+    <string name="plan_route_split_before">Падзяліць да</string>
+    <string name="plan_route_split_after">Падзяліць пасля</string>
+    <string name="plan_route_add_new_segment">Дадаць новы сегмент</string>
+    <string name="profile_type_user_string">Профіль карыстальніка</string>
+    <string name="release_3_9">"• Дададзена магчымасць экспарту і імпарту ўсіх даных, уключаючы налады, рэсурсы, мае месцы.
+\n
+\n • Планаванне маршруту: графікі для сегментаў трэка з маршрутам, дададзена магчымасць ствараць і рэдагаваць некалькі сегментаў трэка.
+\n
+\n • Дададзены OAuth метад аўтэнтыфікацыі для OpenStreetMap, палепшаны інтэрфейс дыялогаў OSM.
+\n
+\n  • Падтрымка карыстальніцкіх колераў для абранага і маршрутных пунктаў трэка.
+\n
+\n"</string>
+    <string name="reverse_all_points">Вярнуць назад усе пункты</string>
+    <string name="profile_by_default_description">Выберыце профіль, які будзе выкарыстоўвацца падчас запуску прыкладання.</string>
+    <string name="shared_string_last_used">Апошні раз выкарыстоўвалася</string>
+    <string name="routing_attr_prefer_hiking_routes_description">Аддаваць перавагу пешаходным маршрутам</string>
+    <string name="routing_attr_prefer_hiking_routes_name">Аддаваць перавагу пешаходным маршрутам</string>
+    <string name="routing_attr_allow_streams_description">Дазвольце ручаі і меліярацыйныя каналы</string>
+    <string name="routing_attr_allow_streams_name">Дазвольце ручаі і меліярацыйныя каналы</string>
+    <string name="routing_attr_allow_intermittent_description">Дазволіць перарывістыя водныя маршруты</string>
+    <string name="routing_attr_allow_intermittent_name">Дазволіць перарывістыя водныя маршруты</string>
+    <string name="add_online_routing_engine">Дадаць анлайн-маршрутызатар</string>
+    <string name="edit_online_routing_engine">Рэдагаваць анлайн-маршрутызатар</string>
+    <string name="shared_string_subtype">Падтып</string>
+    <string name="shared_string_vehicle">Транспартны сродак</string>
+    <string name="shared_string_api_key">Ключ API</string>
+    <string name="shared_string_server_url">URL-адрас сервера</string>
+    <string name="shared_string_enter_param">Увядзіце параметр</string>
+    <string name="keep_it_empty_if_not">Пакінуць пустым, калі не</string>
+    <string name="online_routing_example_hint">URL-адрас з усімі параметрамі будзе выглядаць так:</string>
+    <string name="test_route_calculation">Тэст разліку маршруту</string>
+    <string name="routing_engine_vehicle_type_driving">Ваджэнне</string>
+    <string name="routing_engine_vehicle_type_foot">Пешшу</string>
+    <string name="routing_engine_vehicle_type_bike">Ровар</string>
+    <string name="routing_engine_vehicle_type_car">Аўтамабіль</string>
+    <string name="copy_address">Капіраваць адрас</string>
+    <string name="online_routing_engine">Анлайн-маршрутызатар</string>
+    <string name="online_routing_engines">Анлайн-маршрутызатары</string>
+    <string name="shared_string_folders">Папкі</string>
+    <string name="select_folder">Выберыце папку</string>
+    <string name="select_folder_descr">Выберыце папку або стварыце новую</string>
+    <string name="shared_string_empty">Пуста</string>
+    <string name="analyze_by_intervals">Аналіз паводле інтэрвалаў</string>
+    <string name="upload_to_openstreetmap">Выгрузіць на OpenStreetMap</string>
+    <string name="edit_track">Змяніць трэк</string>
+    <string name="rename_track">Перайменаваць трэк</string>
+    <string name="change_folder">Змяніць папку</string>
+    <string name="shared_string_sec">сек.</string>
+    <string name="announcement_time_passing">Пры праходжанні</string>
+    <string name="announcement_time_approach">Набліжэнне</string>
+    <string name="announcement_time_prepare_long">Заўчасная падрыхтоўка</string>
+    <string name="announcement_time_prepare">Падрыхтавацца</string>
+    <string name="announcement_time_off_route">Па-за маршрутам</string>
+    <string name="announcement_time_arrive">Прыбыццё ў пункт прызначэння</string>
+    <string name="shared_string_turn">Паварот</string>
+    <string name="announcement_time_intervals">Інтэрвалы часу і адлегласці</string>
+    <string name="profile_type_osmand_string">Профіль OsmAnd</string>
+    <string name="announcement_time_title">Час абвяшчэння</string>
+    <string name="announcement_time_descr">Час розных галасавых падказак залежыць ад тыпу запыту, бягучай хуткасці навігацыі і хуткасці навігацыі па змаўчанні.</string>
+    <string name="start_recording">Пачаць запіс</string>
+    <string name="show_track_on_map">Паказаць трэк на мапе</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Інвалідны вазок</string>
+    <string name="routing_engine_vehicle_type_hiking">Пешы турызм</string>
+    <string name="routing_engine_vehicle_type_walking">Хадзьба</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Электраровар</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Горны ровар</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Дарожны ровар</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Звычайны ровар</string>
+    <string name="routing_engine_vehicle_type_hgv">Грузавік</string>
+    <string name="routing_engine_vehicle_type_small_truck">Малы грузавік</string>
+    <string name="routing_engine_vehicle_type_truck">Грузавік</string>
+    <string name="routing_engine_vehicle_type_scooter">Скутэр</string>
+    <string name="routing_engine_vehicle_type_racingbike">Гоначны ровар</string>
+    <string name="routing_engine_vehicle_type_mtb">Горны ровар</string>
+    <string name="message_server_error">Памылка сервера: %1$s</string>
+    <string name="message_name_is_already_exists">Назва ўжо існуе</string>
+    <string name="delete_online_routing_engine">Выдаліць анлайн-маршрутызатар\?</string>
+    <string name="context_menu_read_full">Чытаць цалкам</string>
+    <string name="context_menu_edit_descr">Змяніць апісанне</string>
+    <string name="delete_waypoints">Выдаліць маршрутныя пункты</string>
+    <string name="copy_to_map_markers">Капіраваць да пазнак мапы</string>
+    <string name="copy_to_map_favorites">Капіраваць да абранага</string>
+    <string name="upload_photo">Выгрузка</string>
+    <string name="upload_photo_completed">Выгрузка завершана</string>
+    <string name="uploading_count">Выгрузка %1$d з %2$d</string>
+    <string name="uploaded_count">Выгружана %1$d з %2$d</string>
+    <string name="toast_select_edits_for_upload">Выберыце змены для выгрузкі</string>
+    <string name="hillshade_slope_contour_lines">Рэльеф мясцовасці / Схілы / Гарызанталі</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews — гэта грамадскі праект пра месцы агульнага карыстання, такія як, рэстараны, гатэлі, музеі, пункты шляху. Ён збірае ўсе агульнадаступныя даныя пра іх, такія як, выявы, водгукі, спасылкі на іншыя сістэмы, спасылкі OpenStreetMap, Вікіпедыя.
+\n
+\nУсе даныя OpenPlaceReview з\'яўляюцца адкрытымі і даступны тут: http://openplacereviews.org/data.
+\n
+\nВы можаце прачытаць больш па адрасу: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Выкарыстаць test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Увайсці ў OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Вада</string>
+    <string name="activity_type_winter_name">Зіма</string>
+    <string name="activity_type_snowmobile_name">Снегаход</string>
+    <string name="activity_type_riding_name">Язда</string>
+    <string name="activity_type_racing_name">Гонка</string>
+    <string name="activity_type_mountainbike_name">Горны ровар</string>
+    <string name="activity_type_cycling_name">Язда на ровары</string>
+    <string name="activity_type_hiking_name">Пешы турызм</string>
+    <string name="activity_type_running_name">Бег</string>
+    <string name="activity_type_walking_name">Пешаход</string>
+    <string name="activity_type_offroad_name">Пазадарожнік</string>
+    <string name="activity_type_motorbike_name">Матацыкл</string>
+    <string name="activity_type_car_name">Аўтамабіль</string>
 </resources>

OsmAnd/res/values-cs/phrases.xml

@@ -3561,7 +3561,7 @@
     <string name="poi_charcoal_pile">Milíř</string>
     <string name="poi_historic_tank">Historický tank</string>
     <string name="poi_hookah_lounge">Salonek s vodní dýmkou</string>
-    <string name="poi_source_biomass">Zdroj energie: biomasa</string>
+    <string name="poi_generator_source_biomass">Zdroj energie: biomasa</string>
     <string name="poi_glacier_type_hanging">Převislý</string>
     <string name="poi_glacier_type_shelf">Šelfový</string>
     <string name="poi_substation_compensation">Kompenzační</string>

OsmAnd/res/values-da/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Trækulsbunke</string>
     <string name="poi_historic_tank">Historisk tank</string>
     <string name="poi_hookah_lounge">Vandpibe bar</string>
-    <string name="poi_source_biomass">Energikilde: biomasse</string>
+    <string name="poi_generator_source_biomass">Energikilde: biomasse</string>
     <string name="poi_snowmobile_filter">Snescooter adgang</string>
     <string name="poi_access_bus">Busadgang</string>
     <string name="poi_access_caravan">Campingvogn adgang</string>

OsmAnd/res/values-de/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Kohlenmeiler</string>
     <string name="poi_historic_tank">Historischer Panzer</string>
     <string name="poi_hookah_lounge">Wasserpfeifen-Lounge</string>
-    <string name="poi_source_biomass">Energiequelle: Biomasse</string>
+    <string name="poi_generator_source_biomass">Energiequelle: Biomasse</string>
     <string name="poi_snowmobile_filter">Zufahrt Schneemobil</string>
     <string name="poi_access_bus">Anbindung Linienbus</string>
     <string name="poi_access_caravan">Zufahrt Wohnwagen</string>
@@ -3881,4 +3881,14 @@
     <string name="poi_wildlife_crossing_bat_tunnel">Fledermaustunnel</string>
     <string name="poi_wildlife_crossing_bat_bridge">Fledermausbrücke</string>
     <string name="poi_wildlife_crossing">Wildwechsel</string>
+    <string name="poi_mobile_library">Halteposition der Fahrbücherei</string>
+    <string name="poi_summit_register_no">Gipfelbuch: nein</string>
+    <string name="poi_summit_register_yes">Gipfelbuch: ja</string>
+    <string name="poi_piste_status_closed">Pistenstatus: geschlossen</string>
+    <string name="poi_piste_status_open">Pistenstatus: geöffnet</string>
+    <string name="poi_patrolled_no">Bewacht: nein</string>
+    <string name="poi_patrolled_yes">Bewacht: ja</string>
+    <string name="poi_gladed_yes">Geglättet: ja</string>
+    <string name="poi_piste_name">Pistenname</string>
+    <string name="poi_piste_ski_jump">Skispringen</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -4019,4 +4019,20 @@
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="opr_use_dev_url">test.openplacereviews.org verwenden</string>
     <string name="login_open_place_reviews">Anmelden bei OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Wasser</string>
+    <string name="activity_type_winter_name">Winter</string>
+    <string name="activity_type_snowmobile_name">Schneemobil</string>
+    <string name="activity_type_riding_name">Reiten</string>
+    <string name="activity_type_mountainbike_name">Mountainbike</string>
+    <string name="activity_type_cycling_name">Fahrrad</string>
+    <string name="activity_type_hiking_name">Wandern</string>
+    <string name="activity_type_running_name">Laufen</string>
+    <string name="activity_type_walking_name">Fußgänger</string>
+    <string name="activity_type_offroad_name">Geländegängig</string>
+    <string name="activity_type_motorbike_name">Motorrad</string>
+    <string name="activity_type_car_name">Auto</string>
+    <string name="announcement_time_prepare">Zweite Ankündigung (mittlere Distanz)</string>
+    <string name="shared_string_sec">sek</string>
+    <string name="activity_type_racing_name">Rennsport</string>
+    <string name="announcement_time_prepare_long">Erste Ankündigung (größere Distanz)</string>
 </resources>

OsmAnd/res/values-el/phrases.xml

@@ -3534,7 +3534,7 @@
     <string name="poi_climbing_crag">Ναι</string>
     <string name="reddit">Reddit</string>
     <string name="poi_historic_tank">Ιστορική δεξαμενή</string>
-    <string name="poi_source_biomass">Πηγή ενέργειας: βιομάζα</string>
+    <string name="poi_generator_source_biomass">Πηγή ενέργειας: βιομάζα</string>
     <string name="poi_snowmobile_filter">Πρόσβαση σε χιονοόχημα</string>
     <string name="poi_access_bus">Πρόσβαση σε λεωφορείο</string>
     <string name="poi_access_caravan">Πρόσβαση σε τροχόσπιτο</string>

OsmAnd/res/values-eo/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Karbigejo</string>
     <string name="poi_historic_tank">Tanko historia</string>
     <string name="poi_hookah_lounge">Salono por fumi akvopipon</string>
-    <string name="poi_source_biomass">Energifonto: biomaso</string>
+    <string name="poi_generator_source_biomass">Energifonto: biomaso</string>
     <string name="poi_snowmobile_filter">Aliro por motorsledoj</string>
     <string name="poi_access_bus">Aliro por aŭtobusoj</string>
     <string name="poi_access_caravan">Aliro por kampad-postveturiloj</string>
@@ -3881,4 +3881,14 @@
     <string name="poi_wildlife_crossing_bat_bridge">Ponto por vespertoj</string>
     <string name="poi_wildlife_crossing">Trairejo por sovaĝaj bestoj</string>
     <string name="poi_swimming_area">Naĝejo natura</string>
+    <string name="poi_piste_status_closed">Stato de skivojo: fermita</string>
+    <string name="poi_piste_status_open">Stato de skivojo: malfermita</string>
+    <string name="poi_patrolled_no">Kontrolata: ne</string>
+    <string name="poi_patrolled_yes">Kontrolata: jes</string>
+    <string name="poi_gladed_yes">Senarbigita: jes</string>
+    <string name="poi_piste_name">Nomo de skivojo</string>
+    <string name="poi_piste_ski_jump">Skisaltejo</string>
+    <string name="poi_mobile_library">Movebla biblioteko (haltloko)</string>
+    <string name="poi_summit_register_no">Pint‑taglibro: ne</string>
+    <string name="poi_summit_register_yes">Pint‑taglibro: jes</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -4017,4 +4017,17 @@
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="opr_use_dev_url">Uzi test.openplacereviews.org</string>
     <string name="login_open_place_reviews">Ensaluti al OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Akvo</string>
+    <string name="activity_type_winter_name">Vintro</string>
+    <string name="activity_type_snowmobile_name">Motorsledo</string>
+    <string name="activity_type_riding_name">Rajdado</string>
+    <string name="activity_type_racing_name">Kurkonkurso</string>
+    <string name="activity_type_mountainbike_name">Montbiciklo</string>
+    <string name="activity_type_cycling_name">Biciklado</string>
+    <string name="activity_type_hiking_name">Marŝado</string>
+    <string name="activity_type_running_name">Kurado</string>
+    <string name="activity_type_walking_name">Piedirado</string>
+    <string name="activity_type_offroad_name">Ekstervoje</string>
+    <string name="activity_type_motorbike_name">Motorciklo</string>
+    <string name="activity_type_car_name">Aŭto</string>
 </resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -3222,7 +3222,7 @@
     <string name="poi_water_supply_pump">Bomba</string>
     <string name="poi_water_supply_borehole">Perforación</string>
     <string name="poi_water_supply_water_trucking">Camión de agua</string>
-    <string name="poi_water_supply_water_tank">Depósito de agua</string>
+    <string name="poi_water_supply_water_tank">Tanque de agua</string>
     <string name="poi_water_supply_bottled_water">Botella de agua</string>
     <string name="poi_water_place_access_community">Comunidad</string>
     <string name="poi_water_place_access_family">Familia</string>
@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Carbonera;Pila de carbón</string>
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Bar de cachimbas;Salón Hookah</string>
-    <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
     <string name="poi_snowmobile_filter">Acceso para motonieves</string>
     <string name="poi_access_bus">Acceso para colectivos</string>
     <string name="poi_access_caravan">Acceso para casas móviles</string>
@@ -3869,7 +3869,7 @@
     <string name="poi_water_source_river">Río</string>
     <string name="poi_water_source_well">Pozo</string>
     <string name="poi_water_source_powered_pump">Bomba accionada</string>
-    <string name="poi_water_source_water_tank">Depósito de agua</string>
+    <string name="poi_water_source_water_tank">Tanque de agua</string>
     <string name="poi_water_source_tap">Canilla</string>
     <string name="poi_water_source_water_works">Planta potabilizadora</string>
     <string name="poi_water_source_tube_well">Pozo entubado</string>
@@ -3881,4 +3881,14 @@
     <string name="poi_wildlife_crossing_bat_bridge">Puente para murciélagos</string>
     <string name="poi_wildlife_crossing">Cruce de vida silvestre</string>
     <string name="poi_swimming_area">Área de natación</string>
+    <string name="poi_mobile_library">Biblioteca móvil (parada)</string>
+    <string name="poi_summit_register_no">Registro de la cumbre: no</string>
+    <string name="poi_summit_register_yes">Registro de la cumbre: sí</string>
+    <string name="poi_piste_status_closed">Estado de la pista: cerrado</string>
+    <string name="poi_piste_status_open">Estado de la pista: abierto</string>
+    <string name="poi_patrolled_no">Patrullado: no</string>
+    <string name="poi_patrolled_yes">Patrullado: sí</string>
+    <string name="poi_gladed_yes">Arboleda: sí</string>
+    <string name="poi_piste_name">Nombre de la pista</string>
+    <string name="poi_piste_ski_jump">Salto con esquís</string>
 </resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -3672,7 +3672,7 @@
     <string name="height_limit_description">Proporciona la altura del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos altos.</string>
     <string name="weight_limit_description">Proporciona el peso del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos pesados.</string>
     <string name="screen_timeout">Tiempo de espera de la pantalla</string>
-    <string name="shared_string_tones">tonos</string>
+    <string name="shared_string_tones">toneladas</string>
     <string name="shared_string_meters">metros</string>
     <string name="details_dialog_decr">Muestra u oculta los detalles adicionales del mapa</string>
     <string name="shared_string_night_map">Mapa nocturno</string>
@@ -4019,4 +4019,17 @@
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="opr_use_dev_url">Usar test.openplacereviews.org</string>
     <string name="login_open_place_reviews">Acceder a OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Agua</string>
+    <string name="activity_type_winter_name">Invierno</string>
+    <string name="activity_type_snowmobile_name">Motonieve</string>
+    <string name="activity_type_riding_name">Equitación</string>
+    <string name="activity_type_racing_name">Carreras</string>
+    <string name="activity_type_mountainbike_name">Bicicleta de montaña</string>
+    <string name="activity_type_cycling_name">Bicicleta</string>
+    <string name="activity_type_hiking_name">Senderismo</string>
+    <string name="activity_type_running_name">Correr</string>
+    <string name="activity_type_walking_name">Peatón</string>
+    <string name="activity_type_offroad_name">Todo terreno</string>
+    <string name="activity_type_motorbike_name">Motocicleta</string>
+    <string name="activity_type_car_name">Automóvil</string>
 </resources>

OsmAnd/res/values-es-rUS/phrases.xml

@@ -844,7 +844,7 @@
     <string name="poi_nwn_ref">Nodo de red nacional de senderismo</string>
     <string name="poi_rwn_ref">Nodo de red regional de senderismo</string>
     <string name="poi_lwn_ref">Nodo de red local de senderismo</string>
-    <string name="poi_opening_hours">Horario de atención;Horario de apertura</string>
+    <string name="poi_opening_hours">Horario de apertura</string>
     <string name="poi_collection_times">Horario de recolección</string>
     <string name="poi_description">Descripción</string>
     <string name="poi_phone">Teléfono</string>
@@ -2723,7 +2723,7 @@
     <string name="poi_aquaculture_mussels">Acuicultura: mejillones</string>
     <string name="poi_min_age">Edad mínima</string>
     <string name="poi_organic_yes">Sí</string>
-    <string name="poi_organic_no">No</string>
+    <string name="poi_organic_no">Productos orgánicos: no</string>
     <string name="poi_organic_only">Únicamente</string>
     <string name="poi_traffic_mirror">Espejo de tráfico</string>
     <string name="poi_diplomatic_consulate">Consulado</string>
@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Carbonera;Pila de carbón</string>
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Bar de cachimbas;Salón Hookah</string>
-    <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
     <string name="poi_snowmobile_filter">Acceso para motonieves</string>
     <string name="poi_access_bus">Acceso para autobuses</string>
     <string name="poi_access_caravan">Acceso para caravanas</string>
@@ -3868,7 +3868,7 @@
     <string name="poi_lavoir">Lavadero público de ropa</string>
     <string name="poi_waste_transfer_station">Estación de transferencia de residuos</string>
     <string name="poi_weightbridge">Báscula puente</string>
-    <string name="poi_ranger_station">Estación de guardabosque</string>
+    <string name="poi_ranger_station">Estación de guardabosques</string>
     <string name="poi_water_source_lake">Lago</string>
     <string name="poi_water_source_river">Río</string>
     <string name="poi_water_source_well">Pozo</string>
@@ -3881,4 +3881,14 @@
     <string name="poi_wildlife_crossing_bat_bridge">Puente para murciélagos</string>
     <string name="poi_wildlife_crossing">Cruce de vida silvestre</string>
     <string name="poi_swimming_area">Área de natación</string>
+    <string name="poi_summit_register_yes">Registro de la cumbre: sí</string>
+    <string name="poi_summit_register_no">Registro de la cumbre: no</string>
+    <string name="poi_piste_status_open">Estado de la pista: abierto</string>
+    <string name="poi_piste_status_closed">Estado de la pista: cerrado</string>
+    <string name="poi_piste_ski_jump">Salto con esquís</string>
+    <string name="poi_piste_name">Nombre de la pista</string>
+    <string name="poi_patrolled_yes">Patrullado: sí</string>
+    <string name="poi_patrolled_no">Patrullado: no</string>
+    <string name="poi_mobile_library">Biblioteca móvil (parada)</string>
+    <string name="poi_gladed_yes">Arboleda: sí</string>
 </resources>

OsmAnd/res/values-es-rUS/strings.xml

@@ -771,25 +771,25 @@
 \n Los PDI de OsmAnd están siendo desarrollados activamente. Nuestro proyecto y su continuo progreso, se basa en contribuciones económicas para desarrollar y probar nuevas funcionalidades. Por favor, considera comprar OsmAnd+, financiar nuevas funciones o hacer una donación general en https://osmand.net.</string>
     <string name="osmand_plus_play_title_30_chars">Navegación y Mapas OsmAnd+</string>
     <string name="osmand_plus_short_description_80_chars">Visor y navegador móvil global de mapas OSM con y sin conexión</string>
-    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions, y en español, Guía de Navegación Automatizada de OSM) 
-\n 
-\nOsmAnd+ es un software de navegación de código abierto con acceso a una amplia variedad de datos globales de OSM. Todos los datos del mapa (vectores y teselas), pueden ser almacenados en la memoria del teléfono para su uso sin conexión. Ofrece funcionalidades de rutas con y sin conexión, incluyendo guía de giro-a-giro por voz. 
-\n 
-\n OsmAnd+ es la versión de pago de la aplicación, comprándola ayudas al proyecto, financias el desarrollo de nuevas funciones, y recibes las últimas actualizaciones. 
-\n 
-\n Algunas de las funciones fundamentales: 
-\n - Completa funcionalidad sin conexión (guarda los mapas vectoriales o teselas descargados en el almacenamiento del dispositivo) 
-\n - Mapas mundiales vectoriales compactos disponibles 
-\n - Descarga ilimitada de mapas de países o regiones directamente desde la aplicación 
-\n - Posibilidad de superponer varias capas de mapa, como GPX o rutas de navegación, Puntos de Interés, Favoritos, curvas de nivel, paradas de transporte público, mapas adicionales con transparencia personalizable 
-\n 
-\n - Búsqueda sin conexión de direcciones y sitios (PDI) 
-\n - Rutas sin conexión para distancias de rango medio 
-\n - Modos de automóvil, bicicleta y peatón con opcional: 
-\n - Cambio automático de modo diurno/nocturno 
-\n - Zoom del mapa según la velocidad 
-\n - Alineación del mapa, según brújula o dirección del movimiento 
-\n - Indicación de carriles, mostrar límites de velocidad, voces grabadas y sintetizadas 
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions, y en español, Guía de Navegación Automatizada de OSM)
+\n
+\n OsmAnd+ es un software de navegación de código abierto con acceso a una amplia variedad de datos globales de OSM. Todos los datos del mapa (vectores y teselas), pueden ser almacenados en la memoria del teléfono para su uso sin conexión. Ofrece funcionalidades de rutas con y sin conexión, incluyendo guía de giro-a-giro por voz.
+\n
+\n OsmAnd+ es la versión de pago de la aplicación, comprándola ayudas al proyecto, financias el desarrollo de nuevas funciones, y recibes las últimas actualizaciones.
+\n
+\n Algunas de las funciones fundamentales:
+\n - Completa funcionalidad sin conexión (guarda los mapas vectoriales o teselas descargados en el almacenamiento del dispositivo)
+\n - Mapas mundiales vectoriales compactos disponibles
+\n - Descarga ilimitada de mapas de países o regiones directamente desde la aplicación
+\n - Posibilidad de superponer varias capas de mapa, como GPX o rutas de navegación, Puntos de Interés, Favoritos, curvas de nivel, paradas de transporte público, mapas adicionales con transparencia personalizable
+\n
+\n - Búsqueda sin conexión de direcciones y sitios (PDI)
+\n - Rutas sin conexión para distancias de rango medio
+\n - Modos de automóvil, bicicleta y peatón con opcional:
+\n - Cambio automático de modo diurno/nocturno
+\n - Zoom del mapa según la velocidad
+\n - Alineación del mapa, según brújula o dirección del movimiento
+\n - Indicación de carriles, mostrar límites de velocidad, voces grabadas y sintetizadas
 \n</string>
     <string name="filterpoi_activity">Crear filtro PDI</string>
     <string name="recalculate_route_to_your_location">Modo transporte:</string>
@@ -1221,8 +1221,7 @@
     <string name="osmand_net_previously_installed">Todos los datos sin conexión en la versión vieja de OsmAnd son compatibles con la nueva versión, pero los puntos de Favoritos deben exportarse desde la versión vieja y luego, importarse en la nueva.</string>
     <string name="build_installed">Compilación {0} instalada ({1}).</string>
     <string name="downloading_build">Descargando compilación…</string>
-    <string name="install_selected_build">¿Instalar OsmAnd?
-\nVersión: {0}
+    <string name="install_selected_build">¿Instalar OsmAnd {0}\?
 \nFecha: {1}
 \nTamaño: {2} MB</string>
     <string name="loading_builds_failed">Error al recuperar la lista de compilaciones de OsmAnd</string>
@@ -2061,7 +2060,7 @@
     <string name="shared_string_notifications">Notificaciones</string>
     <string name="gpx_no_tracks_title">Sin archivos de trazas aún</string>
     <string name="gpx_no_tracks_title_folder">También puedes añadir archivos de trazas a la carpeta</string>
-    <string name="gpx_add_track">Añadir GPX</string>
+    <string name="gpx_add_track">Añadir más…</string>
     <string name="shared_string_appearance">Aspecto</string>
     <string name="rendering_value_fine_name">Muy fino</string>
     <string name="route_calculation">Cálculo de la ruta</string>
@@ -2436,7 +2435,7 @@
     <string name="average">Promedio</string>
     <string name="of">%1$d de %2$d</string>
     <string name="ascent_descent">Ascenso/Descenso</string>
-    <string name="moving_time">Tiempo moviéndose</string>
+    <string name="moving_time">Tiempo en movimiento</string>
     <string name="max_min">Máx/Min</string>
     <string name="min_max">Min/Máx</string>
     <string name="rendering_value_translucent_pink_name">Rosa translúcido</string>
@@ -3648,7 +3647,7 @@
     <string name="system_screen_timeout">Usar el tiempo de espera de la pantalla del sistema</string>
     <string name="storage_format">Formato de almacenamiento</string>
     <string name="sqlite_db_file">Archivo SQLiteDB</string>
-    <string name="shared_string_tones">tonos</string>
+    <string name="shared_string_tones">toneladas</string>
     <string name="shared_string_night_map">Mapa nocturno</string>
     <string name="shared_string_meters">metros</string>
     <string name="shared_string_delete_all_q">¿Borrar todo\?</string>
@@ -3726,8 +3725,8 @@
     <string name="route_between_points">Ruta entre puntos</string>
     <string name="plan_a_route">Planificar ruta</string>
     <string name="osm_edit_closed_note">Nota de OSM cerrada</string>
-    <string name="gpx_split_interval_none_descr">Marca la opción de división deseada: por tiempo o por distancia.</string>
-    <string name="gpx_split_interval_descr">Marca el intervalo en el que se mostrarán las marcas con distancia o tiempo en la traza.</string>
+    <string name="gpx_split_interval_none_descr">Elige la opción de división deseada: por tiempo o por distancia.</string>
+    <string name="gpx_split_interval_descr">Elige el intervalo de la traza en el que se mostrarán las marcas con la distancia o el tiempo.</string>
     <string name="gpx_direction_arrows">Flechas de dirección</string>
     <string name="app_mode_wheelchair_forward">Silla de ruedas (hacia adelante)</string>
     <string name="app_mode_wheelchair">Silla de ruedas</string>
@@ -3944,32 +3943,93 @@
     <string name="profile_type_user_string">Perfil de usuario</string>
     <string name="profile_type_osmand_string">Perfil de OsmAnd</string>
     <string name="profile_by_default_description">Elige el perfil que será usado al iniciar la aplicación.</string>
-    <string name="voice_prompts_timetable">Tiempo de indicaciones por voz</string>
+    <string name="voice_prompts_timetable">Tiempo de los avisos por voz</string>
     <string name="select_folder">Elegir carpeta</string>
     <string name="shared_string_folders">Carpetas</string>
     <string name="change_folder">Cambiar carpeta</string>
-    <string name="add_online_routing_engine"></string>
-    <string name="edit_online_routing_engine"></string>
-    <string name="shared_string_subtype"></string>
-    <string name="shared_string_vehicle"></string>
-    <string name="shared_string_api_key"></string>
-    <string name="shared_string_server_url"></string>
-    <string name="shared_string_enter_param"></string>
-    <string name="keep_it_empty_if_not"></string>
-    <string name="online_routing_example_hint"></string>
-    <string name="test_route_calculation"></string>
-    <string name="routing_engine_vehicle_type_driving"></string>
-    <string name="routing_engine_vehicle_type_foot"></string>
-    <string name="routing_engine_vehicle_type_bike"></string>
-    <string name="routing_engine_vehicle_type_car"></string>
-    <string name="message_error_recheck_parameters"></string>
-    <string name="copy_address"></string>
-    <string name="online_routing_engine"></string>
-    <string name="online_routing_engines"></string>
-    <string name="select_folder_descr"></string>
-    <string name="shared_string_empty"></string>
-    <string name="analyze_by_intervals"></string>
-    <string name="upload_to_openstreetmap"></string>
-    <string name="edit_track"></string>
-    <string name="rename_track"></string>
+    <string name="add_online_routing_engine">Añadir motor de navegación en línea</string>
+    <string name="edit_online_routing_engine">Editar motor de navegación en línea</string>
+    <string name="shared_string_subtype">Subtipo</string>
+    <string name="shared_string_vehicle">Vehículo</string>
+    <string name="shared_string_api_key">Clave de la API</string>
+    <string name="shared_string_server_url">URL del servidor</string>
+    <string name="shared_string_enter_param">Ingresa parámetro</string>
+    <string name="keep_it_empty_if_not">Si no, mantenerlo vacío</string>
+    <string name="online_routing_example_hint">La URL con todos los parámetros se verá así:</string>
+    <string name="test_route_calculation">Cálculo de la ruta de prueba</string>
+    <string name="routing_engine_vehicle_type_driving">Automóvil</string>
+    <string name="routing_engine_vehicle_type_foot">Peatón</string>
+    <string name="routing_engine_vehicle_type_bike">Bicicleta</string>
+    <string name="routing_engine_vehicle_type_car">Automóvil</string>
+    <string name="message_error_recheck_parameters"/>
+    <string name="copy_address">Copiar dirección</string>
+    <string name="online_routing_engine">Motor de navegación en línea</string>
+    <string name="online_routing_engines">Motores de navegación en línea</string>
+    <string name="select_folder_descr">Elegir carpeta o añadir una nueva</string>
+    <string name="shared_string_empty">Vacío</string>
+    <string name="analyze_by_intervals">Analizar intervalos divididos</string>
+    <string name="upload_to_openstreetmap">Subir a OpenStreetMap</string>
+    <string name="edit_track">Editar traza</string>
+    <string name="rename_track">Renombrar traza</string>
+    <string name="uploading_count">Subiendo %1$d de %2$d</string>
+    <string name="uploaded_count">Se subieron %1$d de %2$d</string>
+    <string name="upload_photo_completed">Subida completa</string>
+    <string name="upload_photo">Subiendo</string>
+    <string name="toast_select_edits_for_upload">Marcar ediciones a subir</string>
+    <string name="start_recording">Iniciar grabación</string>
+    <string name="show_track_on_map">Mostrar traza en el mapa</string>
+    <string name="shared_string_turn">Girar</string>
+    <string name="shared_string_sec">seg</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Silla de ruedas</string>
+    <string name="routing_engine_vehicle_type_walking">Peatón</string>
+    <string name="routing_engine_vehicle_type_truck">Camión</string>
+    <string name="routing_engine_vehicle_type_small_truck">Camión pequeño</string>
+    <string name="routing_engine_vehicle_type_scooter">Motoneta</string>
+    <string name="routing_engine_vehicle_type_racingbike">Bicicleta de carreras</string>
+    <string name="routing_engine_vehicle_type_mtb">Bicicleta de montaña</string>
+    <string name="routing_engine_vehicle_type_hiking">Senderismo</string>
+    <string name="routing_engine_vehicle_type_hgv">Vehículos pesados</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Ciclismo de ruta</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Ciclismo regular</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Ciclismo de montaña</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Ciclismo eléctrico</string>
+    <string name="opr_use_dev_url">Usar test.openplacereviews.org</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews es un proyecto impulsado por la comunidad sobre lugares públicos como restaurantes, hoteles, museos, puntos de referencia. Recoge toda la información pública sobre ellos como fotos, reseñas, enlaces a otros servicios como OpenStreetMap y Wikipedia.
+\n
+\nTodos los datos de OpenPlaceReviews son abiertos y están disponibles para todos: http://openplacereviews.org/data.
+\n
+\nPuedes leer más en: https://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="message_server_error">Error de servidor: %1$s</string>
+    <string name="message_name_is_already_exists">El nombre ya existe</string>
+    <string name="login_open_place_reviews">Acceder a OpenPlaceReviews</string>
+    <string name="hillshade_slope_contour_lines">Sombreado / Pendiente / Curvas de nivel</string>
+    <string name="delete_waypoints">Borrar puntos de referencia</string>
+    <string name="delete_online_routing_engine">¿Borrar este motor de navegación en línea\?</string>
+    <string name="copy_to_map_markers">Copiar a «Marcadores del mapa»</string>
+    <string name="copy_to_map_favorites">Copiar a favoritos</string>
+    <string name="context_menu_read_full">Leer completo</string>
+    <string name="context_menu_edit_descr">Editar descripción</string>
+    <string name="announcement_time_title">Tiempo de anuncio</string>
+    <string name="announcement_time_prepare_long">Preparación larga</string>
+    <string name="announcement_time_prepare">Preparar</string>
+    <string name="announcement_time_passing">Pasando</string>
+    <string name="announcement_time_off_route">Fuera de la ruta</string>
+    <string name="announcement_time_intervals">Intervalos de tiempo y distancia</string>
+    <string name="announcement_time_descr">El tiempo de anuncio de las diferentes indicaciones por voz depende del tipo de mensaje, la velocidad de navegación actual y la velocidad de navegación predefinida.</string>
+    <string name="announcement_time_arrive">Has llegado al destino</string>
+    <string name="announcement_time_approach">Acercarse</string>
+    <string name="activity_type_winter_name">Invierno</string>
+    <string name="activity_type_water_name">Agua</string>
+    <string name="activity_type_walking_name">Peatón</string>
+    <string name="activity_type_snowmobile_name">Motonieve</string>
+    <string name="activity_type_running_name">Correr</string>
+    <string name="activity_type_riding_name">Equitación</string>
+    <string name="activity_type_racing_name">Carreras</string>
+    <string name="activity_type_offroad_name">Todo terreno</string>
+    <string name="activity_type_mountainbike_name">Bicicleta de montaña</string>
+    <string name="activity_type_motorbike_name">Motocicleta</string>
+    <string name="activity_type_hiking_name">Senderismo</string>
+    <string name="activity_type_cycling_name">Bicicleta</string>
+    <string name="activity_type_car_name">Automóvil</string>
 </resources>

OsmAnd/res/values-es/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Pila de carbón vegetal</string>
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Salón del narguile</string>
-    <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fuente de energía: biomasa</string>
     <string name="poi_snowmobile_filter">Acceso para motos de nieve</string>
     <string name="poi_access_bus">Acceso al autobús</string>
     <string name="poi_access_caravan">Acceso a la caravana</string>

OsmAnd/res/values-et/phrases.xml

@@ -3596,7 +3596,7 @@
     <string name="poi_charcoal_pile">Puusöe hunnik</string>
     <string name="poi_historic_tank">Ajalooline tank</string>
     <string name="poi_hookah_lounge">Vesipiibu salong</string>
-    <string name="poi_source_biomass">Energiaallikas: biomass</string>
+    <string name="poi_generator_source_biomass">Energiaallikas: biomass</string>
     <string name="poi_taxi_office">Takso kontor</string>
     <string name="poi_vehicle_yes">Sõidukiga ligipääs: jah</string>
     <string name="poi_vehicle_private">Sõidukiga ligipääs: privaatne</string>

OsmAnd/res/values-eu/phrases.xml

@@ -3575,7 +3575,7 @@
     <string name="poi_changing_table_fee_no">Aldatzeko mahaia ordainpekoa: ez</string>
     <string name="poi_charcoal_pile">Ikatz meta</string>
     <string name="poi_historic_tank">Tanke historikoa</string>
-    <string name="poi_source_biomass">Energia iturria: biomasa</string>
+    <string name="poi_generator_source_biomass">Energia iturria: biomasa</string>
     <string name="poi_rescue_box">Salbamendu kutxa</string>
     <string name="poi_access_bus">Autobusetarako sarbidea</string>
     <string name="poi_access_caravan">Karabanetarako sarbidea</string>

OsmAnd/res/values-fr/phrases.xml

@@ -3531,7 +3531,7 @@
     <string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
     <string name="poi_socket_as3112_yes">AS/NZS 3112</string>
     <string name="poi_historic_tank">Tank historique</string>
-    <string name="poi_source_biomass">Source d\'énergie : biomasse</string>
+    <string name="poi_generator_source_biomass">Source d\'énergie : biomasse</string>
     <string name="poi_cuisine_buschenschank">Buschenschank</string>
     <string name="poi_cuisine_deli">Épicerie fine</string>
     <string name="poi_motorcycle_type_dualsport">Trail (moto)</string>

OsmAnd/res/values-fr/strings.xml

@@ -3288,7 +3288,7 @@
     <string name="added_profiles_descr">Profils ajoutés par le greffon</string>
     <string name="shared_string_turn_off">Désactiver</string>
     <string name="new_plugin_added">Nouveau greffon ajouté</string>
-    <string name="join_segments">Relier les segments</string>
+    <string name="join_segments">Joindre les segments</string>
     <string name="add_new_profile_q">Ajouter le profil \'%1$s\' \?</string>
     <string name="save_heading">Inclure la direction</string>
     <string name="save_heading_descr">Inclure la direction de chaque point lors de l\'enregistrement d\'une trace.</string>
@@ -3956,7 +3956,7 @@
     <string name="shared_string_empty">Vide</string>
     <string name="announcement_time_approach">Approche</string>
     <string name="announcement_time_prepare">Préparation</string>
-    <string name="announcement_time_prepare_long">Longue préparation</string>
+    <string name="announcement_time_prepare_long">Préparation longue</string>
     <string name="announcement_time_arrive">Arrivé à destination</string>
     <string name="shared_string_turn">Bifurcation</string>
     <string name="show_track_on_map">Afficher la trace sur la carte</string>
@@ -4002,4 +4002,22 @@
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="opr_use_dev_url">Utilisez test.openplacereviews.org</string>
     <string name="login_open_place_reviews">Se connecter à OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Eau</string>
+    <string name="activity_type_winter_name">Hiver</string>
+    <string name="activity_type_snowmobile_name">Motoneige</string>
+    <string name="activity_type_cycling_name">Vélo</string>
+    <string name="activity_type_mountainbike_name">VTT</string>
+    <string name="activity_type_hiking_name">Randonnée</string>
+    <string name="activity_type_running_name">Course à pied</string>
+    <string name="activity_type_walking_name">Marche</string>
+    <string name="activity_type_car_name">Voiture</string>
+    <string name="activity_type_riding_name">Promenade</string>
+    <string name="activity_type_offroad_name">Voies non revêtues</string>
+    <string name="activity_type_motorbike_name">Moto</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews est un projet communautaire sur les lieux publics comme les restaurants, hôtels, musées… Il recueille toutes les informations publiques les concernant telles que des photos, des avis, des liens vers d\'autres systèmes, des liens vers OpenStreetMap ou Wikipedia.
+\n
+\nToutes les données d\'OpenPlaceReview sont ouvertes et accessibles à tous sur http://openplacereviews.org/data.
+\n
+\nPour en savoir, consultez http://openplacereviews.org.</string>
+    <string name="activity_type_racing_name">Course automobile</string>
 </resources>

OsmAnd/res/values-gl/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Morea de carbón</string>
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Bar de cachimbas</string>
-    <string name="poi_source_biomass">Fonte de enerxía: biomasa</string>
+    <string name="poi_generator_source_biomass">Fonte de enerxía: biomasa</string>
     <string name="poi_snowmobile_filter">Acesso para motos de neve</string>
     <string name="poi_access_bus">Acceso para buses</string>
     <string name="poi_access_caravan">Acceso para caravanas</string>

OsmAnd/res/values-hr/strings.xml

@@ -1421,4 +1421,49 @@
     <string name="keep_both">Zadrzi oboje</string>
     <string name="import_duplicates_title">Neke stavke već postoje</string>
     <string name="select_data_to_import">Odaberite podatke koje želite uvesti.</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Invalidska kolica</string>
+    <string name="routing_engine_vehicle_type_hiking">Planinarenje</string>
+    <string name="routing_engine_vehicle_type_walking">Pješačenje</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Električni biciklizam</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Planinski biciklizam</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Cestovni biciklizam</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Standardni biciklizam</string>
+    <string name="routing_engine_vehicle_type_hgv">Teretni kamion</string>
+    <string name="routing_engine_vehicle_type_small_truck">Mali kamion</string>
+    <string name="routing_engine_vehicle_type_truck">Kamion</string>
+    <string name="routing_engine_vehicle_type_scooter">Skuter</string>
+    <string name="routing_engine_vehicle_type_racingbike">Trkaći bicikl</string>
+    <string name="routing_engine_vehicle_type_mtb">Planinski bicikl</string>
+    <string name="message_server_error">Pogreška na poslužitelju: %1$s</string>
+    <string name="message_name_is_already_exists">Ovo ime već postoji</string>
+    <string name="delete_online_routing_engine">Izbrisati ovaj mrežni usmjerivač\?</string>
+    <string name="context_menu_edit_descr">Uredi opis</string>
+    <string name="delete_waypoints">Obriši putne točke</string>
+    <string name="copy_to_map_markers">Kopiraj u oznake na karti</string>
+    <string name="copy_to_map_favorites">Kopiraj u favorite</string>
+    <string name="upload_photo">Prenošenje</string>
+    <string name="upload_photo_completed">Prijenos završen</string>
+    <string name="uploading_count">Prenosi se %1$d od %2$d</string>
+    <string name="uploaded_count">Preneseno %1$d od %2$d</string>
+    <string name="toast_select_edits_for_upload">Odaberite uređivanja za prijenos</string>
+    <string name="hillshade_slope_contour_lines">Linije padine / Kosine / Konture</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews je projekt, razvijan od strane zajednice, koji daje informacije o mjestima kao što su restorani, hoteli, muzeji, putne točke. Ovaj projekt sakuplja sve javne informacije o tim mjestima, kao što su slike, recenzije, linkovi na druge sustave OpenStreetMap, Wikipedia.
+\n
+\nSvi OpenPlaceReview podaci su javni i dostupni svima: http://openplacereviews.org/data.
+\n
+\nPročitajte više na: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Koristiti test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Prijavite se za OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Voda</string>
+    <string name="activity_type_winter_name">Zima</string>
+    <string name="activity_type_snowmobile_name">Motorne sanke</string>
+    <string name="activity_type_racing_name">Trkanje</string>
+    <string name="activity_type_mountainbike_name">Planinski bicikl</string>
+    <string name="activity_type_cycling_name">Bicikliranje</string>
+    <string name="activity_type_hiking_name">Planinarenje</string>
+    <string name="activity_type_running_name">Trčanje</string>
+    <string name="activity_type_walking_name">Pješačenje</string>
+    <string name="activity_type_motorbike_name">Motocikl</string>
+    <string name="activity_type_car_name">Auto</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -54,7 +54,7 @@
     <string name="poi_service_tyres">Autógumi-szerelő</string>
     <string name="poi_car_wash">Autómosó</string>
     <string name="poi_fuel">Benzinkút;Töltőállomás;Gázolajtöltő-állomás</string>
-    <string name="poi_electricity_combined_charging">Elektromos töltőállomás</string>
+    <string name="poi_electricity_combined_charging">Elektromos töltőállomás;Elektromos autó töltése;Villanyautó töltése;Elektromos töltőpont</string>
     <string name="poi_compressed_air">Sűrített levegő</string>
     <string name="poi_parking">Parkoló</string>
     <string name="poi_motorcycle_parking">Motorkerékpár-parkoló</string>
@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Faszénégető boksa</string>
     <string name="poi_historic_tank">Történelmi harckocsi</string>
     <string name="poi_hookah_lounge">Vízipipázó társalgóhely</string>
-    <string name="poi_source_biomass">Energiaforrás: biomassza</string>
+    <string name="poi_generator_source_biomass">Energiaforrás: biomassza</string>
     <string name="poi_taxi_office">Taxiiroda</string>
     <string name="poi_cellar_entrance">Pincebejárat</string>
     <string name="poi_craft_builder">Kőműves</string>
@@ -3879,4 +3879,14 @@
     <string name="poi_wildlife_crossing_bat_tunnel">Denevéralagút</string>
     <string name="poi_wildlife_crossing_bat_bridge">Denevérhíd</string>
     <string name="poi_wildlife_crossing">Vadátjáró</string>
+    <string name="poi_summit_register_no">Csúcsnapló nincs</string>
+    <string name="poi_summit_register_yes">Csúcsnapló van</string>
+    <string name="poi_patrolled_no">Hegyi mentő nincs</string>
+    <string name="poi_patrolled_yes">Hegyi mentő van</string>
+    <string name="poi_gladed_yes">Erdei pálya</string>
+    <string name="poi_mobile_library">Mozgó könyvtár tartózkodási helye</string>
+    <string name="poi_piste_status_closed">Pálya állapota: zárva</string>
+    <string name="poi_piste_status_open">Pálya állapota: nyitva</string>
+    <string name="poi_piste_name">Pálya neve</string>
+    <string name="poi_piste_ski_jump">Síugrósánc</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -3164,7 +3164,7 @@
     <string name="routing_attr_allow_expert_description">Rendkívül nehéz útvonalak veszélyes akadályokkal és környezettel.</string>
     <string name="routing_attr_allow_skating_only_name">Csak korcsolyázó mozgással futható utak engedélyezése</string>
     <string name="routing_attr_allow_skating_only_description">Szabad vagy korcsolyázó stílushoz karbantartott utak, klasszikus nyomok nélkül.</string>
-    <string name="routing_attr_allow_classic_only_description">Klasszikus stílushoz karbantartott útvonalak, korcsolyázó nyomok nélkül. Ide tartoznak a kisebb hójárókkal karbantartott lazább pályájú útvonalak és a síelők által kézzel karbantartott nyomok is.</string>
+    <string name="routing_attr_allow_classic_only_description">Klasszikus stílushoz karbantartott útvonalak, korcsolyázó nyomok nélkül. Ide tartoznak a kisebb motoros szánokkal karbantartott lazább pályájú útvonalak és a síelők által kézzel karbantartott nyomok is.</string>
     <string name="rendering_attr_highway_class_track_grade1_name">1. osztály (burkolt)</string>
     <string name="rendering_attr_highway_class_track_grade2_name">2. osztály (kavicsos)</string>
     <string name="rendering_attr_highway_class_track_grade3_name">3. osztály (kemény földút)</string>
@@ -3958,7 +3958,7 @@
     <string name="select_folder">Mappa kijelölése</string>
     <string name="select_folder_descr">Mappa kijelölése vagy új hozzáadása</string>
     <string name="shared_string_empty">Üres</string>
-    <string name="analyze_by_intervals">Intervallumonkénti elemzés (felosztási intervallumok)</string>
+    <string name="analyze_by_intervals">Elemzés felosztási intervallumonként</string>
     <string name="upload_to_openstreetmap">Feltöltés az OpenStreetMapre</string>
     <string name="edit_track">Nyomvonal szerkesztése</string>
     <string name="rename_track">Nyomvonal átnevezése</string>
@@ -4002,4 +4002,26 @@
     <string name="uploading_count">%1$d / %2$d feltöltés alatt</string>
     <string name="uploaded_count">%1$d / %2$d feltöltve</string>
     <string name="toast_select_edits_for_upload">Szerkesztések kijelölése feltöltéshez</string>
+    <string name="activity_type_snowmobile_name">Motoros szán</string>
+    <string name="hillshade_slope_contour_lines">Domborzatárnyékolás / lejtés / szintvonalak</string>
+    <string name="open_place_reviews_plugin_description">Az OpenPlaceReviews egy közösségvezérelt projekt nyilvános helyekről (éttermek, szállodák, múzeumok, útpontok). Minden nyilvános információt összegyűjt róluk, például fényképeket, értékelésüket, más rendszerek – OpenStreetMap, Wikipedia – linkeket.
+\n
+\nMinden OpenPlaceReview-adat nyitott és mindenki számára elérhető itt: https://openplacereviews.org/data.
+\n
+\nBővebben itt olvashat: https://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">A test.openplacereviews.org használata</string>
+    <string name="login_open_place_reviews">Bejelentkezés az OpenPlaceReviews-ba</string>
+    <string name="activity_type_water_name">Víz</string>
+    <string name="activity_type_winter_name">Tél</string>
+    <string name="activity_type_riding_name">Lovaglás</string>
+    <string name="activity_type_racing_name">Versenykerékpározás</string>
+    <string name="activity_type_mountainbike_name">Hegyi kerékpározás</string>
+    <string name="activity_type_cycling_name">Kerékpározás</string>
+    <string name="activity_type_hiking_name">Túrázás</string>
+    <string name="activity_type_running_name">Futás</string>
+    <string name="activity_type_walking_name">Séta</string>
+    <string name="activity_type_offroad_name">Terepjáró</string>
+    <string name="activity_type_motorbike_name">Motorkerékpár</string>
+    <string name="activity_type_car_name">Személyautó</string>
 </resources>

OsmAnd/res/values-is/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Kolahaugur</string>
     <string name="poi_historic_tank">Sögulegur tankur</string>
     <string name="poi_hookah_lounge">Hookah-skáli</string>
-    <string name="poi_source_biomass">Orkugjafi: lífmassi</string>
+    <string name="poi_generator_source_biomass">Orkugjafi: lífmassi</string>
     <string name="poi_snowmobile_filter">Aðgangur vélsleða</string>
     <string name="poi_access_bus">Aðgangur fólksflutningabíla</string>
     <string name="poi_access_caravan">Aðgangur hjólhýsa</string>
@@ -3881,4 +3881,14 @@
     <string name="poi_wildlife_crossing_bat_bridge">Brú fyrir leðurblökur</string>
     <string name="poi_wildlife_crossing">Þverun villtra dýra</string>
     <string name="poi_swimming_area">Sundsvæði</string>
+    <string name="poi_mobile_library">Stæði fyrir bókabíl</string>
+    <string name="poi_summit_register_no">Skráning á tind: nei</string>
+    <string name="poi_summit_register_yes">Skráning á tind: já</string>
+    <string name="poi_piste_status_closed">Staða brautar: lokuð</string>
+    <string name="poi_piste_status_open">Staða brautar: opin</string>
+    <string name="poi_patrolled_no">Eftirlit: nei</string>
+    <string name="poi_patrolled_yes">Eftirlit: já</string>
+    <string name="poi_gladed_yes">Skafið: já</string>
+    <string name="poi_piste_name">Heiti brautar</string>
+    <string name="poi_piste_ski_jump">Skíðastökk</string>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -3969,7 +3969,7 @@
     <string name="select_folder">Veldu möppu</string>
     <string name="select_folder_descr">Veldu möppu eða bættu við nýrri</string>
     <string name="shared_string_empty">Tómt</string>
-    <string name="analyze_by_intervals">Greina eftir millibilum (uppskipting millibila)</string>
+    <string name="analyze_by_intervals">Greina eftir uppskiptingu millibila</string>
     <string name="upload_to_openstreetmap">Senda inn í OpenStreetMap</string>
     <string name="edit_track">Breyta ferli</string>
     <string name="rename_track">Endurnefna feril</string>
@@ -4002,4 +4002,32 @@
     <string name="routing_engine_vehicle_type_mtb">Fjallahjól</string>
     <string name="message_server_error">Villa í netþjóni: %1$s</string>
     <string name="message_name_is_already_exists">Nafnið er þegar til staðar</string>
+    <string name="delete_online_routing_engine">Eyða þessari leiðagerð á netinu\?</string>
+    <string name="context_menu_read_full">Lesa óstytt</string>
+    <string name="context_menu_edit_descr">Breyta lýsingu</string>
+    <string name="delete_waypoints">Eyða ferilpunktum</string>
+    <string name="copy_to_map_markers">Afrita í kortamerki</string>
+    <string name="copy_to_map_favorites">Afrita í eftirlæti</string>
+    <string name="upload_photo">Sendi inn</string>
+    <string name="upload_photo_completed">Innsendingu er lokið</string>
+    <string name="uploading_count">Sendi inn %1$d af %2$d</string>
+    <string name="uploaded_count">Sent inn %1$d af %2$d</string>
+    <string name="toast_select_edits_for_upload">Veldu breytingar til að senda inn</string>
+    <string name="hillshade_slope_contour_lines">Hæðaskygging / Halli / Hæðarlínur</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Nota test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Skrá inn á OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Vatn</string>
+    <string name="activity_type_winter_name">Vetur</string>
+    <string name="activity_type_snowmobile_name">Vélsleðar</string>
+    <string name="activity_type_riding_name">Útreiðar</string>
+    <string name="activity_type_racing_name">Kappakstur</string>
+    <string name="activity_type_mountainbike_name">Fjallahjól</string>
+    <string name="activity_type_cycling_name">Hjólreiðar</string>
+    <string name="activity_type_hiking_name">Gönguferðir</string>
+    <string name="activity_type_running_name">Hlaup</string>
+    <string name="activity_type_walking_name">Gangandi</string>
+    <string name="activity_type_offroad_name">Utanvegaakstur</string>
+    <string name="activity_type_motorbike_name">Vélhjól</string>
+    <string name="activity_type_car_name">Akandi</string>
 </resources>

OsmAnd/res/values-it/phrases.xml

@@ -2921,7 +2921,7 @@
     <string name="poi_logging">Registrazione</string>
     <string name="poi_horse_riding">Equitazione</string>
     <string name="poi_water_characteristic_mud">Fango</string>
-    <string name="poi_source_biomass">Fonte di energia: biomassa</string>
+    <string name="poi_generator_source_biomass">Fonte di energia: biomassa</string>
     <string name="poi_deadlock">Deadlock</string>
     <string name="poi_animal_shelter_wildlife">Fauna selvatica</string>
     <string name="poi_trees_rubber">Gomma</string>

OsmAnd/res/values-iw/strings.xml

@@ -3967,7 +3967,7 @@
     <string name="select_folder">בחירת תקינה</string>
     <string name="select_folder_descr">נא לבחור תיקייה או להוסיף אחת חדשה</string>
     <string name="shared_string_empty">ריק</string>
-    <string name="analyze_by_intervals">ניתוח לפי מרווחים (פיצול מרווחים)</string>
+    <string name="analyze_by_intervals">ניתוח מרווחי פיצול</string>
     <string name="upload_to_openstreetmap">העלאה ל־OpenStreetMap</string>
     <string name="edit_track">עריכת מסלול</string>
     <string name="rename_track">שינוי שם מסלול</string>
@@ -4013,4 +4013,24 @@
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="opr_use_dev_url">להשתמש ב־test.openplacereviews.org</string>
     <string name="login_open_place_reviews">כניסה ל־OpenPlaceReviews</string>
+    <string name="announcement_time_descr">זמן ההכרזה של ההנחיות הקוליות השונות תלוי בסוג ההכרזה, במהירות הניווט הנוכחית ובמהירות הניווט כבררת מחדל.</string>
+    <string name="hillshade_slope_contour_lines">הצללה / מדרון / קווי מתאר</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews הוא מיזם בהובלת הקהילה בנוגע למקומות ציבוריים כגון מסעדות, מלונות, מוזיאונים ונקודות דרך. הוא אוסף מידע ציבורי עליהם כגון תמונות, סקירות, קישורים למערכות אחרות שמקושרות ל־OpenStreetMap, ויקיפדיה.
+\n
+\nכל הנתונים של OpenPlaceReview הם פתוחים וזמינים לציבור הרחב: http://openplacereviews.org/data.
+\n
+\nניתן לקרוא עוד באתר: http://openplacereviews.org</string>
+    <string name="activity_type_water_name">מים</string>
+    <string name="activity_type_winter_name">חורף</string>
+    <string name="activity_type_snowmobile_name">אופנוע שלג</string>
+    <string name="activity_type_riding_name">רכיבה</string>
+    <string name="activity_type_racing_name">מירוץ</string>
+    <string name="activity_type_mountainbike_name">אופני הרים</string>
+    <string name="activity_type_cycling_name">רכיבת אופניים</string>
+    <string name="activity_type_hiking_name">טיול שטח</string>
+    <string name="activity_type_running_name">ריצה</string>
+    <string name="activity_type_walking_name">הליכה</string>
+    <string name="activity_type_offroad_name">שטח</string>
+    <string name="activity_type_motorbike_name">אופנוע</string>
+    <string name="activity_type_car_name">מכונית</string>
 </resources>

OsmAnd/res/values-ja/phrases.xml

@@ -3553,7 +3553,7 @@
     <string name="poi_climbing_crag">可</string>
     <string name="reddit">Reddit</string>
     <string name="poi_historic_tank">歴史的な戦車</string>
-    <string name="poi_source_biomass">動力源:バイオマス燃料</string>
+    <string name="poi_generator_source_biomass">動力源:バイオマス燃料</string>
     <string name="poi_snowmobile_filter">スノーモービルでのアクセス</string>
     <string name="poi_access_bus">バスでのアクセス</string>
     <string name="poi_access_caravan">キャラバン・キャンピングトレーラーでのアクセス</string>

OsmAnd/res/values-lv/phrases.xml

@@ -3212,5 +3212,5 @@
     <string name="poi_climbing_crag_filter">Klints kāpšanas treniņvietas</string>
     <string name="poi_climbing_crag">Jā</string>
     <string name="reddit">Reddit</string>
-    <string name="poi_source_biomass">Enerģijas avots: biomasa</string>
+    <string name="poi_generator_source_biomass">Enerģijas avots: biomasa</string>
 </resources>

OsmAnd/res/values-nb/phrases.xml

@@ -1506,7 +1506,7 @@
     <string name="poi_hazard_additional_minefield">Fare: Minefelt</string>
     <string name="poi_hazard_additional_avalanche">Fare: Snøskred</string>
     <string name="poi_hazard_additional_flood">Fare: Oversvømmelse</string>
-    <string name="poi_source_biomass">Energikilde: Biomasse</string>
+    <string name="poi_generator_source_biomass">Energikilde: Biomasse</string>
     <string name="poi_motorhome_yes">Ja</string>
     <string name="poi_bus_yes">Ja</string>
     <string name="poi_snowmobile_yes">Ja</string>

OsmAnd/res/values-nl/phrases.xml

@@ -2738,7 +2738,7 @@
     <string name="poi_climbing_crag">Ja</string>
     <string name="reddit">Reddit</string>
     <string name="poi_historic_tank">Historische tank</string>
-    <string name="poi_source_biomass">Energiebron: biomassa</string>
+    <string name="poi_generator_source_biomass">Energiebron: biomassa</string>
     <string name="poi_access_disabled">Gehandicaptentoegang</string>
     <string name="poi_snowmobile_yes">Ja</string>
     <string name="poi_bus_yes">Ja</string>

OsmAnd/res/values-pl/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Stos węgla drzewnego</string>
     <string name="poi_historic_tank">Czołg historyczny</string>
     <string name="poi_hookah_lounge">Hookah lounge - Salon fajki wodnej (shisha)</string>
-    <string name="poi_source_biomass">Źródło energii: biomasa</string>
+    <string name="poi_generator_source_biomass">Źródło energii: biomasa</string>
     <string name="poi_snowmobile_filter">Dostęp dla skuterów śnieżnych</string>
     <string name="poi_access_bus">Dostęp dla autobusów</string>
     <string name="poi_access_caravan">Dostęp dla przyczepy kempingowej</string>

OsmAnd/res/values-pl/strings.xml

@@ -4005,4 +4005,25 @@
     <string name="uploading_count">Przesyłanie %1$d z %2$d</string>
     <string name="uploaded_count">Przesłano %1$d z %2$d</string>
     <string name="toast_select_edits_for_upload">Wybierz zmiany do przesłania</string>
+    <string name="hillshade_slope_contour_lines">Wzniesienia / Nachylenie / Linie konturowe</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews to społeczny projekt dotyczący miejsc publicznych, takich jak restauracje, hotele, muzea, punkty trasy. Gromadzi wszystkie publiczne informacje o nich, takie jak zdjęcia, recenzje, linki do innych systemów, link OpenStreetMap, Wikipedia.
+\n
+\nWszystkie dane OpenPlaceReview są otwarte i dostępne dla każdego: http://openplacereviews.org/data.
+\n
+\nMożesz przeczytać więcej na: http://openplacereviews.org</string>
+    <string name="opr_use_dev_url">Użyj test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Zaloguj się do OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Woda</string>
+    <string name="activity_type_winter_name">Zima</string>
+    <string name="activity_type_snowmobile_name">Skuter</string>
+    <string name="activity_type_riding_name">Jazda konna</string>
+    <string name="activity_type_racing_name">Wyścigi</string>
+    <string name="activity_type_mountainbike_name">Kolarstwo górskie</string>
+    <string name="activity_type_cycling_name">Kolarstwo</string>
+    <string name="activity_type_hiking_name">Turystyka piesza</string>
+    <string name="activity_type_running_name">Bieganie</string>
+    <string name="activity_type_walking_name">Pieszo</string>
+    <string name="activity_type_motorbike_name">Motocykl</string>
+    <string name="activity_type_offroad_name">Poza drogą</string>
+    <string name="activity_type_car_name">Samochód</string>
 </resources>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Pilha de carvão</string>
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Salão do cachimbo de água</string>
-    <string name="poi_source_biomass">Fonte de energia: biomassa</string>
+    <string name="poi_generator_source_biomass">Fonte de energia: biomassa</string>
     <string name="poi_access_motorcycle">Acesso de motocicletas</string>
     <string name="poi_access_mofa">Acesso de bicicleta motorizada</string>
     <string name="poi_access_hgv">Acesso de veículos pesados</string>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -217,7 +217,7 @@
     <string name="proxy_pref_descr">Especifique um servidor proxy.</string>
     <string name="settings_privacy">Privacidade</string>
     <string name="shared_string_gpx_points">Pontos</string>
-    <string name="navigation_over_track">Iniciar a navegação pela trilha?</string>
+    <string name="navigation_over_track">Iniciar a navegação ao longo da trilha\?</string>
     <string name="speak_pedestrian">Faixas de pedestre</string>
     <string name="rendering_attr_roadStyle_name">Estilo das vias</string>
     <string name="avoid_roads_msg">Obter uma rota alternativa, selecionando quais vias evitar</string>
@@ -4004,4 +4004,25 @@
     <string name="uploaded_count">Carregado %1$d de %2$d</string>
     <string name="toast_select_edits_for_upload">Selecione as edições para carregamento</string>
     <string name="hillshade_slope_contour_lines">Sombras de relevo / Encostas / Curvas de nível</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews é um projeto conduzido pela comunidade sobre locais públicos como restaurantes, hotéis, museus, pontos de passagem. Ele coleta todas as informações públicas sobre eles, como fotos, comentários, links para outros sistemas, link OpenStreetMap, Wikipédia.
+\n
+\nTodos os dados do OpenPlaceReview estão abertos e disponíveis para todos: http://openplacereviews.org/data.
+\n
+\nVocê pode ler mais em: http://openplacereviews.org</string>
+    <string name="activity_type_motorbike_name">Motorbike</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Usar test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Entrar para OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Água</string>
+    <string name="activity_type_winter_name">Inverno</string>
+    <string name="activity_type_snowmobile_name">Moto de neve</string>
+    <string name="activity_type_riding_name">Equitação</string>
+    <string name="activity_type_racing_name">Corrida</string>
+    <string name="activity_type_mountainbike_name">Mountainbike</string>
+    <string name="activity_type_cycling_name">Ciclismo</string>
+    <string name="activity_type_hiking_name">Caminhada</string>
+    <string name="activity_type_running_name">Corrida</string>
+    <string name="activity_type_walking_name">A pé</string>
+    <string name="activity_type_offroad_name">Fora de estrada</string>
+    <string name="activity_type_car_name">Carro</string>
 </resources>

OsmAnd/res/values-pt/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Pilha de carvão</string>
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Salão Hookah</string>
-    <string name="poi_source_biomass">Fonte de energia: biomassa</string>
+    <string name="poi_generator_source_biomass">Fonte de energia: biomassa</string>
     <string name="poi_snowmobile_filter">Acesso de moto de neve</string>
     <string name="poi_access_bus">Acesso de ônibus</string>
     <string name="poi_access_caravan">Acesso de caravana</string>

OsmAnd/res/values-ru/phrases.xml

@@ -3548,7 +3548,7 @@
     <string name="poi_changing_table_count">Количество пеленальных столов</string>
     <string name="poi_changing_table_fee_yes">Платный пеленальный стол: да</string>
     <string name="poi_changing_table_fee_no">Платный пеленальный стол: нет</string>
-    <string name="poi_source_biomass">Источник энергии: биомасса</string>
+    <string name="poi_generator_source_biomass">Источник энергии: биомасса</string>
     <string name="poi_access_motorcycle">Доступ для мотоциклов</string>
     <string name="poi_access_moped">Доступ для мопедов</string>
     <string name="poi_access_mofa">Доступ для мопедов Mofa</string>
@@ -3879,4 +3879,10 @@
     <string name="poi_ranger_station">Станция рейнджеров</string>
     <string name="poi_swimming_area">Место для купания</string>
     <string name="poi_wildlife_crossing">Экодук</string>
+    <string name="poi_piste_status_closed">Состояние трассы: закрыта</string>
+    <string name="poi_piste_status_open">Состояние трассы: открыта</string>
+    <string name="poi_patrolled_no">Патрулируется: нет</string>
+    <string name="poi_patrolled_yes">Патрулируется: да</string>
+    <string name="poi_piste_name">Название трассы</string>
+    <string name="poi_piste_ski_jump">Лыжный трамплин</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -3941,7 +3941,7 @@
     <string name="shared_string_enter_param">Введите параметр</string>
     <string name="routing_engine_vehicle_type_walking">Пешеход</string>
     <string name="routing_engine_vehicle_type_scooter">Самокат</string>
-    <string name="analyze_by_intervals">Анализ по интервалам (по отдельности)</string>
+    <string name="analyze_by_intervals">Анализ по интервалам</string>
     <string name="announcement_time_prepare_long">Заблаговременно</string>
     <string name="announcement_time_prepare">Заранее</string>
     <string name="announcement_time_passing">При прохождении</string>
@@ -3998,4 +3998,21 @@
     <string name="routing_engine_vehicle_type_cycling_regular">Обычный велосипед</string>
     <string name="routing_engine_vehicle_type_racingbike">Гоночный велосипед</string>
     <string name="routing_engine_vehicle_type_mtb">Горный велосипед</string>
+    <string name="activity_type_cycling_name">Езда на велосипеде</string>
+    <string name="activity_type_hiking_name">Пеший туризм</string>
+    <string name="activity_type_running_name">Бег</string>
+    <string name="activity_type_walking_name">Пешеход</string>
+    <string name="activity_type_offroad_name">Внедорожник</string>
+    <string name="activity_type_motorbike_name">Мотоцикл</string>
+    <string name="activity_type_car_name">Автомобиль</string>
+    <string name="opr_use_dev_url">Использовать test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Вход в OpenPlaceReviews</string>
+    <string name="activity_type_snowmobile_name">Снегоход</string>
+    <string name="activity_type_mountainbike_name">Горный велосипед</string>
+    <string name="routing_engine_vehicle_type_driving">Вождение</string>
+    <string name="routing_engine_vehicle_type_foot">Пешком</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Вода</string>
+    <string name="activity_type_winter_name">Зима</string>
+    <string name="activity_type_riding_name">Верховая езда</string>
 </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Chea</string>
     <string name="poi_historic_tank">Carru armadu istòricu</string>
     <string name="poi_hookah_lounge">Sala pro su narghilè</string>
-    <string name="poi_source_biomass">Mitza de energia: biomassa</string>
+    <string name="poi_generator_source_biomass">Mitza de energia: biomassa</string>
     <string name="poi_snowmobile_filter">Atzessu pro sas motoislitas</string>
     <string name="poi_access_bus">Atzessu pro sos postales</string>
     <string name="poi_access_caravan">Atzessu pro sas roulotes e sos campers</string>
@@ -3881,4 +3881,14 @@
     <string name="poi_wildlife_crossing_bat_bridge">Pontes pro tzintzimurreddos</string>
     <string name="poi_wildlife_crossing">Logu de atraessamentu de sa fàuna areste</string>
     <string name="poi_swimming_area">Logu pro nadare</string>
+    <string name="poi_mobile_library">Positzione de firmada de sa biblioteca mòbile</string>
+    <string name="poi_summit_register_no">Registru de su cùcuru: nono</string>
+    <string name="poi_summit_register_yes">Registru de su cùcuru: eja</string>
+    <string name="poi_piste_status_closed">Istadu de sa pista: serrada</string>
+    <string name="poi_piste_status_open">Istadu de sa pista: aberta</string>
+    <string name="poi_patrolled_no">Controllada: nono</string>
+    <string name="poi_patrolled_yes">Controllada: eja</string>
+    <string name="poi_gladed_yes">Cun àrbores: eja</string>
+    <string name="poi_piste_name">Nùmene de sa pista</string>
+    <string name="poi_piste_ski_jump">Brincu cun sos iscì</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -57,7 +57,7 @@
     <string name="index_name_gb">Europa - Britannia Manna</string>
     <string name="calculate_osmand_route_without_internet">Càrculu chene impreu de ìnternet de un\'àndala de OsmAnd</string>
     <string name="gpx_option_calculate_first_last_segment">Càrcula un’àndala cun OsmAnd pro su primu e s’ùrtimu segmentu de sa caminera</string>
-    <string name="use_displayed_track_for_navigation">Cheres impreare s’àndala ammustrada pro sa navigatzione\?</string>
+    <string name="use_displayed_track_for_navigation">Cheres impreare sa rasta ammustrada pro sa navigatzione\?</string>
     <string name="keep_and_add_destination_point">Annanghe comente destinatzione imbeniente</string>
     <string name="select_gpx">Issèbera GPX…</string>
     <string name="route_descr_select_destination">Imposta sa destinatzione</string>
@@ -3797,7 +3797,7 @@
     <string name="only_selected_segment_recalc">Petzi su segmentu ischertadu s\'at a torrare a carculare impreende su profilu ischertadu.</string>
     <string name="all_next_segments_will_be_recalc">Totu sos segmentos imbenientes s\'ant a torrare a carculare impreende su segmentu ischertadu.</string>
     <string name="all_previous_segments_will_be_recalc">Totu sos segmentos s\'ant a torrare a carculare impreende su profilu ischertadu.</string>
-    <string name="open_saved_track">Aberi una rasta sarvada</string>
+    <string name="open_saved_track">Aberi sa rasta sarvada</string>
     <string name="shared_string_is_saved">est sarvadu</string>
     <string name="one_point_error">Pro praghere annanghe a su mancu duos puntos.</string>
     <string name="shared_string_redo">Torra a fàghere</string>
@@ -3979,7 +3979,7 @@
     <string name="routing_engine_vehicle_type_mtb">MTB (motosilurante)</string>
     <string name="message_server_error">Errore de su serbidore: %1$s</string>
     <string name="message_name_is_already_exists">Su nùmene esistit giai</string>
-    <string name="analyze_by_intervals">Analiza pro intervallos (intervallu fratzionadu)</string>
+    <string name="analyze_by_intervals">Analiza sos intervallos fratzionados</string>
     <string name="upload_to_openstreetmap">Càrriga in OpenStreetMap</string>
     <string name="edit_track">Modìfica sa rasta</string>
     <string name="rename_track">Modìfica su nùmene de sa rasta</string>
@@ -3996,4 +3996,35 @@
     <string name="uploading_count">Carrighende %1$d de %2$d</string>
     <string name="uploaded_count">%1$d de %2$d carrigados</string>
     <string name="toast_select_edits_for_upload">Ischerta modìficas de carrigare</string>
+    <string name="announcement_time_descr">Su tempus de annùntziu de sos annùntzios vocales diferentes dipendet dae sa casta de annùntziu, dae sa lestresa de navigatzione de cussu momentu e dae sa lestresa de navigatzione predefinida.</string>
+    <string name="announcement_time_title">Tempus de annùntziu</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews est unu progetu ghiadu dae sa comunidade in subra de logos pùblicos che a ristorantes, albergos, museos, puntos de coladòrgiu. Collit totu sas informatziones pùblicas chi lis pertocant che a sas fotos, sas retzensiones, e sos ligàmenes a àteros sistemas che ligant a OpenStreetMap e Wikipedia.
+\n
+\nTotu sos datos de OpenPlaceReview sunt lìberos e a disponimentu de totus: http://openplacereviews.org/data.
+\n
+\nPodes agatare àteras informatziones inoghe: http://openplacereviews.org</string>
+    <string name="announcement_time_passing">Colende</string>
+    <string name="announcement_time_approach">Acurtzia·ti</string>
+    <string name="announcement_time_prepare_long">Ammaniamentu longu</string>
+    <string name="announcement_time_prepare">Ammània</string>
+    <string name="announcement_time_off_route">In foras de s\'àndala</string>
+    <string name="announcement_time_arrive">Arribu a destinatzione</string>
+    <string name="shared_string_turn">Bortada</string>
+    <string name="hillshade_slope_contour_lines">Umbradura de sos rilievos / Pendèntzia / Lìnias de livellu</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Imprea test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Intra in OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Abba</string>
+    <string name="activity_type_winter_name">Ierru</string>
+    <string name="activity_type_snowmobile_name">Motoislita</string>
+    <string name="activity_type_riding_name">A caddu</string>
+    <string name="activity_type_racing_name">Gara</string>
+    <string name="activity_type_mountainbike_name">Bitzicleta de monte</string>
+    <string name="activity_type_cycling_name">Bitzicleta</string>
+    <string name="activity_type_hiking_name">Escursionismu</string>
+    <string name="activity_type_running_name">Cursa</string>
+    <string name="activity_type_walking_name">A pee</string>
+    <string name="activity_type_offroad_name">Foras de camineras</string>
+    <string name="activity_type_motorbike_name">Moto</string>
+    <string name="activity_type_car_name">Màchina</string>
 </resources>

OsmAnd/res/values-sk/phrases.xml

@@ -240,8 +240,8 @@
     <string name="poi_city">Mesto (nad 100 tis.obyv.)</string>
     <string name="poi_town">Mesto (10 tis.-100 tis.obyv.)</string>
     <string name="poi_village">Obec (200-10 tis.obyv.)</string>
-    <string name="poi_hamlet">Osada/Samota</string>
-    <string name="poi_isolated_dwelling">Izolované obydlie</string>
+    <string name="poi_hamlet">Osada</string>
+    <string name="poi_isolated_dwelling">Samota/kopanica</string>
     <string name="poi_suburb">Mestský obvod</string>
     <string name="poi_neighbourhood">Okolie (v meste)</string>
     <string name="poi_locality">Oblasť</string>
@@ -3339,7 +3339,7 @@
     <string name="poi_boat_canoe_rental_rental_yes">Kanoe: áno</string>
     <string name="poi_boat_canoe_rental_rental_no">Kanoe: nie</string>
     <string name="poi_surface_clay">Antuka</string>
-    <string name="poi_source_biomass">Zdroj energie: biomasa</string>
+    <string name="poi_generator_source_biomass">Zdroj energie: biomasa</string>
     <string name="poi_snowmobile_filter">Prístup snežným skútrom</string>
     <string name="poi_access_bus">Prístup autobusom</string>
     <string name="poi_access_caravan">Prístup karavanom</string>

OsmAnd/res/values-sk/strings.xml

@@ -3913,7 +3913,7 @@
     <string name="gpx_upload_identifiable_visibility_descr">\"Identifikovateľná\" znamená, že trasa sa zobrazí verejne vo vašich GPS stopách a vo verejných zoznamoch GPS stôp, tzn. iní používatelia budú môcť stiahnuť nespracovanú trasu a prepojiť su s vašim používateľkým menom. Verejné body trasy s časovými pečiatkami poskytované cez GPS rozhranie (API) budú odkazovať na vašu pôvodnú stránku s trasou.</string>
     <string name="gpx_upload_trackable_visibility_descr">\"Sledovateľná\" znamená, že trasa sa nezobrazí vo verejných zoznamoch, ale spracované body trasy s časovými pečiatkami (ktoré nie je možné spojiť s vami), budú dostupné na stiahnutie cez verejné GPS rozhranie (API).</string>
     <string name="app_mode_light_aircraft">Ľahké lietadlo</string>
-    <string name="plan_route_join_segments">Prepojte segmenty</string>
+    <string name="plan_route_join_segments">Spojiť úseky</string>
     <string name="plan_route_split_before">Rozdeliť predtým</string>
     <string name="plan_route_split_after">Rozdeliť po</string>
     <string name="plan_route_add_new_segment">Pridať nový segment</string>
@@ -4004,4 +4004,25 @@
     <string name="uploaded_count">Odoslané %1$d z %2$d</string>
     <string name="toast_select_edits_for_upload">Zvoľte úpravy na odoslanie</string>
     <string name="hillshade_slope_contour_lines">Tieňované svahy / Sklony svahov / Vrstevnice</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews je komunitný projekt o verejných miestach ako reštaurácie, hotely, múzeá, body trasy. Zhromažďuje o nich verejné informácie ako fotografie, hodnotenia, odkazy na iné databázy ako OpenStreetMap, Wikipédia.
+\n
+\nVšetky údaje OpenPlaceReview data sú dostupné každému: http://openplacereviews.org/data.
+\n
+\nViac sa môžete dočítať na: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Použiť test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Prihlásiť sa do OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Voda</string>
+    <string name="activity_type_winter_name">Zima</string>
+    <string name="activity_type_snowmobile_name">Snežný skúter</string>
+    <string name="activity_type_riding_name">Jazda na koni</string>
+    <string name="activity_type_racing_name">Preteky</string>
+    <string name="activity_type_mountainbike_name">Horský bicykel</string>
+    <string name="activity_type_cycling_name">Cyklistika</string>
+    <string name="activity_type_hiking_name">Turistika</string>
+    <string name="activity_type_running_name">Beh</string>
+    <string name="activity_type_walking_name">Chôdza</string>
+    <string name="activity_type_offroad_name">Jazda mimo cesty</string>
+    <string name="activity_type_motorbike_name">Motorka</string>
+    <string name="activity_type_car_name">Auto</string>
 </resources>

OsmAnd/res/values-sl/strings.xml

@@ -3354,4 +3354,11 @@
     <string name="uploading_count">Poteka pošiljanje %1$d od %2$d</string>
     <string name="uploaded_count">Poslano %1$d od %2$d</string>
     <string name="toast_select_edits_for_upload">Izbor sprememb za pošiljanje</string>
+    <string name="activity_type_mountainbike_name">Gorsko kolesarjenje</string>
+    <string name="activity_type_cycling_name">Kolesarjenje</string>
+    <string name="activity_type_hiking_name">Pohod</string>
+    <string name="activity_type_running_name">Tek</string>
+    <string name="activity_type_walking_name">Hoja</string>
+    <string name="activity_type_motorbike_name">Motor</string>
+    <string name="activity_type_car_name">Avto</string>
 </resources>

OsmAnd/res/values-sr/phrases.xml

@@ -2723,7 +2723,7 @@
     <string name="poi_health_specialty_radiotherapy_yes">Радиотерапија</string>
     <string name="reddit">Reddit</string>
     <string name="poi_historic_tank">Историјски резервоар</string>
-    <string name="poi_source_biomass">Извор енергије: биомаса</string>
+    <string name="poi_generator_source_biomass">Извор енергије: биомаса</string>
     <string name="poi_cash_withdrawal_bank_card">Подизање новца</string>
     <string name="poi_bath_type">Тип</string>
     <string name="poi_bath_open_air">На отвореном</string>

OsmAnd/res/values-tr/phrases.xml

@@ -502,7 +502,7 @@
     <string name="poi_climbing">Tırmanma</string>
     <string name="poi_cricket">Kriket</string>
     <string name="poi_croquet">Kroket</string>
-    <string name="poi_cycling">Bisiklete binme</string>
+    <string name="poi_cycling">Bisiklet sürme</string>
     <string name="poi_diving">Dalış</string>
     <string name="poi_scuba_diving">Tüplü dalış</string>
     <string name="poi_dog_racing">Köpek yarışı</string>
@@ -1499,7 +1499,7 @@
     <string name="poi_animal_shelter_horse">At</string>
     <string name="poi_animal_shelter_mammal">Memeliler</string>
     <string name="poi_animal_shelter_fish">Balıklar</string>
-    <string name="poi_source_biomass">Enerji kaynağı: biyokütle</string>
+    <string name="poi_generator_source_biomass">Enerji kaynağı: biyokütle</string>
     <string name="poi_content_oil">İçerik: petrol</string>
     <string name="poi_bicycle_parking_shed">Baraka</string>
     <string name="poi_information_sign">Tabela</string>

OsmAnd/res/values-tr/strings.xml

@@ -2225,7 +2225,7 @@
     <string name="marker_save_as_track_descr">İşaretleyicilerinizi şu GPX dosyasına aktarın:</string>
     <string name="show_arrows_on_the_map">Haritada yön gösterici okları göster</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd seçilmiş profil için rotalı noktalara bağlanacak.</string>
-    <string name="none_point_error">Lütfen en az bir nokta ekleyiniz.</string>
+    <string name="none_point_error">Lütfen en az bir nokta ekleyin.</string>
     <string name="measurement_tool_action_bar">Haritayı görüntüle ve nokta ekle</string>
     <string name="store_tracks_in_monthly_directories">Kaydedilmiş izlenen yolları aylık klasörlerde depola</string>
     <string name="mapillary_menu_filter_description">Resimleri göndericiye, tarihe ya da türüne göre filtreleyin. Sadece yakın mesafe yakınlaştırmasında etkin.</string>
@@ -3736,7 +3736,7 @@
     <string name="track_coloring_solid">Koyu</string>
     <string name="plan_route_last_edited">Son düzenleme</string>
     <string name="plan_route_import_track">Yolu içe aktar</string>
-    <string name="plan_route_open_existing_track">Mevcut yolu aç</string>
+    <string name="plan_route_open_existing_track">Var olan yolu aç</string>
     <string name="plan_route_create_new_route">Yeni güzergah oluştur</string>
     <string name="plan_route_select_track_file_for_open">Açmak için bir yol dosyası seçin.</string>
     <string name="shared_string_done">Bitti</string>
@@ -3965,7 +3965,7 @@
     <string name="select_folder">Klasör seç</string>
     <string name="select_folder_descr">Klasör seçin veya yeni bir tane ekleyin</string>
     <string name="shared_string_empty">Boş</string>
-    <string name="analyze_by_intervals">Aralıklara göre analiz et (bölme aralığı)</string>
+    <string name="analyze_by_intervals">Bölünmüş aralıkları analiz et</string>
     <string name="upload_to_openstreetmap">OpenStreetMap\'e yükle</string>
     <string name="edit_track">Yolu düzenle</string>
     <string name="rename_track">Yolu yeniden adlandır</string>
@@ -4009,4 +4009,26 @@
     <string name="uploading_count">%1$d / %2$d karşıya yükleniyor</string>
     <string name="uploaded_count">%1$d / %2$d karşıya yüklendi</string>
     <string name="toast_select_edits_for_upload">Karşıya yüklenecek düzenlemeleri seçin</string>
+    <string name="hillshade_slope_contour_lines">tepe gölgesi / yamaç / eş yükselti eğrileri</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews, restoranlar, oteller, müzeler, ara noktalar gibi halka açık yerler hakkında topluluk tarafından yürütülen bir projedir. Fotoğraflar, yorumlar, OpenStreetMap, Wikipedia gibi diğer sistemlere bağlantılar gibi onlar hakkındaki tüm halka açık bilgileri toplar.
+\n
+\nTüm OpenPlaceReview verileri açık ve herkes tarafından kullanılabilir: http://openplacereviews.org/data
+\n
+\nDaha fazlasını şu adresten okuyabilirsiniz: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">test.openplacereviews.org adresini kullan</string>
+    <string name="login_open_place_reviews">OpenPlaceReviews\'te oturum aç</string>
+    <string name="activity_type_water_name">Su</string>
+    <string name="activity_type_winter_name">Kış</string>
+    <string name="activity_type_snowmobile_name">Kar arabası</string>
+    <string name="activity_type_riding_name">Binme</string>
+    <string name="activity_type_racing_name">Yarış</string>
+    <string name="activity_type_mountainbike_name">Dağ bisikleti</string>
+    <string name="activity_type_cycling_name">Bisiklet sürme</string>
+    <string name="activity_type_hiking_name">Yürüyüş</string>
+    <string name="activity_type_running_name">Koşma</string>
+    <string name="activity_type_walking_name">Yürüme</string>
+    <string name="activity_type_offroad_name">Arazi</string>
+    <string name="activity_type_motorbike_name">Motosiklet</string>
+    <string name="activity_type_car_name">Araba</string>
 </resources>

OsmAnd/res/values-uk/phrases.xml

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">Вуглевипалювальна купа</string>
     <string name="poi_historic_tank">Старовинний танк</string>
     <string name="poi_hookah_lounge">Кальянна зала</string>
-    <string name="poi_source_biomass">Джерело енергії: біомаса</string>
+    <string name="poi_generator_source_biomass">Джерело енергії: біомаса</string>
     <string name="poi_snowmobile_filter">Доступ для снігоходів</string>
     <string name="poi_access_bus">Доступ для автобусів</string>
     <string name="poi_access_caravan">Доступ для житлових трейлерів (караванів)</string>
@@ -3887,4 +3887,8 @@
     <string name="poi_patrolled_yes">Патрулюється: так</string>
     <string name="poi_piste_name">Назва траси</string>
     <string name="poi_piste_ski_jump">Cтрибки на лижах</string>
+    <string name="poi_summit_register_no">Реєстр вершин: ні</string>
+    <string name="poi_summit_register_yes">Реєстр вершин: так</string>
+    <string name="poi_gladed_yes">Розчищена поляна: так</string>
+    <string name="poi_mobile_library">Місце зупинка мобільної бібліотеки</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -1391,7 +1391,7 @@
     <string name="settings_privacy">Приватність</string>
     <string name="shared_string_gpx_points">Точки</string>
     <string name="shared_string_my_location">Моя позиція</string>
-    <string name="navigation_over_track">Почати навігацію уздовж треку?</string>
+    <string name="navigation_over_track">Почати навігацію по треку\?</string>
     <string name="avoid_roads_msg">Прокласти альтернативний маршрут, вибравши дороги, яких варто уникати</string>
     <string name="speak_pedestrian">Пішохідні переходи</string>
     <string name="rendering_attr_roadStyle_name">Стиль доріг</string>
@@ -1823,7 +1823,7 @@
     <string name="starting_point">Відправна точка</string>
     <string name="shared_string_not_selected">Не вибрано</string>
     <string name="rec_split_clip_length">Тривалість кліпу</string>
-    <string name="nm">мор.м.</string>
+    <string name="nm">nmi</string>
     <string name="nm_h">вузлів</string>
     <string name="update_time">Час оновлення</string>
     <string name="updates_size">Розмір оновлення</string>
@@ -4008,4 +4008,25 @@
     <string name="uploaded_count">Вивантажено %1$d з %2$d</string>
     <string name="toast_select_edits_for_upload">Виберіть зміни для вивантаження</string>
     <string name="hillshade_slope_contour_lines">Рельєф місцевості / Схили / Горизонталі</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews — це громадський проєкт про громадські місця, такі як ресторани, готелі, музеї, точки шляху. Він збирає всі загальнодоступні дані про них, такі як світлини, відгуки, посилання на інші системи, посилання OpenStreetMap, Вікіпедія.
+\n
+\nУсі дані OpenPlaceReview відкриті та доступні всім: http://openplacereviews.org/data.
+\n
+\nВи можете прочитати більше за адресою: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Використати test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Увійти до OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Вода</string>
+    <string name="activity_type_winter_name">Зима</string>
+    <string name="activity_type_snowmobile_name">Снігохід</string>
+    <string name="activity_type_riding_name">Їзда</string>
+    <string name="activity_type_racing_name">Перегони</string>
+    <string name="activity_type_walking_name">Ходьба</string>
+    <string name="activity_type_mountainbike_name">Гірський велосипед</string>
+    <string name="activity_type_offroad_name">Бездоріжжя</string>
+    <string name="activity_type_cycling_name">Їзда на велосипеді</string>
+    <string name="activity_type_hiking_name">піший туризм</string>
+    <string name="activity_type_running_name">Біг</string>
+    <string name="activity_type_car_name">Автомобіль</string>
+    <string name="activity_type_motorbike_name">Мотоцикл</string>
 </resources>

OsmAnd/res/values-zh-rCN/phrases.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="poi_fuel_avia_type"/>
+    <string name="poi_fuel_avia_type">燃料类型（avia）</string>
     <string name="poi_payment_type">支付类别</string>
     <string name="poi_clothes_type">类型</string>
     <string name="poi_shoes_type">类型</string>
@@ -68,7 +68,7 @@
     <string name="poi_telescope_type">类型</string>
     <string name="poi_outdoor_seating">户外座位</string>
     <string name="poi_smoking">吸烟</string>
-    <string name="poi_takeaway">外带</string>
+    <string name="poi_takeaway">外卖</string>
     <string name="poi_cocktails">鸡尾酒</string>
     <string name="poi_washing_machine">洗衣机</string>
     <string name="poi_motorcycle_services">服务</string>
@@ -87,7 +87,7 @@
     <string name="poi_social_facility_type">类型</string>
     <string name="poi_zoo_type">类型</string>
     <string name="poi_shop">商店</string>
-    <string name="poi_emergency">急</string>
+    <string name="poi_emergency">紧急救助</string>
     <string name="poi_man_made">人造</string>
     <string name="poi_landuse">土地利用</string>
     <string name="poi_administrative">行政</string>
@@ -97,7 +97,7 @@
     <string name="poi_tourism">旅游</string>
     <string name="poi_sightseeing">遊覽</string>
     <string name="poi_accomodation">住宿</string>
-    <string name="poi_entertainment">闲暇</string>
+    <string name="poi_entertainment">休闲娱乐</string>
     <string name="poi_finance">金融</string>
     <string name="poi_natural">自然</string>
     <string name="poi_military">军事</string>
@@ -285,7 +285,7 @@
     <string name="poi_xmas">圣诞节</string>
     <string name="poi_xmas_shop">圣诞店</string>
     <string name="poi_xmas_tree">圣诞树</string>
-    <string name="poi_cuisine_pizza">比萨</string>
+    <string name="poi_cuisine_pizza">披萨</string>
     <string name="poi_cuisine_burger">汉堡</string>
     <string name="poi_cuisine_coffee">咖啡</string>
     <string name="poi_cuisine_sandwich">三明治</string>
@@ -360,7 +360,7 @@
     <string name="poi_recycling_furniture">家具</string>
     <string name="poi_tower">塔</string>
     <string name="poi_capital">是</string>
-    <string name="poi_town">镇</string>
+    <string name="poi_town">乡镇</string>
     <string name="poi_village">村</string>
     <string name="poi_hamlet">村庄</string>
     <string name="poi_suburb">市郊</string>
@@ -500,7 +500,7 @@
     <string name="poi_drive_through_yes">是</string>
     <string name="poi_microbrewery_yes">是</string>
     <string name="poi_takeaway_filter_yes">是</string>
-    <string name="poi_takeaway_yes">外带</string>
+    <string name="poi_takeaway_yes">外卖</string>
     <string name="poi_delivery_filter_yes">是</string>
     <string name="poi_outdoor_seating_filter_yes">是</string>
     <string name="poi_cocktails_yes">是</string>
@@ -733,4 +733,40 @@
     <string name="poi_physiotherapist">物理治疗师</string>
     <string name="poi_trees_rubber">橡胶</string>
     <string name="poi_resource_mineral_oil">矿物油</string>
+    <string name="poi_seasonal_wet_season">雨季</string>
+    <string name="poi_seasonal_dry_season">旱季</string>
+    <string name="poi_brand">品牌</string>
+    <string name="poi_operator">经营者</string>
+    <string name="poi_cuisine">菜品</string>
+    <string name="poi_motorcycle_type">摩托车类型</string>
+    <string name="poi_vacuum_cleaner_filter">吸尘器</string>
+    <string name="poi_compressed_air_filter">压缩空气</string>
+    <string name="poi_social_facility_for">目标群体</string>
+    <string name="poi_medical_system">医疗系统</string>
+    <string name="poi_tents">帐篷</string>
+    <string name="poi_massage_type">按摩类型</string>
+    <string name="poi_diet">饮食</string>
+    <string name="poi_nudism">裸体主义</string>
+    <string name="poi_beach_surface_type">表面</string>
+    <string name="poi_seasonal">季节性</string>
+    <string name="poi_fireplace">壁炉</string>
+    <string name="poi_drive_through">驾车经过</string>
+    <string name="poi_delivery">交货</string>
+    <string name="poi_piste_difficulty">滑雪道难度</string>
+    <string name="poi_backcountry">偏远地区</string>
+    <string name="poi_scout_camp">童子军营地</string>
+    <string name="poi_information_contents">内容</string>
+    <string name="poi_star_rating">星级</string>
+    <string name="poi_city_capital">首都</string>
+    <string name="poi_pump">泵</string>
+    <string name="poi_ferry_terminal_cargo">货物</string>
+    <string name="poi_covered">已覆盖</string>
+    <string name="poi_vending_type">自动售货机类型</string>
+    <string name="poi_resource_slate_iron_ore_copper">板岩；铁矿石；铜</string>
+    <string name="poi_craft_scaffolder">脚手架</string>
+    <string name="poi_wreck">沉船</string>
+    <string name="poi_pile">桩</string>
+    <string name="poi_charging_station">充电站</string>
+    <string name="poi_takeaway_no">无外卖</string>
+    <string name="poi_takeaway_only">仅限外卖</string>
 </resources>

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

@@ -3582,7 +3582,7 @@
     <string name="poi_charcoal_pile">木炭堆</string>
     <string name="poi_historic_tank">歷史坦克</string>
     <string name="poi_hookah_lounge">水煙休息室</string>
-    <string name="poi_source_biomass">能量來源：生質</string>
+    <string name="poi_generator_source_biomass">能量來源：生質</string>
     <string name="poi_snowmobile_filter">雪地摩托車進入</string>
     <string name="poi_access_bus">巴士進入</string>
     <string name="poi_access_caravan">露營車進入</string>

OsmAnd/res/values/attrs.xml

@@ -142,6 +142,7 @@
 		<attr name="text_input_background" format="reference"/>
 		<attr name="image_help_announcement_time" format="reference"/>
 		<attr name="switch_button_active" format="reference" />
+		<attr name="bottom_navigation_item_background" format="reference" />
 	</declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">

OsmAnd/res/values/no_translate.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name">OsmAnd~</string>
-    <string name="app_name_free">OsmAnd Nightly</string>
+    <!-- Part of build.gradle -->
+    <!-- <string name="app_name">OsmAnd~</string> -->
+    <!-- <string name="app_edition"></string> -->
     <!-- string name="app_version_suffix"></string -->
 
     <!-- Not translatable -->
@@ -9,11 +10,7 @@
     <string name="srtm_plugin_price">€2,99</string>
     <string name="sea_depth_maps_price">€1,39</string>
     <string name="osm_live">OsmAnd Live</string>
-    <string name="ga_api_key">UA-28342846-2</string>
-    <string name="ga_dispatchPeriod">10</string>
-    <string name="ga_debug">true</string>
     <string name="openstreetmap_copyright"><a href="https://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
-    <string name="app_edition"></string>
     <string name="support_email">support@osmand.net</string>
     <string name="preferred_locale_no_translate">Display language</string>
     <string name="system_locale_no_translate">Device language</string>

OsmAnd/res/values/phrases.xml

@@ -1489,7 +1489,7 @@
 	<string name="poi_generator_source_geothermal">Energy source: geothermal</string>
 	<string name="poi_generator_source_oil">Energy source: oil</string>
 	<string name="poi_generator_source_diesel">Energy source: diesel</string>
-	<string name="poi_source_biomass">Energy source: biomass</string>
+	<string name="poi_generator_source_biomass">Energy source: biomass</string>
 
 	<string name="poi_int_name">International name</string>
 	<string name="poi_nat_name">National name</string>

OsmAnd/res/values/strings.xml

@@ -18,6 +18,19 @@
     <string name="routing_attr_driving_style_description">Select driving purpose to get shorter, faster or safer route</string>
     <string name="routing_attr_short_way_description">Optimized shorter route (energy saving)</string>
     <string name="temporary_conditional_routing_descr">Use road restrictions that are active now on the map</string>
+    <string name="activity_type_car_name">Car</string>
+    <string name="activity_type_motorbike_name">Motorbike</string>
+    <string name="activity_type_offroad_name">Off-road</string>
+    <string name="activity_type_walking_name">Walking</string>
+    <string name="activity_type_running_name">Running</string>
+    <string name="activity_type_hiking_name">Hiking</string>
+    <string name="activity_type_cycling_name">Cycling</string>
+    <string name="activity_type_mountainbike_name">Mountainbike</string>
+    <string name="activity_type_racing_name">Racing</string>
+    <string name="activity_type_riding_name">Riding</string>
+    <string name="activity_type_snowmobile_name">Snowmobile</string>
+    <string name="activity_type_winter_name">Winter</string>
+    <string name="activity_type_water_name">Water</string>
     <string name="login_open_place_reviews">Login to OpenPlaceReviews</string>
     <string name="opr_use_dev_url">Use test.openplacereviews.org</string>
     <string name="open_place_reviews">OpenPlaceReviews</string>

OsmAnd/res/values/styles.xml

@@ -249,6 +249,7 @@
         <item name="text_input_background">@color/text_input_background_light</item>
         <item name="image_help_announcement_time">@drawable/img_help_announcement_time_day</item>
         <item name="switch_button_active">@color/switch_button_active_light</item>
+        <item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_light</item>
     </style>
 
     <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -547,6 +548,7 @@
         <item name="text_input_background">@color/text_input_background_dark</item>
         <item name="image_help_announcement_time">@drawable/img_help_announcement_time_night</item>
         <item name="switch_button_active">@color/switch_button_active_dark</item>
+        <item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_dark</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">

OsmAnd/src/net/osmand/AndroidUtils.java

@@ -951,6 +951,12 @@ public class AndroidUtils {
 		return value != null ? value : propertyValue;
 	}
 
+
+	public static String getActivityTypeStringPropertyName(Context ctx, String propertyName, String defValue) {
+		String value = getStringByProperty(ctx, "activity_type_" + propertyName + "_name");
+		return value != null ? value : defValue;
+	}
+
 	private static String getStringByProperty(@NonNull Context ctx, @NonNull String property) {
 		try {
 			Field field = R.string.class.getField(property);

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

@@ -209,9 +209,10 @@ public class GpxSelectionHelper {
 	}
 
 	public SelectedGpxFile getSelectedGPXFile(WptPt point) {
-		for (SelectedGpxFile g : selectedGPXFiles) {
-			if (g.getGpxFile().containsPoint(point)) {
-				return g;
+		for (SelectedGpxFile selectedGpxFile : selectedGPXFiles) {
+			GPXFile gpxFile = selectedGpxFile.getGpxFile();
+			if (gpxFile.containsPoint(point) || gpxFile.containsRoutePoint(point)) {
+				return selectedGpxFile;
 			}
 		}
 		return null;

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

@@ -136,10 +136,10 @@ import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener;
 import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.datastorage.DataStorageFragment;
 import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
 import net.osmand.plus.settings.fragments.ConfigureProfileFragment;
-import net.osmand.plus.settings.datastorage.DataStorageFragment;
 import net.osmand.plus.track.TrackAppearanceFragment;
 import net.osmand.plus.track.TrackMenuFragment;
 import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
@@ -1664,6 +1664,12 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		getMapView().refreshMap();
 	}
 
+	public void refreshMapComplete() {
+		getMyApplication().getResourceManager().getRenderer().clearCache();
+		updateMapSettings();
+		getMapView().refreshMap(true);
+	}
+
 	public View getLayout() {
 		return getWindow().getDecorView().findViewById(android.R.id.content);
 	}

OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java

@@ -1,6 +1,7 @@
 package net.osmand.plus.base;
 
 import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -884,32 +885,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment
 				updateMainViewLayout(posY);
 			}
 			if (animated) {
-				mainView.animate().y(posY)
-						.setDuration(ANIMATION_DURATION)
-						.setInterpolator(new DecelerateInterpolator())
-						.setListener(new AnimatorListenerAdapter() {
-
-							boolean canceled = false;
-
-							@Override
-							public void onAnimationCancel(Animator animation) {
-								canceled = true;
-							}
-
-							@Override
-							public void onAnimationEnd(Animator animation) {
-								if (!canceled) {
-									if (needCloseMenu && isHideable()) {
-										dismiss();
-									} else {
-										updateMainViewLayout(posY);
-										if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
-											doAfterMenuStateChange(previousMenuState, newMenuState);
-										}
-									}
-								}
-							}
-						}).start();
+				animateMainView(posY, needCloseMenu, previousMenuState, newMenuState);
 			} else {
 				if (needCloseMenu && isHideable()) {
 					dismiss();
@@ -929,10 +905,37 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment
 		return posY;
 	}
 
-	public void animateView(@NonNull View view, int y) {
+	protected void animateMainView(final int posY, final boolean needCloseMenu, final int previousMenuState, final int newMenuState) {
+		animateView(mainView, posY, new AnimatorListenerAdapter() {
+
+			boolean canceled = false;
+
+			@Override
+			public void onAnimationCancel(Animator animation) {
+				canceled = true;
+			}
+
+			@Override
+			public void onAnimationEnd(Animator animation) {
+				if (!canceled) {
+					if (needCloseMenu && isHideable()) {
+						dismiss();
+					} else {
+						updateMainViewLayout(posY);
+						if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
+							doAfterMenuStateChange(previousMenuState, newMenuState);
+						}
+					}
+				}
+			}
+		});
+	}
+
+	public void animateView(@NonNull View view, int y, @Nullable AnimatorListener listener) {
 		view.animate().y(y)
 				.setDuration(ANIMATION_DURATION)
 				.setInterpolator(new DecelerateInterpolator())
+				.setListener(listener)
 				.start();
 	}
 

OsmAnd/src/net/osmand/plus/base/ContextMenuScrollFragment.java

@@ -133,7 +133,7 @@ public abstract class ContextMenuScrollFragment extends ContextMenuFragment impl
 		if (mapControlsView != null) {
 			int zoomY = y - getMapControlsHeight();
 			if (animated) {
-				fragment.animateView(mapControlsView, zoomY);
+				fragment.animateView(mapControlsView, zoomY, null);
 			} else {
 				mapControlsView.setY(zoomY);
 			}

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

@@ -96,6 +96,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+
 public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInformationListener {
 	private static final org.apache.commons.logging.Log LOG =
 			PlatformUtil.getLog(DashboardOnMap.class);
@@ -777,7 +778,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 					plugin.registerLayers(mapActivity);
 				}
 			}
-			SRTMPlugin.refreshMapComplete(mapActivity);
+			mapActivity.refreshMapComplete();
 		} else if (visibleType == DashboardType.WIKIPEDIA) {
 			refreshContent(true);
 		}

OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java

@@ -261,11 +261,6 @@ public class ConfigureMapMenu {
 		app.getAidlApi().registerLayerContextMenu(adapter, activity);
 	}
 
-	public static void refreshMapComplete(final MapActivity activity) {
-		activity.getMyApplication().getResourceManager().getRenderer().clearCache();
-		activity.updateMapSettings();
-		activity.getMapView().refreshMap(true);
-	}
 
 	private void createRenderingAttributeItems(List<RenderingRuleProperty> customRules,
 											   final ContextMenuAdapter adapter, final MapActivity activity,
@@ -347,7 +342,7 @@ public class ConfigureMapMenu {
 									public void onClick(View v) {
 										int which = (int) v.getTag();
 										view.getSettings().DAYNIGHT_MODE.set(DayNightMode.values()[which]);
-										refreshMapComplete(activity);
+										activity.refreshMapComplete();
 										activity.getDashboard().refreshContent(true);
 										// adapter.getItem(pos).setDescription(s, getDayNightDescr(activity));
 										// ad.notifyDataSetInvalidated();
@@ -466,7 +461,7 @@ public class ConfigureMapMenu {
 									public void onClick(View v) {
 										int which = (int) v.getTag();
 										view.getSettings().TEXT_SCALE.set(txtValues[which]);
-										refreshMapComplete(activity);
+										activity.refreshMapComplete();
 										adapter.getItem(pos).setDescription(getScale(activity));
 										ad.notifyDataSetInvalidated();
 									}
@@ -568,7 +563,7 @@ public class ConfigureMapMenu {
 								int index = dlg.getListView().getCheckedItemPosition();
 								view.getSettings().MAP_PREFERRED_LOCALE.set(
 										txtIds[index]);
-								refreshMapComplete(activity);
+								activity.refreshMapComplete();
 								String localeDescr = txtIds[index];
 								localeDescr = localeDescr == null || localeDescr.isEmpty() ? activity
 										.getString(R.string.local_map_names) : localeDescr;
@@ -712,7 +707,7 @@ public class ConfigureMapMenu {
 						}
 						adapter.getItem(pos).setColorRes(ContextMenuItem.INVALID_ID);
 						a.notifyDataSetInvalidated();
-						refreshMapComplete(activity);
+						activity.refreshMapComplete();
 						activity.getMapLayers().updateLayers(activity.getMapView());
 					} else {
 						if (UI_CATEGORY_DETAILS.equals(category)) {
@@ -883,7 +878,7 @@ public class ConfigureMapMenu {
 					adapter.getItem(pos).setColorRes(selected ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 				}
 				a.notifyDataSetInvalidated();
-				refreshMapComplete(activity);
+				activity.refreshMapComplete();
 				activity.getMapLayers().updateLayers(activity.getMapView());
 			}
 		});
@@ -1041,7 +1036,7 @@ public class ConfigureMapMenu {
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 							pref.set(!pref.get());
-							refreshMapComplete(activity);
+							activity.refreshMapComplete();
 							return false;
 						}
 					})
@@ -1096,7 +1091,7 @@ public class ConfigureMapMenu {
 											} else {
 												pref.set(p.getPossibleValues()[which - 1]);
 											}
-											refreshMapComplete(activity);
+											activity.refreshMapComplete();
 											String description = AndroidUtils.getRenderingStringPropertyValue(activity, pref.get());
 											adapter.getItem(pos).setDescription(description);
 										}

OsmAnd/src/net/osmand/plus/dialogs/DetailsBottomSheet.java

@@ -228,9 +228,9 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 		}
 		Activity activity = getActivity();
 		if (activity instanceof MapActivity) {
-			MapActivity a = (MapActivity) activity;
-			ConfigureMapMenu.refreshMapComplete(a);
-			a.getMapLayers().updateLayers(a.getMapView());
+			MapActivity mapActivity = (MapActivity) activity;
+			mapActivity.refreshMapComplete();
+			mapActivity.getMapLayers().updateLayers(mapActivity.getMapView());
 		}
 		super.onDismiss(dialog);
 	}

OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java

@@ -20,6 +20,7 @@ import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin.OnMapSelectedCallback;
 import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin.RasterMapType;
 
+
 public class RasterMapMenu {
 	private static final String TAG = "RasterMapMenu";
 	public static ContextMenuAdapter createListAdapter(final MapActivity mapActivity,
@@ -105,12 +106,12 @@ public class RasterMapMenu {
 						@Override
 						public void run() {
 							plugin.toggleUnderlayState(mapActivity, type, onMapSelectedCallback);
-							refreshMapComplete(mapActivity);
+							mapActivity.refreshMapComplete();
 						}
 					});
 				} else if (itemId == R.string.show_polygons) {
 					hidePolygonsPref.set(!isChecked);
-					refreshMapComplete(mapActivity);
+					mapActivity.refreshMapComplete();
 				} else if (itemId == R.string.show_transparency_seekbar) {
 					if (isChecked) {
 						settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.set(currentMapTypeSeekbarMode);
@@ -180,10 +181,4 @@ public class RasterMapMenu {
 		LayerTransparencySeekbarMode seekbarMode = app.getSettings().LAYER_TRANSPARENCY_SEEKBAR_MODE.get();
 		return seekbarMode == LayerTransparencySeekbarMode.UNDEFINED || seekbarMode == currentMapTypeSeekbarMode;
 	}
-
-	public static void refreshMapComplete(final MapActivity activity) {
-		activity.getMyApplication().getResourceManager().getRenderer().clearCache();
-		activity.updateMapSettings();
-		activity.getMapView().refreshMap(true);
-	}
 }

OsmAnd/src/net/osmand/plus/dialogs/SelectMapStyleBottomSheetDialogFragment.java

@@ -140,7 +140,7 @@ public class SelectMapStyleBottomSheetDialogFragment extends MenuBottomSheetDial
 			OsmandMapTileView view = mapActivity.getMapView();
 			view.getSettings().RENDERER.set(selectedStyle);
 			app.getRendererRegistry().setCurrentSelectedRender(loaded);
-			ConfigureMapMenu.refreshMapComplete(mapActivity);
+			mapActivity.refreshMapComplete();
 			mapActivity.getDashboard().refreshContent(true);
 		} else {
 			Toast.makeText(mapActivity, R.string.renderer_load_exception, Toast.LENGTH_SHORT).show();

OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java

@@ -593,7 +593,7 @@ public class GpxUiHelper {
 							}
 						}
 						if (activity instanceof MapActivity) {
-							ConfigureMapMenu.refreshMapComplete((MapActivity) activity);
+							((MapActivity) activity).refreshMapComplete();
 						}
 					}
 					GPXFile currentGPX = null;

OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java

@@ -42,6 +42,7 @@ import java.util.regex.Pattern;
 import static net.osmand.plus.activities.TrackActivity.CURRENT_RECORDING;
 import static net.osmand.plus.activities.TrackActivity.TRACK_FILE_NAME;
 import static net.osmand.plus.osmedit.oauth.OsmOAuthHelper.OsmAuthorizationListener;
+import static net.osmand.plus.track.TrackMenuFragment.RETURN_SCREEN_NAME;
 
 public class IntentHelper {
 
@@ -256,8 +257,9 @@ public class IntentHelper {
 			}
 			if (intent.hasExtra(TrackMenuFragment.OPEN_TRACK_MENU)) {
 				String path = intent.getStringExtra(TRACK_FILE_NAME);
+				String name = intent.getStringExtra(RETURN_SCREEN_NAME);
 				boolean currentRecording = intent.getBooleanExtra(CURRENT_RECORDING, false);
-				TrackMenuFragment.showInstance(mapActivity, path, currentRecording, null);
+				TrackMenuFragment.showInstance(mapActivity, path, currentRecording, null, name);
 				mapActivity.setIntent(null);
 			}
 		}

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/SelectedGpxMenuController.java

@@ -47,7 +47,7 @@ public class SelectedGpxMenuController extends MenuController {
 				LatLon latLon = new LatLon(wptPt.lat, wptPt.lon);
 				SelectedGpxFile selectedGpxFile = selectedGpxPoint.getSelectedGpxFile();
 				String path = selectedGpxFile.getGpxFile().path;
-				TrackMenuFragment.showInstance(mapActivity, path, selectedGpxFile.isShowCurrentTrack(), latLon);
+				TrackMenuFragment.showInstance(mapActivity, path, selectedGpxFile.isShowCurrentTrack(), latLon, null);
 			}
 		};
 		leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_open_track);

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java

@@ -50,7 +50,7 @@ public class WptPtMenuController extends MenuController {
 					SelectedGpxFile selectedGpxFile = selectionHelper.getSelectedGPXFile(wpt);
 					if (selectedGpxFile != null) {
 						String path = selectedGpxFile.getGpxFile().path;
-						TrackMenuFragment.showInstance(mapActivity, path, selectedGpxFile.isShowCurrentTrack(), new LatLon(wpt.lon, wpt.lat));
+						TrackMenuFragment.showInstance(mapActivity, path, selectedGpxFile.isShowCurrentTrack(), new LatLon(wpt.lon, wpt.lat), null);
 					}
 				}
 			}

OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java

@@ -36,6 +36,7 @@ import net.osmand.data.LatLon;
 import net.osmand.data.QuadRect;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
@@ -66,6 +67,8 @@ public class TrackDetailsMenu {
 	@Nullable
 	private GpxDisplayItem gpxItem;
 	@Nullable
+	private SelectedGpxFile selectedGpxFile;
+	@Nullable
 	private TrackDetailsBarController toolbarController;
 	@Nullable
 	private TrkSegment segment;
@@ -101,6 +104,15 @@ public class TrackDetailsMenu {
 		this.gpxItem = gpxItem;
 	}
 
+	@Nullable
+	public SelectedGpxFile getSelectedGpxFile() {
+		return selectedGpxFile;
+	}
+
+	public void setSelectedGpxFile(@NonNull SelectedGpxFile selectedGpxFile) {
+		this.selectedGpxFile = selectedGpxFile;
+	}
+
 	public boolean isVisible() {
 		return visible;
 	}
@@ -539,7 +551,7 @@ public class TrackDetailsMenu {
 		}
 	}
 
-	public boolean shouldShowXAxisPoints () {
+	public boolean shouldShowXAxisPoints() {
 		return true;
 	}
 
@@ -707,18 +719,19 @@ public class TrackDetailsMenu {
 		if (gpxItem.chartTypes != null && gpxItem.chartTypes.length > 0) {
 			for (int i = 0; i < gpxItem.chartTypes.length; i++) {
 				OrderedLineDataSet dataSet = null;
+				boolean withoutGaps = selectedGpxFile != null && (!selectedGpxFile.isJoinSegments() && gpxItem.isGeneralTrack());
 				switch (gpxItem.chartTypes[i]) {
 					case ALTITUDE:
 						dataSet = GpxUiHelper.createGPXElevationDataSet(app, chart, analysis,
-								gpxItem.chartAxisType, false, true, false);
+								gpxItem.chartAxisType, false, true, withoutGaps);
 						break;
 					case SPEED:
 						dataSet = GpxUiHelper.createGPXSpeedDataSet(app, chart, analysis,
-								gpxItem.chartAxisType, gpxItem.chartTypes.length > 1, true, false);
+								gpxItem.chartAxisType, gpxItem.chartTypes.length > 1, true, withoutGaps);
 						break;
 					case SLOPE:
 						dataSet = GpxUiHelper.createGPXSlopeDataSet(app, chart, analysis,
-								gpxItem.chartAxisType, null, gpxItem.chartTypes.length > 1, true, false);
+								gpxItem.chartAxisType, null, gpxItem.chartTypes.length > 1, true, withoutGaps);
 						break;
 				}
 				if (dataSet != null) {

OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java

@@ -231,7 +231,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
 							 @Nullable Bundle savedInstanceState) {
-		final MapActivity mapActivity = (MapActivity) getActivity();
+		MapActivity mapActivity = (MapActivity) getActivity();
 		if (mapActivity == null) {
 			return null;
 		}
@@ -375,13 +375,16 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		mainView.findViewById(R.id.options_button).setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				boolean trackSnappedToRoad = !editingCtx.isApproximationNeeded();
-				boolean addNewSegmentAllowed = editingCtx.isAddNewSegmentAllowed();
-				OptionsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
-						MeasurementToolFragment.this,
-						trackSnappedToRoad, addNewSegmentAllowed,
-						editingCtx.getAppMode().getStringKey()
-				);
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null) {
+					boolean trackSnappedToRoad = !editingCtx.isApproximationNeeded();
+					boolean addNewSegmentAllowed = editingCtx.isAddNewSegmentAllowed();
+					OptionsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
+							MeasurementToolFragment.this,
+							trackSnappedToRoad, addNewSegmentAllowed,
+							editingCtx.getAppMode().getStringKey()
+					);
+				}
 			}
 		});
 
@@ -431,7 +434,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 			@Override
 			public void onSelectPoint(int selectedPointPos) {
-				if (selectedPointPos != -1) {
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null && selectedPointPos != -1) {
 					openSelectedPointMenu(mapActivity);
 				}
 			}
@@ -440,7 +444,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		measurementLayer.setOnMeasureDistanceToCenterListener(new MeasurementToolLayer.OnMeasureDistanceToCenter() {
 			@Override
 			public void onMeasure(float distance, float bearing) {
-				String distStr = OsmAndFormatter.getFormattedDistance(distance, mapActivity.getMyApplication());
+				String distStr = OsmAndFormatter.getFormattedDistance(distance, app);
 				String azimuthStr = OsmAndFormatter.getFormattedAzimuth(bearing, app);
 				distanceToCenterTv.setText(String.format("%1$s • %2$s", distStr, azimuthStr));
 				TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
@@ -496,8 +500,13 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			public void onClick(View v) {
 				if (isFollowTrackMode()) {
 					startTrackNavigation();
-				} else {
+				} else if (editingCtx.isNewData() || editingCtx.hasChanges()) {
 					saveChanges(FinalSaveAction.SHOW_SNACK_BAR_AND_CLOSE, false);
+				} else {
+					MapActivity mapActivity = getMapActivity();
+					if (mapActivity != null) {
+						dismiss(mapActivity, false);
+					}
 				}
 			}
 		});
@@ -535,9 +544,12 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		configBtn.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				RouteOptionsBottomSheet.showInstance(
-						mapActivity, MeasurementToolFragment.this, DialogMode.PLAN_ROUTE,
-						editingCtx.getAppMode().getStringKey());
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null) {
+					RouteOptionsBottomSheet.showInstance(
+							mapActivity, MeasurementToolFragment.this, DialogMode.PLAN_ROUTE,
+							editingCtx.getAppMode().getStringKey());
+				}
 			}
 		});
 
@@ -931,7 +943,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 					app.getTargetPointsHelper().updateRouteAndRefresh(true);
 					app.getRoutingHelper().onSettingsChanged(true);
 				} else {
-					mapActivity.getMapActions().stopNavigationActionConfirm(null , new Runnable() {
+					mapActivity.getMapActions().stopNavigationActionConfirm(null, new Runnable() {
 						@Override
 						public void run() {
 							MapActivity mapActivity = getMapActivity();
@@ -1145,7 +1157,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 	@Override
 	public void onChangeApplicationMode(ApplicationMode mode, RouteBetweenPointsDialogType dialogType,
-	                                    RouteBetweenPointsDialogMode dialogMode) {
+										RouteBetweenPointsDialogMode dialogMode) {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			ChangeRouteType changeRouteType = ChangeRouteType.NEXT_SEGMENT;
@@ -1947,7 +1959,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	}
 
 	public static boolean showInstance(FragmentManager fragmentManager, MeasurementEditingContext editingCtx,
-	                                   boolean followTrackMode) {
+									   boolean followTrackMode) {
 		MeasurementToolFragment fragment = new MeasurementToolFragment();
 		fragment.setEditingCtx(editingCtx);
 		fragment.setMode(FOLLOW_TRACK_MODE, followTrackMode);