Merge branch 'master' into favorites_allow_to_edit_address

# Conflicts:
#	OsmAnd/res/layout/point_editor_fragment_new.xml
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java

.github/ISSUE_TEMPLATE/2-faq-report.md

@@ -1,8 +1,8 @@
 ---
 name: "📚 Outdated FAQ"
 about: Report an issue in FAQ
-
 ---
+
 🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
 
 Please do not file FAQ issues on the GitHub issues tracker.

.github/ISSUE_TEMPLATE/3-bug-report.md

@@ -2,6 +2,7 @@
 name: "\U0001F41E Bug report"
 about: Report a bug in OsmAnd
 ---
+
 <!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
 
 Oh hi there! 😄
@@ -28,29 +29,29 @@ Please give us the following information so that we can try to **reproduce** you
 <!-- Did this behavior use to work in the previous version? -->
 <!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
 
-
 ### Description
 
-<!-- ✍️--> A clear and concise description of the problem...
-
+<!-- A clear and concise description of the problem... -->
 
 ## 🔬 Minimal Reproduction
+
 <!--
 If the bug is reproducible, please describe steps below:
 -->
 <!-- ✍️--> 1. Open app, and click on ...
 
 ## 🔥 Exception or Error
+
 <pre><code>
 <!-- If the issue is accompanied by an exception or an error, please share it below: -->
 <!-- ✍️-->
 
 </code></pre>
 
-
-## 🌍  Your Environment
+## 🌍 Your Environment
 
 **OsmAnd Version:**
+
 <pre><code>
 <!-- paste version below -->
 <!-- ✍️-->
@@ -60,10 +61,11 @@ If the bug is reproducible, please describe steps below:
 **Device and Android/iOS version:**
 
 **Maps used (online or offline):**
+
 <!-- Please tick the correct box [x] (or both) -->
-- [ ] Offline maps offered within the OsmAnd app for download. 
-  <!-- If you have an issue related to offline maps, tell us the exact name of the map file where the issue occurs and its edition date. -->
+
+- [ ] Offline maps offered within the OsmAnd app for download.
+<!-- If you have an issue related to offline maps, tell us the exact name of the map file where the issue occurs and its edition date. -->
 - [ ] Online (tile / raster) maps <!-- Please name it -->
 
-
 **Anything else relevant?**

.github/ISSUE_TEMPLATE/4-routing-report.md

@@ -2,6 +2,7 @@
 name: "\U0001F6A9 Routing report"
 about: Report a routing issue in OsmAnd
 ---
+
 <!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
 
 Oh hi there! 😄
@@ -26,10 +27,12 @@ Please give us the following information so that we can try to **reproduce** you
 ### Routing engine
 
 <!-- Which routing provider was used? (please tick the proper box [x]) -->
+
 - [ ] OsmAnd's in-app offline routing
 - [ ] Any online routing provider (YOURS, OpenRouteService, OSRM, etc.)
 
 ### Routing Profile
+
 <!-- What routing profile is chosen in the OsmAnd app? (car, bike, pedestrian, fastest or shortest, etc.) -->
 
 ### Start and end points
@@ -38,6 +41,7 @@ Please give us the following information so that we can try to **reproduce** you
 Also, a permalink from [openstreetmap.org](https://www.openstreetmap.org/) can be helpful. -->
 
 ### Actual and expected routes
+
 <!-- Tell us your expected routing and how OsmAnd routes, or add screenshots here. -->
 
 ### Is this a regression?
@@ -45,9 +49,10 @@ Also, a permalink from [openstreetmap.org](https://www.openstreetmap.org/) can b
 <!-- Did this behavior use to work in the previous version? -->
 <!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
 
-## 🌍  Your Environment
+## 🌍 Your Environment
 
 **OsmAnd Version:**
+
 <pre><code>
 <!-- paste version below -->
 <!-- ✍️-->
@@ -57,10 +62,11 @@ Also, a permalink from [openstreetmap.org](https://www.openstreetmap.org/) can b
 **Device and Android/iOS version:**
 
 **Maps used (online or offline):**
+
 <!-- Please tick the correct box [x] (or both) -->
-- [ ] Offline maps offered within the OsmAnd app for download. 
-  <!-- If you have an issue related to offline maps, tell us the exact name of the map file where the issue occurs and its edition date. -->
+
+- [ ] Offline maps offered within the OsmAnd app for download.
+<!-- If you have an issue related to offline maps, tell us the exact name of the map file where the issue occurs and its edition date. -->
 - [ ] Online (tile / raster) maps <!-- Please name it -->
 
-
 **Anything else relevant?**

.github/ISSUE_TEMPLATE/5-feature-request.md

@@ -1,11 +1,11 @@
 ---
 name: "\U0001F680 Feature request"
 about: Suggest a feature for OsmAnd
-
 ---
+
 <!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
 
-Oh hi there! 😄 
+Oh hi there! 😄
 
 To expedite issue processing please search open and closed issues before submitting a new one.
 Existing issues often contain information about workarounds, resolution, or progress updates.
@@ -22,12 +22,13 @@ Please be sure to read our [FAQ](https://osmand.net/help-online) before creating
 # 🚀 feature request
 
 ### Description
-<!-- ✍️--> A clear and concise description of the problem or missing capability...
 
+<!-- ✍️ A clear and concise description of the feature... -->
 
 ### Describe the solution you'd like
+
 <!-- ✍️--> If you have a solution in mind, please describe it.
 
-
 ### Describe alternatives you've considered
+
 <!-- ✍️--> Have you considered any alternative solutions or workarounds?

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

@@ -45,6 +45,9 @@ public class IndexConstants {
 
 	public static final String GPX_FILE_EXT = ".gpx"; //$NON-NLS-1$
 
+	public static final String WPT_CHART_FILE_EXT = ".wpt.chart";
+	public static final String SQLITE_CHART_FILE_EXT = ".3d.chart";
+
 	public final static String POI_TABLE = "poi"; //$NON-NLS-1$
 	
 	public static final String INDEX_DOWNLOAD_DOMAIN = "download.osmand.net";

OsmAnd-java/src/main/java/net/osmand/osm/io/Base64.java

@@ -1,93 +1,104 @@
 package net.osmand.osm.io;
 
+
 /**
  * @source http://www.javaworld.com/javaworld/javatips/jw-javatip47.html -- 24.11.2008, (mb)
  */
 public class Base64 {
-        /*******************************************************************************************************************
-         * BASE 64 encoding of a String or an array of bytes. See also RFC 1421.
-         *
-         * @author Unknown
-         * @author David W. Croft
-         * @version 1998-06-08
-         ******************************************************************************************************************/
+	/*******************************************************************************************************************
+	 * BASE 64 encoding of a String or an array of bytes. See also RFC 1421.
+	 *
+	 * @author Unknown
+	 * @author David W. Croft
+	 * @version 1998-06-08
+	 ******************************************************************************************************************/
 
-        //////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////
-        public static final char[] alphabet = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', //  0 to  7
-                        'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', //  8 to 15
-                        'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 16 to 23
-                        'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', // 24 to 31
-                        'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', // 32 to 39
-                        'o', 'p', 'q', 'r', 's', 't', 'u', 'v', // 40 to 47
-                        'w', 'x', 'y', 'z', '0', '1', '2', '3', // 48 to 55
-                        '4', '5', '6', '7', '8', '9', '+', '/' }; // 56 to 63
+	//////////////////////////////////////////////////////////////////////
+	//////////////////////////////////////////////////////////////////////
+	public static final char[] alphabet = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 0 to 7
+			'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 8 to 15
+			'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 16 to 23
+			'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', // 24 to 31
+			'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', // 32 to 39
+			'o', 'p', 'q', 'r', 's', 't', 'u', 'v', // 40 to 47
+			'w', 'x', 'y', 'z', '0', '1', '2', '3', // 48 to 55
+			'4', '5', '6', '7', '8', '9', '+', '/' }; // 56 to 63
 
-        //////////////////////////////////////////////////////////////////////
-        //////////////////////////////////////////////////////////////////////
+	//////////////////////////////////////////////////////////////////////
+	//////////////////////////////////////////////////////////////////////
 
-        public static String encode(final String s)
-        //////////////////////////////////////////////////////////////////////
-        {
-                return encode(s.getBytes());
-        }
+	public static int indexOf(char c) {
+		for (int i = 0; i < alphabet.length; i++) {
+			if (alphabet[i] == c) {
+				return i;
+			}
+		}
+		return -1;
+	}
 
-        public static String encode(final byte[] octetString)
-        //////////////////////////////////////////////////////////////////////
-        {
-                int bits24;
-                int bits6;
 
-                final char[] out = new char[((octetString.length - 1) / 3 + 1) * 4];
+	public static String encode(final String s)
+	//////////////////////////////////////////////////////////////////////
+	{
+		return encode(s.getBytes());
+	}
 
-                int outIndex = 0;
-                int i = 0;
+	public static String encode(final byte[] octetString)
+	//////////////////////////////////////////////////////////////////////
+	{
+		int bits24;
+		int bits6;
 
-                while ((i + 3) <= octetString.length) {
-                        // store the octets
-                        bits24 = (octetString[i++] & 0xFF) << 16;
-                        bits24 |= (octetString[i++] & 0xFF) << 8;
-                        bits24 |= (octetString[i++] & 0xFF);
+		final char[] out = new char[((octetString.length - 1) / 3 + 1) * 4];
 
-                        bits6 = (bits24 & 0x00FC0000) >> 18;
-                        out[outIndex++] = alphabet[bits6];
-                        bits6 = (bits24 & 0x0003F000) >> 12;
-                        out[outIndex++] = alphabet[bits6];
-                        bits6 = (bits24 & 0x00000FC0) >> 6;
-                        out[outIndex++] = alphabet[bits6];
-                        bits6 = (bits24 & 0x0000003F);
-                        out[outIndex++] = alphabet[bits6];
-                }
+		int outIndex = 0;
+		int i = 0;
 
-                if (octetString.length - i == 2) {
-                        // store the octets
-                        bits24 = (octetString[i] & 0xFF) << 16;
-                        bits24 |= (octetString[i + 1] & 0xFF) << 8;
+		while ((i + 3) <= octetString.length) {
+			// store the octets
+			bits24 = (octetString[i++] & 0xFF) << 16;
+			bits24 |= (octetString[i++] & 0xFF) << 8;
+			bits24 |= (octetString[i++] & 0xFF);
 
-                        bits6 = (bits24 & 0x00FC0000) >> 18;
-                        out[outIndex++] = alphabet[bits6];
-                        bits6 = (bits24 & 0x0003F000) >> 12;
-                        out[outIndex++] = alphabet[bits6];
-                        bits6 = (bits24 & 0x00000FC0) >> 6;
-                        out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x00FC0000) >> 18;
+			out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x0003F000) >> 12;
+			out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x00000FC0) >> 6;
+			out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x0000003F);
+			out[outIndex++] = alphabet[bits6];
+		}
 
-                        // padding
-                        out[outIndex++] = '=';
-                } else if (octetString.length - i == 1) {
-                        // store the octets
-                        bits24 = (octetString[i] & 0xFF) << 16;
+		if (octetString.length - i == 2) {
+			// store the octets
+			bits24 = (octetString[i] & 0xFF) << 16;
+			bits24 |= (octetString[i + 1] & 0xFF) << 8;
 
-                        bits6 = (bits24 & 0x00FC0000) >> 18;
-                        out[outIndex++] = alphabet[bits6];
-                        bits6 = (bits24 & 0x0003F000) >> 12;
-                        out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x00FC0000) >> 18;
+			out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x0003F000) >> 12;
+			out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x00000FC0) >> 6;
+			out[outIndex++] = alphabet[bits6];
 
-                        // padding
-                        out[outIndex++] = '=';
-                        out[outIndex++] = '=';
-                }
+			// padding
+			out[outIndex++] = '=';
+		} else if (octetString.length - i == 1) {
+			// store the octets
+			bits24 = (octetString[i] & 0xFF) << 16;
 
-                return new String(out);
-        }
+			bits6 = (bits24 & 0x00FC0000) >> 18;
+			out[outIndex++] = alphabet[bits6];
+			bits6 = (bits24 & 0x0003F000) >> 12;
+			out[outIndex++] = alphabet[bits6];
+
+			// padding
+			out[outIndex++] = '=';
+			out[outIndex++] = '=';
+		}
+
+		return new String(out);
+	}
 
 }

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

@@ -49,14 +49,16 @@ public class RouteCalculationProgress {
 			pr = Math.min(p * p / (all * all), 1);
 		}
 		float progress = INITIAL_PROGRESS;
-		if (totalIterations > 1) {
+		if (totalIterations <= 1) {
+			progress = INITIAL_PROGRESS + pr * (1 - INITIAL_PROGRESS);
+		} else if (totalIterations <= 2) {
 			if (iteration < 1) {
 				progress = pr * FIRST_ITERATION + INITIAL_PROGRESS;
 			} else {
 				progress = (INITIAL_PROGRESS + FIRST_ITERATION) + pr * (1 - FIRST_ITERATION - INITIAL_PROGRESS);
 			}
 		} else {
-			progress = INITIAL_PROGRESS + pr * (1 - INITIAL_PROGRESS);
+			progress = (float) ((iteration + Math.min(pr, 0.7)) / totalIterations);
 		}
 		return Math.min(progress * 100f, 99);
 	}

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

@@ -64,8 +64,6 @@ public class RoutePlannerFrontEnd {
 		public int routeGapDistance;
 		public int routeDistanceUnmatched;
 
-		public boolean calculationCancelled;
-		private boolean calculationDone;
 
 		public GpxRouteApproximation(RoutingContext ctx) {
 			this.ctx = ctx;
@@ -82,10 +80,6 @@ public class RoutePlannerFrontEnd {
 					routeCalculations, routeDistCalculations, routePointsSearched, routeDistance, routeDistanceUnmatched);
 		}
 
-		public boolean isCalculationDone() {
-			return calculationDone;
-		}
-
 		public double distFromLastPoint(LatLon startPoint) {
 			if (result.size() > 0) {
 				return MapUtils.getDistance(getLastPoint(), startPoint);
@@ -239,18 +233,22 @@ public class RoutePlannerFrontEnd {
 	public GpxRouteApproximation searchGpxRoute(GpxRouteApproximation gctx, List<GpxPoint> gpxPoints, ResultMatcher<GpxRouteApproximation> resultMatcher) throws IOException, InterruptedException {
 		long timeToCalculate = System.nanoTime();
 		gctx.ctx.keepNativeRoutingContext = true;
+		if (gctx.ctx.calculationProgress == null) {
+			gctx.ctx.calculationProgress = new RouteCalculationProgress();
+		}
 		GpxPoint start = null;
 		GpxPoint prev = null;
 		if (gpxPoints.size() > 0) {
 			gctx.ctx.calculationProgress.totalIterations = (int) (gpxPoints.get(gpxPoints.size() - 1).cumDist / gctx.MAXIMUM_STEP_APPROXIMATION + 1); 
 			start = gpxPoints.get(0); 
 		}
-		while (start != null && !gctx.calculationCancelled) {
+		while (start != null && !gctx.ctx.calculationProgress.isCancelled) {
 			double routeDist = gctx.MAXIMUM_STEP_APPROXIMATION;
 			GpxPoint next = findNextGpxPointWithin(gctx, gpxPoints, start, routeDist);
 			boolean routeFound = false;
-			gctx.ctx.calculationProgress.nextIteration();
 			if (next != null && initRoutingPoint(start, gctx, gctx.MINIMUM_POINT_APPROXIMATION)) {
+				gctx.ctx.calculationProgress.totalEstimatedDistance = 0;
+				gctx.ctx.calculationProgress.iteration = (int) (next.cumDist / gctx.MAXIMUM_STEP_APPROXIMATION);
 				while (routeDist >= gctx.MINIMUM_STEP_APPROXIMATION && !routeFound) {
 					routeFound = initRoutingPoint(next, gctx, gctx.MINIMUM_POINT_APPROXIMATION);
 					if (routeFound) {
@@ -299,20 +297,19 @@ public class RoutePlannerFrontEnd {
 			}
 			start = next;
 		}
-		if(gctx.ctx.calculationProgress != null) {
-			 gctx.ctx.calculationProgress.timeToCalculate = System.nanoTime() - timeToCalculate;
+		if (gctx.ctx.calculationProgress != null) {
+			gctx.ctx.calculationProgress.timeToCalculate = System.nanoTime() - timeToCalculate;
 		}
 		gctx.ctx.deleteNativeRoutingContext();
 		BinaryRoutePlanner.printDebugMemoryInformation(gctx.ctx);
 		calculateGpxRoute(gctx, gpxPoints);
-		if (!gctx.result.isEmpty() && !gctx.calculationCancelled) {
+		if (!gctx.result.isEmpty() && !gctx.ctx.calculationProgress.isCancelled) {
 			new RouteResultPreparation().printResults(gctx.ctx, gpxPoints.get(0).loc, gpxPoints.get(gpxPoints.size() - 1).loc, gctx.result);
 			System.out.println(gctx);
 		}
 		if (resultMatcher != null) {
-			resultMatcher.publish(gctx.calculationCancelled ? null : gctx);
+			resultMatcher.publish(gctx.ctx.calculationProgress.isCancelled ? null : gctx);
 		}
-		gctx.calculationDone = true;
 		return gctx;
 	}
 
@@ -365,7 +362,7 @@ public class RoutePlannerFrontEnd {
 		reg.initRouteEncodingRule(0, "highway", RouteResultPreparation.UNMATCHED_HIGHWAY_TYPE);
 		List<LatLon> lastStraightLine = null;
 		GpxPoint straightPointStart = null;
-		for (int i = 0; i < gpxPoints.size() && !gctx.calculationCancelled; ) {
+		for (int i = 0; i < gpxPoints.size() && !gctx.ctx.calculationProgress.isCancelled; ) {
 			GpxPoint pnt = gpxPoints.get(i);
 			if (pnt.routeToTarget != null && !pnt.routeToTarget.isEmpty()) {
 				LatLon startPoint = pnt.routeToTarget.get(0).getStartPoint();
@@ -459,7 +456,7 @@ public class RoutePlannerFrontEnd {
 	private void cleanupResultAndAddTurns(GpxRouteApproximation gctx) {
 		// cleanup double joints
 		int LOOK_AHEAD = 4;
-		for(int i = 0; i < gctx.result.size() && !gctx.calculationCancelled; i++) {
+		for(int i = 0; i < gctx.result.size() && !gctx.ctx.calculationProgress.isCancelled; i++) {
 			RouteSegmentResult s = gctx.result.get(i);
 			for(int j = i + 2; j <= i + LOOK_AHEAD && j < gctx.result.size(); j++) {
 				RouteSegmentResult e = gctx.result.get(j);
@@ -476,7 +473,7 @@ public class RoutePlannerFrontEnd {
 			r.setTurnType(null);
 			r.setDescription("");
 		}
-		if (!gctx.calculationCancelled) {
+		if (!gctx.ctx.calculationProgress.isCancelled) {
 			preparation.prepareTurnResults(gctx.ctx, gctx.result);
 		}
 	}

OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java

@@ -33,6 +33,7 @@ import net.osmand.util.LocationParser.ParsedOpenLocationCode;
 import net.osmand.util.MapUtils;
 
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1407,6 +1408,7 @@ public class SearchCoreFactory {
 		private LatLon olcPhraseLocation;
 		private ParsedOpenLocationCode cachedParsedCode;
 		private final List<String> citySubTypes = Arrays.asList("city", "town", "village");
+		private final DecimalFormat latLonFormatter = new DecimalFormat("#.0####");
 
 		public SearchLocationAndUrlAPI() {
 			super(ObjectType.LOCATION, ObjectType.PARTIAL_LOCATION);
@@ -1498,7 +1500,7 @@ public class SearchCoreFactory {
 						sp.priority = SEARCH_LOCATION_PRIORITY;
 
 						sp.object = sp.location = ll;
-						sp.localeName = ((float) sp.location.getLatitude()) + ", <input> ";
+						sp.localeName = formatLatLon(sp.location.getLatitude()) + ", <input> ";
 						sp.objectType = ObjectType.PARTIAL_LOCATION;
 						resultMatcher.publish(sp);
 					}
@@ -1510,7 +1512,7 @@ public class SearchCoreFactory {
 			SearchResult sp = new SearchResult(phrase);
 			sp.priority = SEARCH_LOCATION_PRIORITY;
 			sp.object = sp.location = l;
-			sp.localeName = ((float) sp.location.getLatitude()) + ", " + ((float) sp.location.getLongitude());
+			sp.localeName = formatLatLon(sp.location.getLatitude()) + ", " + formatLatLon(sp.location.getLongitude());
 			sp.objectType = ObjectType.LOCATION;
 			sp.wordsSpan = lw;
 			resultMatcher.publish(sp);
@@ -1525,7 +1527,7 @@ public class SearchCoreFactory {
 				sp.object = pnt;
 				sp.wordsSpan = text;
 				sp.location = new LatLon(pnt.getLatitude(), pnt.getLongitude());
-				sp.localeName = ((float)pnt.getLatitude()) +", " + ((float) pnt.getLongitude());
+				sp.localeName = formatLatLon(pnt.getLatitude()) +", " + formatLatLon(pnt.getLongitude());
 				if (pnt.getZoom() > 0) {
 					sp.preferredZoom = pnt.getZoom();
 				}
@@ -1555,6 +1557,10 @@ public class SearchCoreFactory {
 			}
 			return cachedParsedCode == null ? SEARCH_LOCATION_PRIORITY : SEARCH_MAX_PRIORITY;
 		}
+
+		private String formatLatLon(double latLon) {
+			return latLonFormatter.format(latLon);
+		}
 	}
 
 	private static String stripBraces(String localeName) {

OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java

@@ -119,7 +119,7 @@ public class Algorithms {
 	}
 
 	public static String getFileNameWithoutExtension(String name) {
-		int i = name.indexOf('.');
+		int i = name.lastIndexOf('.');
 		if (i >= 0) {
 			name = name.substring(0, i);
 		}

OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java

@@ -3,6 +3,8 @@ package net.osmand.util;
 import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.Base64;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Locale;
@@ -11,6 +13,9 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import net.osmand.data.LatLon;
+import net.osmand.util.GeoPointParserUtil.GeoParsedPoint;
+
 public class GeoPointParserUtil {
 
 
@@ -69,6 +74,31 @@ public class GeoPointParserUtil {
 		}
 		return map;
 	}
+	
+	private static int kMaxPointBytes = 10;
+	private static int kMaxCoordBits = kMaxPointBytes * 3;
+	public static LatLon decodeMapsMeLatLonToInt(String s) {
+		// 44TvlEGXf-
+		int lat = 0, lon = 0;
+		int shift = kMaxCoordBits - 3;
+		for (int i = 0; i < s.length(); ++i, shift -= 3) {
+			int a = net.osmand.osm.io.Base64.indexOf(s.charAt(i));
+			if (a < 0)
+				return null;
+
+			int lat1 = (((a >> 5) & 1) << 2 | ((a >> 3) & 1) << 1 | ((a >> 1) & 1));
+			int lon1 = (((a >> 4) & 1) << 2 | ((a >> 2) & 1) << 1 | (a & 1));
+			lat |= lat1 << shift;
+			lon |= lon1 << shift;
+		}
+		double middleOfSquare = 1 << (3 * (kMaxPointBytes - s.length()) - 1);
+		lat += middleOfSquare;
+		lon += middleOfSquare;
+
+		double dlat = ((double) lat) / ((1 << kMaxCoordBits) - 1) * 180 - 90;
+		double dlon = ((double) lon) / ((1 << kMaxCoordBits) - 1 + 1) * 360.0 - 180;
+		return new LatLon(dlat, dlon);
+	}
 
 	/**
 	 * Parses geo and map intents:
@@ -190,6 +220,31 @@ public class GeoPointParserUtil {
 						int zoom = parseZoom(zm);
 						return new GeoParsedPoint(lat, lon, zoom);
 					}
+				} else if (host.equals("ge0.me")) {
+					// http:///44TvlEGXf-/Kyiv
+					if (path.startsWith("/")) {
+						path = path.substring(1);
+					}
+					String[] pms = path.split("/");
+					String label = "";
+					if (pms.length > 1) {
+						label = pms[1];
+					}
+					String qry = pms[0];
+					if (qry.length() < 10) {
+						return null;
+					}
+					int indZoom = net.osmand.osm.io.Base64.indexOf(qry.charAt(0));
+					int zoom = 15;
+					if (indZoom >= 0) {
+						zoom = indZoom / 4 + 4;
+					}
+					LatLon l = decodeMapsMeLatLonToInt(qry.substring(1).replace('-', '/'));
+					if (l == null) {
+						return null;
+					}
+					return new GeoParsedPoint(l.getLatitude(), l.getLongitude(), zoom, label);
+
 				} else if (simpleDomains.contains(host)) {
 					if (uri.getQuery() == null && params.size() == 0) {
 						// DOUBLE check this may be wrong test of openstreetmap.de (looks very weird url and server doesn't respond)
@@ -221,7 +276,6 @@ public class GeoPointParserUtil {
 					String z = String.valueOf(GeoParsedPoint.NO_ZOOM);
 
 					if (params.containsKey("q")) {
-						System.out.println("q=" + params.get("q"));
 						Matcher matcher = commaSeparatedPairPattern.matcher(params.get("q"));
 						if (matcher.matches()) {
 							latString = matcher.group(1);

OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java

@@ -43,6 +43,13 @@ public class GeoPointParserUtilTest {
 				"https://www.google.co.in/maps/place/data=!3m2!1e3!4b1!4m6!3m5!1s0x0:0x0!7e2!8m2!3d10.1213237!4d76.348392?shorturl=1");
 		assertGeoPoint(actual, new GeoParsedPoint(10.1213237, 76.348392));
 	}
+	
+	@Test
+	public void testMapsMeParser() {
+		GeoParsedPoint actual = GeoPointParserUtil.parse(
+				"http://ge0.me/44TvlEGXf-/Kyiv");
+		assertGeoPoint(actual, new GeoParsedPoint(50.45003, 30.52414, 18, "Kyiv"));
+	}
 
 	@Test
 	public void testGeoPoint() {
@@ -449,21 +456,21 @@ public class GeoPointParserUtilTest {
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint("paris"));
 
-		// TODO this URL does not work, where is it used?
+		// LEGACY this URL does not work, where is it used?
 		// http://maps.google.com/maps/q=loc:34,-106&z=11
 		url = "http://maps.google.com/maps/q=loc:" + ilat + "," + ilon + "&z=" + z;
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
 
-		// TODO this URL does not work, where is it used?
+		// LEGACY this URL does not work, where is it used?
 		// http://maps.google.com/maps/q=loc:34.99393,-106.61568&z=11
 		url = "http://maps.google.com/maps/q=loc:" + dlat + "," + dlon + "&z=" + z;
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
 
-		// TODO this URL does not work, where is it used?
+		// LEGACY  this URL does not work, where is it used?
 		// whatsapp
 		// http://maps.google.com/maps/q=loc:34,-106 (You)
 		z = GeoParsedPoint.NO_ZOOM;
@@ -472,7 +479,7 @@ public class GeoPointParserUtilTest {
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
 
-		// TODO this URL does not work, where is it used?
+		// LEGACY this URL does not work, where is it used?
 		// whatsapp
 		// http://maps.google.com/maps/q=loc:34.99393,-106.61568 (You)
 		z = GeoParsedPoint.NO_ZOOM;

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

@@ -210,7 +210,7 @@
     <string name="osmand_service_descr">OsmAnd aztarnaria atzeko planoan exekutatzen da pantaila itzalita dagoenean.</string>
     <string name="location_service_no_gps_available">Hautatu kokapen-hornitzaileetako bat zure kokapena partekatzeko.</string>
     <string name="no_location_permission">Aplikazioak ez du kokapena atzitzeko baimenik.</string>
-    <string name="authentication_code_descr">"Telegramek kode bat bidali dizu OsmAnd-ek  zure kontuan saioa hasteko."</string>
+    <string name="authentication_code_descr">Telegramek kode bat bidali dizu OsmAnd-ek zure kontuan saioa hasteko.</string>
     <string name="my_location_search_hint">Bilaketa: Taldea edo kontaktua</string>
     <string name="location_sharing_description">Hautatu kokapena partekatzeko kontaktuak eta taldeak.</string>
     <string name="set_time">Ezarri denbora</string>
@@ -232,14 +232,14 @@
     <string name="send_my_location_desc">Ezarri kokapena partekatzeko gutxieneko tartea.</string>
     <string name="stale_location">Ez da mugitzen</string>
     <string name="stale_location_desc">Kontaktu bat mugitu zen azken aldia.</string>
-    <string name="location_history_desc">Ezkutatu denbora jakin batean mugitu ez diren kontaktuak</string>
+    <string name="location_history_desc">Ezkutatu denbora jakin batean mugitu ez diren kontaktuak.</string>
     <string name="osmand_connect">OsmAnd konexioa</string>
     <string name="osmand_connect_desc">Aukeratu OsmAnd aztarnariak posizioak bistaratzeko erabiliko duen OsmAnd bertsioa.</string>
     <string name="in_time">%1$s-n</string>
     <string name="logout_help_desc">Nola itzali OsmAnd aztarnaria Telegram-etik</string>
     <string name="disconnect_from_telegram">Nola itzali OsmAnd aztarnaria Telegram-etik</string>
     <string name="disconnect_from_telegram_desc">Kokapena partekatzeko sarbidea baliogabetzeko. Ireki Telegram, joan Ezarpenak → Pribatutasuna eta segurtasuna → Saioak eta amaitu OsmAnd aztarnariaren saioa atalera.</string>
-    <string name="logout_no_internet_msg">"Konektatu Internetera Telegram saioa behar bezala  amaiatzeko."</string>
+    <string name="logout_no_internet_msg">Konektatu Internetera Telegram saioa behar bezala amaiatzeko.</string>
     <string name="last_response">Azken erantzuna</string>
     <string name="disable_all_sharing_desc">Kokapena partekatzea itzaltzen du hautatutako txat guztietan (%1$d).</string>
     <string name="choose_osmand_desc">Hautatu kontaktuak mapan bistaratzeko OsmAnd bertsioa.</string>

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

@@ -73,4 +73,9 @@
     <string name="unit_of_length_descr">یکاهای طول را تغییر دهید.</string>
     <string name="unit_of_length">یکاهای طول</string>
     <string name="shared_string_appearance">ظاهر</string>
+    <string name="last_response_duration">آخرین پاسخ:٪ 1 $ s پیش</string>
+    <string name="last_update_from_telegram_duration">آخرین به روزرسانی از تلگرام:٪ 1 $ s پیش</string>
+    <string name="last_response_date">آخرین پاسخ: %1$s</string>
+    <string name="last_update_from_telegram_date">آخرین به روز رسانی در تلگرام:%1$s</string>
+    <string name="shared_string_error_short">اشتباه بودن</string>
 </resources>

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

@@ -163,7 +163,7 @@
     <string name="get_telegram_description_continue">Por favor, instale o Telegram e configure uma conta.</string>
     <string name="get_telegram_after_creating_account">Então pode usar esta app.</string>
     <string name="shared_string_all">Todos</string>
-    <string name="shared_string_off">Desativado</string>
+    <string name="shared_string_off">Desligado</string>
     <string name="already_registered_in_telegram">Precisa de uma conta e número de telefone registados no Telegram</string>
     <string name="do_not_have_telegram">Não tenho uma conta do Telegram</string>
     <string name="enter_phone_number">Digite o número de telefone</string>
@@ -204,7 +204,7 @@
     <string name="no_location_permission">A app não tem permissão para acessar os dados de localização.</string>
     <string name="gps_not_available">Por favor, ligue \"Localização\" nas configurações do sistema</string>
     <string name="location_service_no_gps_available">Selecione um dos provedores de localização para compartilhar sua localização.</string>
-    <string name="osmand_service">Modo em segundo plano</string>
+    <string name="osmand_service">Modo de fundo</string>
     <string name="osmand_service_descr">OsmAnd Tracker é executado em segundo plano com o ecrã desligado.</string>
     <string name="shared_string_distance">Distância</string>
     <string name="share_location">Compartilhar localização</string>
@@ -230,15 +230,15 @@
     <string name="m_s">m/s</string>
     <string name="km_h">km/h</string>
     <string name="mile_per_hour">mph</string>
-    <string name="si_kmh">Quilômetros por hora</string>
+    <string name="si_kmh">Quilómetros por hora</string>
     <string name="si_mph">Milhas por hora</string>
     <string name="si_m_s">Metros por segundo</string>
-    <string name="si_min_km">Minutos por quilômetro</string>
+    <string name="si_min_km">Minutos por quilómetro</string>
     <string name="si_min_m">Minutos por milha</string>
     <string name="si_nm_h">Milhas náuticas por hora (nó)</string>
     <string name="si_mi_feet">Milhas/pés</string>
     <string name="si_mi_yard">Milhas/jardas</string>
-    <string name="si_km_m">Quilômetros/metros</string>
+    <string name="si_km_m">Quilómetros/metros</string>
     <string name="si_nm">Milhas náuticas</string>
     <string name="si_mi_meters">Milhas/metros</string>
     <string name="shared_string_hour_short">h</string>
@@ -252,7 +252,7 @@
     <string name="time_zone_descr">Selecione o fuso horário a mostrar nas suas mensagens de localização.</string>
     <string name="time_zone">Fuso horário</string>
     <string name="units_and_formats">Unidades e formatos</string>
-    <string name="unit_of_length_descr">Alterar unidade de distância.</string>
+    <string name="unit_of_length_descr">Alterar a unidade de medida de distância.</string>
     <string name="unit_of_length">Unidades de comprimento</string>
     <string name="unit_of_speed_system_descr">Definir unidade de velocidade.</string>
     <string name="unit_of_speed_system">Unidade de velocidade</string>

OsmAnd/AndroidManifest.xml

@@ -371,6 +371,72 @@
 				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.xml" />
 			</intent-filter>
 
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:scheme="content"/>
+				<data android:host="*"/>
+				<data android:pathPattern=".*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.wpt.chart" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:scheme="content"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern=".*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.wpt.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.wpt.chart" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:scheme="content"/>
+				<data android:host="*"/>
+				<data android:pathPattern=".*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.3d.chart" />
+			</intent-filter>
+
+			<intent-filter
+				android:label="@string/app_name"
+				android:priority="50">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="file"/>
+				<data android:scheme="content"/>
+				<data android:host="*"/>
+				<data android:mimeType="*/*"/>
+				<data android:pathPattern=".*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\.3d.chart" />
+				<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.3d.chart" />
+			</intent-filter>
+
 			<!--trying to handle emails-->
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
@@ -488,6 +554,13 @@
 				<category android:name="android.intent.category.DEFAULT" />
 				<category android:name="android.intent.category.BROWSABLE" />
 			</intent-filter>
+			<intent-filter>
+				<data android:host="ge0.me" android:scheme="https"/>
+				<data android:host="ge0.me" android:scheme="http"/>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+			</intent-filter>
 			<intent-filter>
 				<data android:scheme="http" android:host="openstreetmap.de" android:pathPrefix="/karte" />
 				<data android:scheme="https" android:host="openstreetmap.de" android:pathPrefix="/karte" />

OsmAnd/res/drawable/bottom_sheet_buttons_bg_dark.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<nine-patch android:src="@drawable/bg_shadow_bottomsheet_sides"/>
+	</item>
+	<item>
+		<shape>
+			<solid android:color="@color/list_background_color_dark"/>
+		</shape>
+	</item>
+</layer-list>

OsmAnd/res/drawable/bottom_sheet_buttons_bg_light.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<nine-patch android:src="@drawable/bg_shadow_bottomsheet_sides"/>
+	</item>
+	<item>
+		<shape>
+			<solid android:color="@color/list_background_color_light"/>
+		</shape>
+	</item>
+</layer-list>

OsmAnd/res/layout/bottom_sheet_behaviour_base.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<androidx.coordinatorlayout.widget.CoordinatorLayout
+		android:id="@+id/scroll_view_container"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<androidx.core.widget.NestedScrollView
+			android:id="@+id/bottom_sheet_scroll_view"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			app:behavior_hideable="false"
+			app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+			<LinearLayout
+				android:id="@+id/items_container"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				android:paddingBottom="@dimen/bottom_sheet_content_padding_small" />
+
+		</androidx.core.widget.NestedScrollView>
+
+	</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+	<LinearLayout
+		android:id="@+id/bottom_buttons_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/buttons_shadow"
+			android:layout_width="match_parent"
+			android:layout_height="10dp"
+			android:layout_gravity="bottom"
+			android:background="@drawable/bg_contextmenu_shadow_top_light"
+			android:visibility="gone" />
+
+		<include layout="@layout/bottom_buttons" />
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml

@@ -1,66 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<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:orientation="vertical">
 
-	<LinearLayout
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
+		android:text="@string/plan_route_open_existing_track"
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		osmand:typeface="@string/font_roboto_medium" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/description"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/content_padding"
+		android:text="@string/plan_route_select_track_file_for_open"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_regular" />
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/folder_list"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:clipToPadding="false"
+		android:orientation="horizontal"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		tools:itemCount="3"
+		tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		tools:listitem="@layout/point_editor_icon_category_item"
+		tools:orientation="horizontal" />
 
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/title"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingStart="@dimen/content_padding"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
-			android:paddingEnd="@dimen/content_padding"
-			android:paddingRight="@dimen/content_padding"
-			android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
-			android:text="@string/plan_route_open_existing_track"
-			android:textAppearance="@style/TextAppearance.ListItemTitle"
-			osmand:typeface="@string/font_roboto_medium" />
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/gpx_track_list"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		tools:itemCount="1"
+		tools:listitem="@layout/gpx_track_select_item" />
 
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/description"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:paddingStart="@dimen/content_padding"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingEnd="@dimen/content_padding"
-			android:paddingRight="@dimen/content_padding"
-			android:paddingBottom="@dimen/content_padding"
-			android:text="@string/plan_route_select_track_file_for_open"
-			android:textColor="?android:textColorPrimary"
-			android:textSize="@dimen/default_desc_text_size"
-			osmand:typeface="@string/font_roboto_regular" />
-
-		<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/folder_list"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:clipToPadding="false"
-			android:orientation="horizontal"
-			android:paddingStart="@dimen/content_padding"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingEnd="@dimen/content_padding"
-			android:paddingRight="@dimen/content_padding"
-			tools:itemCount="3"
-			tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-			tools:listitem="@layout/point_editor_icon_category_item"
-			tools:orientation="horizontal" />
-
-		<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/gpx_track_list"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			tools:itemCount="1"
-			tools:listitem="@layout/gpx_track_select_item" />
-
-	</LinearLayout>
-
-</androidx.core.widget.NestedScrollView>
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_plan_route_start.xml

@@ -1,47 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
+	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:orientation="horizontal"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/bottom_sheet_title_padding_top"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/bottom_sheet_title_padding_bottom">
 
-		<LinearLayout
-			android:layout_width="match_parent"
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/last_edited"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:orientation="horizontal"
-			android:paddingStart="@dimen/content_padding"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingTop="@dimen/bottom_sheet_title_padding_top"
-			android:paddingEnd="@dimen/content_padding"
-			android:paddingRight="@dimen/content_padding"
-			android:paddingBottom="@dimen/bottom_sheet_title_padding_bottom">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/last_edited"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:letterSpacing="@dimen/description_letter_spacing"
-				android:text="@string/plan_route_last_edited"
-				android:textColor="?attr/active_color_basic"
-				android:textSize="@dimen/default_desc_text_size"
-				osmand:typeface="@string/font_roboto_medium" />
-
-		</LinearLayout>
-
-		<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/gpx_track_list"
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1"
-			tools:itemCount="1"
-			tools:listitem="@layout/gpx_track_select_item" />
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:text="@string/plan_route_last_edited"
+			android:textColor="?attr/active_color_basic"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium" />
 
 	</LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/gpx_track_list"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1"
+		tools:itemCount="1"
+		tools:listitem="@layout/gpx_track_select_item" />
+
+</LinearLayout>

OsmAnd/res/layout/custom_color_picker.xml

@@ -46,9 +46,11 @@
 				android:id="@+id/color_hex_edit_text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:inputType="textMultiLine"
-				android:maxLines="4"
+				android:inputType="text"
+				android:maxLines="1"
 				android:minHeight="@dimen/bottom_sheet_list_item_height"
+				android:paddingTop="@dimen/content_padding_small"
+				android:paddingBottom="@dimen/content_padding_small"
 				android:paddingStart="@dimen/content_padding_small"
 				android:paddingLeft="@dimen/content_padding_small"
 				android:paddingEnd="@dimen/content_padding_small"

OsmAnd/res/layout/fragment_measurement_tool.xml

@@ -180,7 +180,10 @@
                     android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:maxLines="1"
-                    android:padding="@dimen/measurement_tool_text_button_padding_small"
+                    android:paddingStart="@dimen/measurement_tool_text_button_padding_small"
+                    android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
+                    android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
+                    android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
                     android:text="@string/shared_string_options"
                     android:textColor="?attr/color_dialog_buttons"
                     osmand:typeface="@string/font_roboto_medium"/>

OsmAnd/res/layout/fragment_plan_route_warning.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:background="@color/color_transparent">
+
+	<LinearLayout
+		android:id="@+id/main_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
+
+		<FrameLayout
+			android:id="@+id/map_controls_container"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			android:layout_gravity="bottom">
+
+			<include
+				layout="@layout/map_ruler"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="start|bottom"
+				android:layout_marginStart="@dimen/fab_margin_right"
+				android:layout_marginLeft="@dimen/fab_margin_right"
+				android:layout_marginEnd="@dimen/fab_margin_right"
+				android:layout_marginRight="@dimen/fab_margin_right"
+				tools:visibility="invisible" />
+
+			<include
+				layout="@layout/map_hud_controls"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="end|bottom"
+				android:layout_marginStart="@dimen/fab_margin_right"
+				android:layout_marginLeft="@dimen/fab_margin_right"
+				android:layout_marginEnd="@dimen/fab_margin_right"
+				android:layout_marginRight="@dimen/fab_margin_right"
+				tools:visibility="invisible" />
+
+		</FrameLayout>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical" />
+
+		<include layout="@layout/context_menu_top_shadow" />
+
+		<LinearLayout
+			android:id="@+id/content"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="?attr/list_background_color"
+			android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
+			android:orientation="vertical"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingBottom="@dimen/dialog_button_ex_height"
+			android:clickable="true"
+			android:focusable="true">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:gravity="center_vertical"
+				android:maxLines="1"
+				android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/default_list_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				android:text="@string/route_between_points"
+				tools:text="@string/route_between_points" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/description"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingBottom="@dimen/content_padding_half"
+				android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				android:text="@string/route_between_points_warning_desc"
+				tools:text="@string/route_between_points_warning_desc" />
+
+		</LinearLayout>
+
+
+	</LinearLayout>
+
+
+	<LinearLayout
+		android:id="@+id/control_buttons"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:clickable="true"
+		android:focusable="true"
+		android:orientation="vertical">
+
+		<include
+			layout="@layout/bottom_buttons"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dialog_button_ex_height"
+			android:layout_gravity="bottom" />
+
+	</LinearLayout>
+
+</FrameLayout>

OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml

@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:background="?attr/bg_color"
+	android:orientation="vertical">
 
 	<LinearLayout
+		android:id="@+id/navigation_types_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?attr/bg_color"
-		android:orientation="vertical">
+		android:orientation="vertical"
+		android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
 
-		<LinearLayout
-			android:id="@+id/navigation_types_container"
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/choose_navigation_title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical"
-			android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/choose_navigation_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical"
-				android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
-				android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
-				android:paddingEnd="@dimen/content_padding"
-				android:paddingLeft="@dimen/content_padding"
-				android:paddingRight="@dimen/content_padding"
-				android:paddingStart="@dimen/content_padding"
-				android:text="@string/route_between_points"
-				android:textAppearance="@style/TextAppearance.ListItemTitle"
-				osmand:typeface="@string/font_roboto_medium" />
+			android:gravity="center_vertical"
+			android:paddingStart="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/measurement_tool_menu_title_padding_top"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingBottom="@dimen/measurement_tool_menu_title_padding_bottom"
+			android:text="@string/route_between_points"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			osmand:typeface="@string/font_roboto_medium" />
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:layout_width="match_parent"
@@ -40,13 +36,13 @@
 				android:paddingRight="@dimen/content_padding"
 				android:paddingStart="@dimen/content_padding"
 				android:paddingBottom="@dimen/content_padding"
-				android:text="@string/rourte_between_points_desc"
+				android:text="@string/route_between_points_desc"
 				android:textColor="?android:textColorPrimary"
 				android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
 				osmand:typeface="@string/font_roboto_regular"
 				android:textSize="@dimen/default_desc_text_size" />
 
-			<include layout="@layout/custom_radio_buttons" />
+		<include layout="@layout/custom_radio_buttons" />
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/button_description"
@@ -58,13 +54,11 @@
 				android:paddingStart="@dimen/content_padding"
 				android:paddingTop="@dimen/measurement_tool_content_padding_medium"
 				android:paddingBottom="@dimen/measurement_tool_content_padding_medium"
-				android:text="@string/rourte_between_points_next_segment_button_desc"
+				android:text="@string/route_between_points_next_segment_button_desc"
 				android:textColor="?android:textColorPrimary"
 				android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
 				osmand:typeface="@string/font_roboto_regular"
 				android:textSize="@dimen/default_desc_text_size" />
 		</LinearLayout>
 
-	</LinearLayout>
-
-</androidx.core.widget.NestedScrollView>
+</LinearLayout>

OsmAnd/res/layout/map_hud_bottom.xml

@@ -116,13 +116,20 @@
                 tools:src="@drawable/ic_action_remove_dark"
                 android:contentDescription="@string/snap_to_road" />
 
-            <include
-                layout="@layout/map_ruler"
-                android:layout_width="@dimen/map_ruler_width"
+            <LinearLayout
+                android:id="@+id/map_ruler_container"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginStart="@dimen/map_button_margin"
-                android:layout_marginLeft="@dimen/map_button_margin" />
+                android:layout_gravity="bottom">
+
+                <include
+                    layout="@layout/map_ruler"
+                    android:layout_width="@dimen/map_ruler_width"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="@dimen/map_button_margin"
+                    android:layout_marginLeft="@dimen/map_button_margin" />
+            </LinearLayout>
 
         </LinearLayout>
 

OsmAnd/res/layout/point_editor_fragment_new.xml

@@ -239,7 +239,7 @@
 				<net.osmand.plus.widgets.TextViewEx
 					android:id="@+id/description_button"
 					android:layout_width="wrap_content"
-					android:layout_height="@dimen/context_menu_buttons_bottom_height"
+					android:layout_height="@dimen/setting_list_item_small_height"
 					android:layout_marginStart="@dimen/content_padding_half"
 					android:layout_marginLeft="@dimen/content_padding_half"
 					android:drawablePadding="8dp"

OsmAnd/res/layout/route_option_btn.xml

@@ -38,10 +38,10 @@
 			android:letterSpacing="@dimen/text_button_letter_spacing"
 			android:maxLines="1"
 			android:paddingBottom="3dp"
-			android:paddingEnd="16dp"
-			android:paddingLeft="3dp"
-			android:paddingRight="16dp"
-			android:paddingStart="3dp"
+			android:layout_marginLeft="3dp"
+			android:layout_marginStart="3dp"
+			android:layout_marginRight="16dp"
+			android:layout_marginEnd="16dp"
 			android:paddingTop="3dp"
 			android:text="@string/routing_attr_avoid_motorway_name"
 			android:textSize="@dimen/default_sub_text_size"

OsmAnd/res/layout/route_options_container.xml

@@ -56,15 +56,15 @@
 		android:layout_gravity="end|center_vertical"
 		android:layout_marginLeft="1dp"
 		android:layout_marginRight="1dp"
-		android:paddingLeft="@dimen/route_info_icon_vertical_padding"
 		android:paddingTop="3dp"
+		android:paddingLeft="@dimen/route_info_icon_vertical_padding"
 		android:paddingRight="@dimen/route_info_icon_vertical_padding"
+		android:paddingStart="@dimen/route_info_icon_vertical_padding"
+		android:paddingEnd="@dimen/route_info_icon_vertical_padding"
 		android:paddingBottom="3dp"
 		android:contentDescription="@string/shared_string_remove"
 		tools:src="@drawable/ic_action_remove_dark"
 		android:layout_marginEnd="1dp"
-		android:paddingStart="@dimen/route_info_icon_vertical_padding"
-		android:paddingEnd="@dimen/route_info_icon_vertical_padding"
 		android:layout_marginStart="1dp" />
 
 	<View

OsmAnd/res/layout/track_appearance.xml

@@ -37,7 +37,7 @@
 				android:layout_height="wrap_content">
 
 				<net.osmand.plus.widgets.TextViewEx
-					android:id="@+id/no_search_results_description"
+					android:id="@+id/track_title"
 					android:layout_width="0dp"
 					android:layout_height="match_parent"
 					android:layout_gravity="center_vertical"

OsmAnd/res/layout/track_coloring_card.xml

@@ -21,6 +21,7 @@
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:paddingTop="@dimen/context_menu_padding_margin_tiny"
+		android:visibility="gone"
 		android:paddingBottom="@dimen/content_padding">
 
 		<androidx.recyclerview.widget.RecyclerView

OsmAnd/res/layout/track_width_card.xml

@@ -44,7 +44,8 @@
 		android:id="@+id/slider_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:orientation="vertical"
+		android:paddingBottom="@dimen/content_padding">
 
 		<LinearLayout
 			android:layout_width="match_parent"

OsmAnd/res/values-ar/strings.xml

@@ -3143,7 +3143,7 @@
     <string name="manage_profiles">إدارة أوضاع التطبيق …</string>
     <string name="osmand_settings_descr">لكامل التطبيق</string>
     <string name="osmand_settings">الإعدادات</string>
-    <string name="copy_from_other_profile">نسخ من وضع آخر</string>
+    <string name="copy_from_other_profile">نسخة من ملف تعريف آخر</string>
     <string name="turn_screen_on">قم بتشغيل الشاشة</string>
     <string name="map_during_navigation_info">خريطة أثناء التنقل</string>
     <string name="map_during_navigation">خريطة أثناء التنقل</string>
@@ -3301,7 +3301,7 @@
     <string name="profile_alert_cant_delete_base">لايمكن حذف الأوضاع الأساسية</string>
     <string name="profile_alert_need_save_title">حفظ التغييرات</string>
     <string name="profile_alert_need_save_msg">احفظ تغييرات الوضع أولاً</string>
-    <string name="profile_alert_delete_title">حذف الوضع</string>
+    <string name="profile_alert_delete_title">حذف الملف الشخصي</string>
     <string name="profile_alert_delete_msg">هل تريد حذف الوضع \"%s\"</string>
     <string name="select_base_profile_dialog_title">حدد وضع أساسي</string>
     <string name="select_base_profile_dialog_message">إسناد الوضع المخصص الخاص بك إلى أحد أوضاع التطبيق الافتراضية ، يحدد الإعداد الأساسي مثل الرؤية الافتراضية لعناصر واجهة المستخدم ووحدات السرعة والمسافة. وهذه هي أوضاع التطبيق الافتراضية ، إلى جانب أمثلة لأوضاع مخصصة يمكن تمديدها إلى:</string>
@@ -3806,24 +3806,22 @@
     <string name="plan_route_import_track">استيراد المسار</string>
     <string name="plan_route_open_existing_track">فتح المسار الموجود</string>
     <string name="plan_route_create_new_route">إنشاء مسار جديد</string>
-    <string name="plan_route_select_track_file_for_open">حدد ملف المسار للفتح.</string>
+    <string name="plan_route_select_track_file_for_open">حدد المسار للفتح.</string>
     <string name="shared_string_done">تم</string>
     <string name="overwrite_track">الكتابة فوق المسار</string>
     <string name="navigation_profile">ملف تعريف التنقل</string>
-    <string name="rourte_between_points_add_track_desc">حدد ملف المسار الذي سيتم إضافة مقطع جديد إليه.</string>
+    <string name="route_between_points_add_track_desc">حدد ملف المسار الذي سيتم إضافة مقطع جديد إليه.</string>
     <string name="save_as_new_track">حفظ كمسار جديد</string>
     <string name="reverse_route">عكس الطريق</string>
-    <string name="rourte_between_points_whole_track_button_desc">سيتم إعادة حساب المقطع التالي فقط باستخدام ملف التعريف المحدد.</string>
-    <string name="rourte_between_points_next_segment_button_desc">سيتم إعادة حساب المقطع التالي فقط باستخدام ملف التعريف المحدد.</string>
-    <string name="rourte_between_points_desc">حدد كيفية توصيل النقاط، بخط مستقيم، أو حساب مسار بينها مع ملف التعريف المحدد.</string>
+    <string name="route_between_points_whole_track_button_desc">سيتم إعادة حساب المقطع التالي فقط باستخدام ملف التعريف المحدد.</string>
+    <string name="route_between_points_next_segment_button_desc">سيتم إعادة حساب المقطع التالي فقط باستخدام ملف التعريف المحدد.</string>
+    <string name="route_between_points_desc">حدد كيفية توصيل النقاط، بخط مستقيم، أو حساب مسار بينها على النحو المحدد أدناه.</string>
     <string name="whole_track">مسار كامل</string>
     <string name="next_segment">المقطع التالي</string>
-    <string name="rourte_between_points_warning_desc">لاستخدام هذا الخيارتحتاج إلى محاذاة المسار الخاص بك إلى خريطة الطرق.
-\n
-\nفي الخطوة التالية ، ستحتاج إلى تحديد ملف تعريف الملاحة لاكتشاف الطرق المسموح بها وبداية المسافة لتقريب تتبعك بالطرق.</string>
+    <string name="route_between_points_warning_desc">بعد ذلك ، ألقط مسارك بأقرب طريق مسموح به باستخدام أحد ملفات تعريف التنقل الخاصة بك لاستخدام هذا الخيار.</string>
     <string name="threshold_distance">بداية المسافة</string>
     <string name="street_level_imagery">صور للشارع</string>
-    <string name="plan_route_exit_dialog_descr">هل أنت متأكد أنك تريد إغلاق مسار الخطة دون حفظ؟ سوف تفقد كل التغييرات.</string>
+    <string name="plan_route_exit_dialog_descr">هل أنت متأكد أنك تريد إغلاق مسار الخطة دون حفظ؟ سوف تفقد كل التغييرات؟</string>
     <string name="in_case_of_reverse_direction">في حالة الاتجاه المعاكس</string>
     <string name="save_track_to_gpx">تسجيل المسار أثناء الملاحة</string>
     <string name="shared_string_save_as_gpx">حفظ كملف مسار جديد</string>
@@ -3875,4 +3873,19 @@
     <string name="shared_string_file_name">اسم الملف</string>
     <string name="one_point_error">الرجاء إضافة نقطتين على الأقل.</string>
     <string name="shared_string_redo">إعادة</string>
+    <string name="release_3_8">• ميزة تخطيط المسار المحدثة: تسمح باستخدام أنواع الملاحة المختلفة لكل جزء وكذا اظافة طرق
+\n
+\n• قائمة مظهر جديدة للمسارات: تحديد اللون، السماكة، اظهار أسهم التوجيه، أيقونات الانطلاق والنهاية
+\n
+\n• تحسين رؤية عقد الدراجات
+\n
+\n• المسارات قابلة للنقر عليها الان وقائمة سياق بمعلومات أساسية
+\n
+\n• خوارزميات بحث محسنة
+\n
+\n• تم تحسين خيارات متابعة المسار خلال الملاحة
+\n
+\n• تم إصلاح المشكلات المتعلقة باستيراد/تصدير إعدادات الملف الشخصي
+\n
+\n</string>
 </resources>

OsmAnd/res/values-b+kab/strings.xml

@@ -1337,6 +1337,7 @@
     <string name="reverse_route">Abrid yettin</string>
     <string name="next_segment">Aḥric i d-itteddun</string>
     <string name="navigation_profile">Amaɣnu n tunigin</string>
-    <string name="rourte_between_points_add_track_desc">Fren afaylu n uḍfar iɣer ara yernu uḥric amaynut.</string>
+    <string name="route_between_points_add_track_desc">Fren afaylu n uḍfar iɣer ara yernu uḥric amaynut.</string>
     <string name="plan_route_exit_dialog_descr">Tebɣiḍ s tidet ad tmedleḍ abrid n uɣawas war asekles\? Ad tesruḥeḍ akk ibeddilen.</string>
+    <string name="shared_string_is_saved">Ittwasekles</string>
 </resources>

OsmAnd/res/values-be/phrases.xml

@@ -3810,7 +3810,7 @@
     <string name="poi_fire_hydrant_type_pipe">Труба</string>
     <string name="poi_drinking_water_refill_network">Сетка папаўнення пітной вадой</string>
     <string name="poi_drinking_water_refill_no">Папаўненне пітной вадой: не</string>
-    <string name="poi_drinking_water_refill_yes">Папаўненне пітной вадой: так</string>
+    <string name="poi_drinking_water_refill_yes">Так</string>
     <string name="poi_seamark_obstruction">Перашкода</string>
     <string name="poi_seamark_water_level_below_mwl">Узровень вады: ніжэй сярэдняга ўзроўню</string>
     <string name="poi_seamark_water_level_above_mwl">Узровень вады: вышэй сярэдняга ўзроўню</string>
@@ -3834,4 +3834,13 @@
     <string name="poi_sms_yes">Так</string>
     <string name="poi_dive_centre">Цэнтр дайвінгу</string>
     <string name="poi_resort_hunting">Паляўнічая база</string>
+    <string name="poi_drinking_water_refill">Папаўненне пітной вады</string>
+    <string name="poi_departures_board_yes">Так</string>
+    <string name="poi_departures_board_no">Расклад адпраўленняў: не</string>
+    <string name="poi_departures_board">Расклад адпраўленняў</string>
+    <string name="poi_departures_board_timetable">Расклад</string>
+    <string name="poi_departures_board_realtime">Рэальны час</string>
+    <string name="poi_departures_board_delay">Затрымка</string>
+    <string name="poi_recycling_small_electrical_appliances">Маленькія электрапрыборы</string>
+    <string name="poi_beehive">Вулей</string>
 </resources>

OsmAnd/res/values-be/strings.xml

@@ -2014,7 +2014,7 @@
     <string name="shared_string_is_open_24_7">Адчынена 24/7</string>
     <string name="map_widget_search">Шукаць</string>
     <string name="shared_string_from">ад</string>
-    <string name="city_type_neighbourhood">Суседства</string>
+    <string name="city_type_neighbourhood">Ваколіцы</string>
     <string name="city_type_district">Раён</string>
     <string name="lang_hsb">Верхнялужыцкая</string>
     <string name="search_categories">Катэгорыі</string>
@@ -3609,7 +3609,7 @@
     <string name="routing_attr_length_name">Ліміт даўжыні</string>
     <string name="shared_string_bearing">Арыентацыя</string>
     <string name="item_deleted">Выдалена: %1$s</string>
-    <string name="speed_cameras_restart_descr">Перазапуск патрабуецца для поўнага выдалення даных камер кантролю хуткасці.</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="app_mode_enduro_motorcycle">Матацыкл Эндура</string>
@@ -3697,24 +3697,22 @@
     <string name="overwrite_track">Перазапісаць след</string>
     <string name="save_as_new_track">Захаваць як новы след</string>
     <string name="reverse_route">Зваротны маршрут</string>
-    <string name="rourte_between_points_whole_track_button_desc">Увесь след будзе пералічаны з выкарыстаннем абранага профілю.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Толькі наступны сегмент будзе пералічаны паводле абранага профілю.</string>
-    <string name="rourte_between_points_desc">Абярыце спосаб злучэння пунктаў. Варыянты: прамая лінія; разлік маршруту паводле абранага профілю.</string>
+    <string name="route_between_points_whole_track_button_desc">Увесь след будзе пералічаны з выкарыстаннем абранага профілю.</string>
+    <string name="route_between_points_next_segment_button_desc">Толькі наступны сегмент будзе пералічаны паводле абранага профілю.</string>
+    <string name="route_between_points_desc">Абярыце спосаб злучэння пунктаў. Варыянты: прамая лінія; разлік маршруту як вызначана ніжэй.</string>
     <string name="whole_track">Увесь след</string>
     <string name="next_segment">Наступны сегмент</string>
-    <string name="rourte_between_points_warning_desc">Для выкарыстання гэтага параметру OsmAnd пракладзе ваш след па дарогах.
-\n
-\n Пасля вам патрэбна абраць профіль навігацыі для вызначэння маршруту з улікам параметраў і абмежаванняў гэтага профілю.</string>
+    <string name="route_between_points_warning_desc">Пасля вам патрэбна абраць профіль навігацыі для вызначэння маршруту з улікам параметраў і абмежаванняў гэтага профілю.</string>
     <string name="threshold_distance">Максімальная дыстанцыя</string>
     <string name="navigation_profile">Профіль навігацыі</string>
-    <string name="rourte_between_points_add_track_desc">Абраць файл следу, да якога будзе дададзены новы сегмент.</string>
+    <string name="route_between_points_add_track_desc">Абраць файл следу, да якога будзе дададзены новы сегмент.</string>
     <string name="street_level_imagery">Выявы на ўзроўні вуліц</string>
-    <string name="plan_route_exit_dialog_descr">Сапраўды закрыць план маршруту без захавання\? Усе змены страцяцца.</string>
+    <string name="plan_route_exit_dialog_descr">Усе змены страцяцца. Закрыць план маршруту\?</string>
     <string name="in_case_of_reverse_direction">У выпадку адваротнага кірунку</string>
     <string name="shared_string_gpx_route">Маршрут следу</string>
     <string name="follow_track">Кіравацца следу</string>
     <string name="follow_track_descr">Абярыце файл следу</string>
-    <string name="import_track_descr">Абярыце альбо імпартуйце файл следу.</string>
+    <string name="import_track_descr">Абярыце альбо імпартуйце файл следу са сваёй прылады.</string>
     <string name="select_another_track">Абраць іншы след</string>
     <string name="navigate_to_track_descr">Перайдзіце ад маёй пазіцыі да следу</string>
     <string name="pass_whole_track_descr">Пункт следу для навігацыі</string>
@@ -3941,4 +3939,19 @@
 \nАдзін месяц - 43 829 хвілін.</string>
     <string name="tiles_storage_descr">Абярыце спосаб захоўвання спампаваных фрагментаў.</string>
     <string name="shared_string_redo">Вярнуць</string>
+    <string name="release_3_8">• Абноўлены рэжым планавання маршруту дазваляе выкарыстоўваць розныя тыпы навігацыі для кожнага сегмента і прымацоўвае любы шлях да дарог
+\n
+\n • Новыя варыянты выгляду для дарожак: абраць колер, таўшчыню, уключыць стрэлкі кірунку і адзнакі старту/фінішу
+\n
+\n • Палепшаная бачнасць роварных вузлоў
+\n
+\n • Кантэкстнае меню для слядоў з асноўнай інфармацыяй
+\n
+\n • Палепшаны алгарытмы пошуку
+\n
+\n • Палепшаны параметры адсочвання ў навігацыі
+\n
+\n • Выпраўлены праблемы з імпартам / экспартам налад профілю
+\n
+\n</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -3713,17 +3713,17 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="add_to_a_track">Afegir a una ruta</string>
     <string name="track_show_start_finish_icons">Mostrar icones d\'inici final</string>
     <string name="select_track_width">Triar amplària</string>
-    <string name="rourte_between_points_add_track_desc">Trieu un arxiu de ruta al qual s\'afegirà un nou segment.</string>
-    <string name="rourte_between_points_warning_desc">Per usar aquesta opció OsmAnd ha d\'ajustar la seua ruta a les vies del mapa.
+    <string name="route_between_points_add_track_desc">Trieu un arxiu de ruta al qual s\'afegirà un nou segment.</string>
+    <string name="route_between_points_warning_desc">Per usar aquesta opció OsmAnd ha d\'ajustar la seua ruta a les vies del mapa.
 \n
 \nEn el pas següent cal que elegiu el perfil de navegació per detectar vies permeses i el llindar de distància per aproximar la ruta a les vies.</string>
-    <string name="rourte_between_points_desc">Trieu com connectar els punts, amb una línia recta, o calcular la ruta entre ells d\'acord amb el perfil seleccionat.</string>
+    <string name="route_between_points_desc">Trieu com connectar els punts, amb una línia recta, o calcular la ruta entre ells d\'acord amb el perfil seleccionat.</string>
     <string name="gpx_split_interval_descr">Trieu l\'interval a què les marques de distància o temps sobre la ruta es mostraran.</string>
     <string name="shared_string_custom">Personalitzat</string>
     <string name="save_as_new_track">Desar com a una ruta nova</string>
     <string name="reverse_route">Ruta inversa</string>
-    <string name="rourte_between_points_whole_track_button_desc">La ruta sencera serà recalculada fent ús del perfil seleccionat.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Només el següent segment serà recalculat fent ús del perfil seleccionat.</string>
+    <string name="route_between_points_whole_track_button_desc">La ruta sencera serà recalculada fent ús del perfil seleccionat.</string>
+    <string name="route_between_points_next_segment_button_desc">Només el següent segment serà recalculat fent ús del perfil seleccionat.</string>
     <string name="whole_track">Ruta sencera</string>
     <string name="next_segment">Següent segment</string>
     <string name="threshold_distance">Llindar de distància</string>
@@ -3800,4 +3800,19 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_string_is_saved">s\'ha desat</string>
     <string name="one_point_error">Afegiu almenys dos punts.</string>
     <string name="shared_string_redo">Torna a fer</string>
+    <string name="keep_screen_off">Manté la pantalla desactivada</string>
+    <string name="app_mode_enduro_motorcycle">Moto enduro</string>
+    <string name="plan_route_exit_dialog_descr">Esteu segur que voleu tancar la ruta planificada sense desar-la\? Perdreu tots els canvis.</string>
+    <string name="add_segment_to_the_track">Afegeix a un fitxer de traces</string>
+    <string name="layer_gpx_layer">Traces</string>
+    <string name="save_track_to_gpx_globally">Enregistra el trajecte a un fitxer GPX</string>
+    <string name="navigate_to_track_descr">Navegua des de la meva ubicació fins a la traça</string>
+    <string name="add_address">Afegeix una adreça</string>
+    <string name="shared_string_file_name">Nom del fitxer</string>
+    <string name="monitoring_control_start">REC</string>
+    <string name="disable_recording_once_app_killed_descrp">Aturarà l\'enregistrament de traces quan es mati l\'aplicació (mitjançant aplicacions recents). (La indicació de fons OsmAnd desapareix de la barra de notificacions d\'Android.)</string>
+    <string name="save_global_track_interval_descr">Trieu l\'interval d\'enregistrament general dels desplaçaments (s\'activa mitjançant el giny de gravació del mapa).</string>
+    <string name="simplified_track">Traça simplificada</string>
+    <string name="simplified_track_description">Només es desarà la línia del trajecte, les fites s\'esborraran.</string>
+    <string name="number_of_gpx_files_selected_pattern">%s arxius de traces seleccionats</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -3731,8 +3731,8 @@
     <string name="overwrite_track">Overskriv spor</string>
     <string name="save_as_new_track">Gem som nyt spor</string>
     <string name="reverse_route">Omvendt rute</string>
-    <string name="rourte_between_points_whole_track_button_desc">Hele sporet genberegnes ved hjælp af den valgte profil.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Kun det næste segment genberegnes ved hjælp af den valgte profil.</string>
+    <string name="route_between_points_whole_track_button_desc">Hele sporet genberegnes ved hjælp af den valgte profil.</string>
+    <string name="route_between_points_next_segment_button_desc">Kun det næste segment genberegnes ved hjælp af den valgte profil.</string>
     <string name="whole_track">Hele sporet</string>
     <string name="next_segment">Næste segment</string>
     <string name="threshold_distance">Tærskelafstand</string>

OsmAnd/res/values-de/phrases.xml

@@ -3817,7 +3817,7 @@
     <string name="poi_seamark_water_level_above_mwl">Wasserstand: über dem mittleren Wasserstand</string>
     <string name="poi_seamark_water_level_below_mwl">Wasserstand: unter dem mittleren Wasserstand</string>
     <string name="poi_seamark_obstruction">Hindernis</string>
-    <string name="poi_drinking_water_refill_yes">Trinkwassernachfüllung: ja</string>
+    <string name="poi_drinking_water_refill_yes">ja</string>
     <string name="poi_drinking_water_refill_no">Trinkwassernachfüllung: nein</string>
     <string name="poi_drinking_water_refill_network">Trinkwasser-Nachfüllnetz</string>
     <string name="poi_internet_access_fee_customers">Internetzugangsgebühr für Kunden</string>
@@ -3827,7 +3827,7 @@
     <string name="poi_fire_hydrant_type_pipe">Rohr</string>
     <string name="poi_fire_hydrant_pressure_filter">Druck</string>
     <string name="poi_pump_status_missing_beam">Pumpenzustand: fehlender Arm</string>
-    <string name="poi_traffic_signals_arrow_yes">Ja</string>
+    <string name="poi_traffic_signals_arrow_yes">ja</string>
     <string name="poi_traffic_signals_vibration_yes">ja</string>
     <string name="poi_traffic_signals_vibration_no">kein Vibrieren</string>
     <string name="poi_traffic_signals_arrow">Pfeil</string>
@@ -3835,4 +3835,13 @@
     <string name="poi_give_box">Give box</string>
     <string name="poi_city_block">Stadtteil</string>
     <string name="poi_borough">Bezirk</string>
+    <string name="poi_elevator">Aufzug</string>
+    <string name="poi_departures_board_timetable">Fahrplan</string>
+    <string name="poi_departures_board_realtime">Echtzeit</string>
+    <string name="poi_departures_board_delay">Verspätung</string>
+    <string name="poi_departures_board_yes">ja</string>
+    <string name="poi_departures_board_no">Anzeige der Abreisezeiten: nein</string>
+    <string name="poi_traffic_signals_arrow_no">Abbiegepfeil: nein</string>
+    <string name="poi_departures_board">Anzeige der Abreisezeiten</string>
+    <string name="poi_drinking_water_refill">Nachfüllen von Trinkwasser</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -2015,7 +2015,7 @@
     <string name="no_inet_connection_desc_map">Erforderlich, um Karten herunterzuladen.</string>
     <string name="search_location">Standort wird gesucht …</string>
     <string name="storage_free_space">Freier Speicherplatz</string>
-    <string name="storage_place_description">OsmAnd speichert Daten (Karten, GPX-Dateien usw.) in \'%1$s\'.</string>
+    <string name="storage_place_description">OsmAnd speichert Daten (Karten, Track-Dateien usw.) in \'%1$s\'.</string>
     <string name="give_permission">Berechtigung erteilen</string>
     <string name="allow_access_location">Standortbestimmung zulassen</string>
     <string name="first_usage_greeting">Erhalten Sie Wegbeschreibungen und entdecken Sie neue Orte ohne Internetverbindung</string>
@@ -2072,8 +2072,8 @@
     <string name="shared_string_notifications">Benachrichtigungen</string>
     <string name="shared_string_appearance">Aussehen</string>
     <string name="route_calculation">Routenberechnung</string>
-    <string name="gpx_no_tracks_title">Sie haben noch keine GPX-Dateien</string>
-    <string name="gpx_no_tracks_title_folder">GPX-Dateien können dem Ordner hinzugefügt werden</string>
+    <string name="gpx_no_tracks_title">Sie haben noch keine Track-Dateien</string>
+    <string name="gpx_no_tracks_title_folder">Track-Dateien können dem Ordner hinzugefügt werden</string>
     <string name="gpx_add_track">Weitere hinzufügen …</string>
     <string name="upload_poi">POI hochladen</string>
     <string name="route_roundabout_short">Nehmen Sie die %1$d Ausfahrt</string>
@@ -2785,7 +2785,7 @@
     <string name="coord_input_save_as_track">Als Track speichern</string>
     <string name="coord_input_save_as_track_descr">Sie haben %1$s Punkte hinzugefügt. Geben Sie einen Dateinamen ein und klicken Sie auf „Speichern“.</string>
     <string name="point_deleted">Punkt %1$s gelöscht</string>
-    <string name="send_search_query_description">Ihre Suchanfrage wird an: \"%1 s\" gesendet, zusammen mit Ihrem Standort.
+    <string name="send_search_query_description">Ihre Suchanfrage wird an: \"%1$s\" gesendet, zusammen mit Ihrem Standort.
 \n
 \nPersönliche Informationen werden nicht gesammelt, sondern nur Suchdaten, die zur Verbesserung der Suche benötigt werden.</string>
     <string name="search_no_results_description">Keine Ergebnisse?
@@ -2901,10 +2901,10 @@
     <string name="by_transport_type">Von %1$s</string>
     <string name="step_by_step">Schritt für Schritt</string>
     <string name="routeInfo_road_types_name">Straßentypen</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX-Tracks ein-/ausblenden</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Eine Schaltfläche zum Ein- oder Ausblenden ausgewählter GPX-Tracks auf der Karte.</string>
-    <string name="quick_action_gpx_tracks_hide">GPX-Tracks ausblenden</string>
-    <string name="quick_action_gpx_tracks_show">GPX-Tracks einblenden</string>
+    <string name="quick_action_show_hide_gpx_tracks">Tracks ein-/ausblenden</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Eine Schaltfläche zum Ein- oder Ausblenden ausgewählter Tracks auf der Karte.</string>
+    <string name="quick_action_gpx_tracks_hide">Tracks ausblenden</string>
+    <string name="quick_action_gpx_tracks_show">Tracks einblenden</string>
     <string name="exit_at">Aussteigen bei</string>
     <string name="sit_on_the_stop">Zusteigen an Haltestelle</string>
     <string name="use_osm_live_public_transport_description">Aktivierung von OsmAnd Live für Änderungen bei öffentlichen Verkehrsmitteln.</string>
@@ -3829,13 +3829,13 @@
     <string name="threshold_distance">Schwellenwert-Distanz</string>
     <string name="save_as_new_track">Als neuen Track speichern</string>
     <string name="reverse_route">Route umkehren</string>
-    <string name="rourte_between_points_whole_track_button_desc">Der gesamte Track wird mit dem ausgewählten Profil neu berechnet.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Nur das nächste Segment wird mit dem ausgewählten Profil neu berechnet.</string>
-    <string name="rourte_between_points_desc">Wählen Sie, wie Punkte mit einer geraden Linie verbunden werden sollen, oder berechnen Sie eine Route zwischen ihnen mit dem ausgewählten Profil.</string>
+    <string name="route_between_points_whole_track_button_desc">Der gesamte Track wird mit dem ausgewählten Profil neu berechnet.</string>
+    <string name="route_between_points_next_segment_button_desc">Nur das nächste Segment wird mit dem ausgewählten Profil neu berechnet.</string>
+    <string name="route_between_points_desc">Wählen Sie, wie Punkte mit einer geraden Linie verbunden werden sollen, oder berechnen Sie eine Route zwischen ihnen mit dem ausgewählten Profil.</string>
     <string name="whole_track">Ganzer Track</string>
     <string name="next_segment">Nächstes Segment</string>
     <string name="navigation_profile">Navigationsprofil</string>
-    <string name="rourte_between_points_add_track_desc">Wählen Sie eine Trackdatei, für die ein neues Segment hinzugefügt werden soll.</string>
+    <string name="route_between_points_add_track_desc">Wählen Sie eine Trackdatei, für die ein neues Segment hinzugefügt werden soll.</string>
     <string name="follow_track_descr">Track auswählen, der verfolgt werden soll</string>
     <string name="delete_address">Adresse löschen</string>
     <string name="add_address">Adresse hinzufügen</string>
@@ -3876,7 +3876,7 @@
     <string name="import_track_descr">Track Datei zum Folgen auswählen, oder importieren.</string>
     <string name="disable_recording_once_app_killed_descrp">Die GPX-Aufzeichnung wird angehalten, wenn OsmAnd beendet wird (über „zuletzt verwendete Apps“). (Die Hintergrunddienst-Anzeige verschwindet aus der Android-Benachrichtigungsleiste.)</string>
     <string name="save_global_track_interval_descr">Aufzeichnungsintervall für die generelle Track-Aufzeichnung festlegen (via Schaltfläche \'GPX\' auf dem Kartenbildschirm).</string>
-    <string name="rourte_between_points_warning_desc">Um diese Option nutzen zu können, muss OsmAnd den Track auf die Straßen der Karte einrasten.
+    <string name="route_between_points_warning_desc">Um diese Option nutzen zu können, muss OsmAnd den Track auf die Straßen der Karte einrasten.
 \n
 \n Wählen Sie im nächsten Schritt ein Navigationsprofil um festzulegen, welche Straßentypen verwendet werden sollen, und wählen Sie einen Wert für die maximal zulässige Entfernung zwischen Track und Straße.</string>
     <string name="quick_action_add_gpx">Track-Wegpunkt hinzufügen</string>
@@ -3891,4 +3891,5 @@
     <string name="select_another_track">Anderen Track wählen</string>
     <string name="pass_whole_track_descr">Track-Punkt, zu dem navigiert werden soll</string>
     <string name="nearest_point">Nächstgelegener Punkt</string>
+    <string name="shared_string_redo">Wiederholen</string>
 </resources>

OsmAnd/res/values-el/strings.xml

@@ -3708,17 +3708,17 @@
     <string name="turn_screen_on_descr">Σημειώστε τις επιλογές αφύπνισης της οθόνης (εξασφαλίστε ότι το OsmAnd είναι στο προσκήνιο όταν η συσκευή κλειδώνεται):</string>
     <string name="save_as_new_track">Αποθήκευση ως νέου ίχνους</string>
     <string name="reverse_route">Αντιστροφή διαδρομής</string>
-    <string name="rourte_between_points_whole_track_button_desc">Ολόκληρο το ίχνος θα επανυπολογιστεί χρησιμοποιώντας την επιλεγμένη κατατομή (προφίλ).</string>
-    <string name="rourte_between_points_next_segment_button_desc">Μόνο το επόμενο τμήμα θα επανυπολογιστεί χρησιμοποιώντας την επιλεγμένη κατατομή (προφίλ).</string>
-    <string name="rourte_between_points_desc">Επιλέξτε πώς να συνδέσετε τα σημεία, με ευθεία γραμμή, ή να υπολογίσετε μια διαδρομή μεταξύ τους με την επιλεγμένη κατατομή (προφίλ).</string>
-    <string name="rourte_between_points_warning_desc">Για να χρησιμοποιήσετε αυτήν την επιλογή το OsmAnd χρειάζεται να προσκολλήσει το ίχνος σας στους δρόμους του χάρτη.
+    <string name="route_between_points_whole_track_button_desc">Ολόκληρο το ίχνος θα επανυπολογιστεί χρησιμοποιώντας την επιλεγμένη κατατομή (προφίλ).</string>
+    <string name="route_between_points_next_segment_button_desc">Μόνο το επόμενο τμήμα θα επανυπολογιστεί χρησιμοποιώντας την επιλεγμένη κατατομή (προφίλ).</string>
+    <string name="route_between_points_desc">Επιλέξτε πώς να συνδέσετε τα σημεία, με ευθεία γραμμή, ή να υπολογίσετε μια διαδρομή μεταξύ τους με την επιλεγμένη κατατομή (προφίλ).</string>
+    <string name="route_between_points_warning_desc">Για να χρησιμοποιήσετε αυτήν την επιλογή το OsmAnd χρειάζεται να προσκολλήσει το ίχνος σας στους δρόμους του χάρτη.
 \n
 \nΣτο επόμενο βήμα θα χρειαστείτε να επιλέξετε κατατομή (προφίλ) πλοήγησης για να εντοπίσετε τους επιτρεπόμενους δρόμους και την απόσταση κατωφλίου για να προσεγγίσετε το ίχνος σας με τους δρόμους.</string>
     <string name="whole_track">Ολόκληρο το ίχνος</string>
     <string name="next_segment">Επόμενο τμήμα</string>
     <string name="threshold_distance">Απόσταση κατωφλίου</string>
     <string name="navigation_profile">Κατατομή (προφίλ) πλοήγησης</string>
-    <string name="rourte_between_points_add_track_desc">Επιλέξτε ένα αρχείο ίχνους στο οποίο θα προστεθεί νέο τμήμα.</string>
+    <string name="route_between_points_add_track_desc">Επιλέξτε ένα αρχείο ίχνους στο οποίο θα προστεθεί νέο τμήμα.</string>
     <string name="lang_tg">Τατζίκικα</string>
     <string name="some_articles_may_not_available_in_lang">Μερικά άρθρα της Wikipedia μπορεί να μην είναι διαθέσιμα στη γλώσσα σας.</string>
     <string name="lang_zhyue">Καντονέζικα</string>

OsmAnd/res/values-eo/phrases.xml

@@ -2335,7 +2335,7 @@
     <string name="poi_water_tap">Akvokrano</string>
     <string name="poi_button_operated_yes">Butonprema: jes</string>
     <string name="poi_button_operated_no">Butonprema: ne</string>
-    <string name="poi_bicycle_repair_station">Bicikla mem-riparejo;memriparejo bicikla;riparejo bicikla;pumpilo bicikla;aerpumpilo bicikla</string>
+    <string name="poi_bicycle_repair_station">Bicikla memriparejo;memriparejo bicikla;riparejo bicikla;pumpilo bicikla;aerpumpilo bicikla</string>
     <string name="poi_sport_free_flying">Aersportoj</string>
     <string name="poi_free_flying_site_takeoff">elteriĝejo</string>
     <string name="poi_free_flying_site_landing">surteriĝejo</string>

OsmAnd/res/values-eo/strings.xml

@@ -3821,17 +3821,17 @@
     <string name="overwrite_track">Superskribi kurson</string>
     <string name="save_as_new_track">Konservi kiel novan spuron</string>
     <string name="reverse_route">Inversigi kurson</string>
-    <string name="rourte_between_points_whole_track_button_desc">Tuta kurso estos rekalkulita uzante la elektitan profilon.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Nur sekva segmento estos rekalkulita uzante la elektitan profilon.</string>
-    <string name="rourte_between_points_desc">Elektu kiel konekti punktojn: ĉu per rekta linio, ĉu kalkuli kurson inter ilin uzante la elektitan profilon.</string>
+    <string name="route_between_points_whole_track_button_desc">Tuta kurso estos rekalkulita uzante la elektitan profilon.</string>
+    <string name="route_between_points_next_segment_button_desc">Nur sekva segmento estos rekalkulita uzante la elektitan profilon.</string>
+    <string name="route_between_points_desc">Elektu kiel konekti punktojn: ĉu per rekta linio, ĉu kalkuli kurson inter ilin uzante la elektitan profilon.</string>
     <string name="whole_track">Tuta kurso</string>
     <string name="next_segment">Sekva segmento</string>
-    <string name="rourte_between_points_warning_desc">Por uzi tiun ĉi agordon, OsmAnd postulas ĝustigi vian kurson al vojoj sur la mapo.
+    <string name="route_between_points_warning_desc">Por uzi tiun ĉi agordon, OsmAnd postulas ĝustigi vian kurson al vojoj sur la mapo.
 \n
 \n Sekve vi devos elekti profilon de navigo (por trovi permesatajn vojojn) kaj sojlan distancon (por alproksimigi vian kurson al vojoj).</string>
     <string name="threshold_distance">Sojla distanco</string>
     <string name="navigation_profile">Profilo de navigo</string>
-    <string name="rourte_between_points_add_track_desc">Elektu dosieron de spuro al kiu nova segmento estos aldonita.</string>
+    <string name="route_between_points_add_track_desc">Elektu dosieron de spuro al kiu nova segmento estos aldonita.</string>
     <string name="street_level_imagery">Strat-nivela fotaro</string>
     <string name="plan_route_exit_dialog_descr">Ĉu vi certe volas fermi planadon de kurso sen konservi\? Ĉiuj viaj ŝanĝoj perdiĝos.</string>
     <string name="in_case_of_reverse_direction">Kiam en inversa direkto</string>

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

@@ -3822,7 +3822,7 @@
     <string name="poi_seamark_water_level_above_mwl">Nivel del agua: por encima del nivel medio del agua</string>
     <string name="poi_seamark_water_level_below_mwl">Nivel del agua: por debajo del nivel medio del agua</string>
     <string name="poi_seamark_obstruction">Obstrucción</string>
-    <string name="poi_drinking_water_refill_yes">Recarga de agua potable: sí</string>
+    <string name="poi_drinking_water_refill_yes">Sí</string>
     <string name="poi_drinking_water_refill_no">Recarga de agua potable: no</string>
     <string name="poi_drinking_water_refill_network">Red de recarga de agua potable</string>
     <string name="poi_osmand_fire_hydrant_pressure_suction">Succión</string>
@@ -3841,4 +3841,13 @@
     <string name="poi_borough">Municipio</string>
     <string name="poi_traffic_signals_arrow_no">Flecha: no</string>
     <string name="poi_elevator">Ascensor</string>
+    <string name="poi_departures_board_timetable">A horario</string>
+    <string name="poi_departures_board_realtime">En tiempo real</string>
+    <string name="poi_departures_board_delay">Con retraso</string>
+    <string name="poi_departures_board_yes">Sí</string>
+    <string name="poi_departures_board_no">Tablero de partidas: no</string>
+    <string name="poi_departures_board">Tablero de partidas</string>
+    <string name="poi_drinking_water_refill">Recarga de agua potable</string>
+    <string name="poi_recycling_small_electrical_appliances">Pequeños electrodomésticos</string>
+    <string name="poi_beehive">Panal de abejas</string>
 </resources>

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

@@ -2337,7 +2337,8 @@
 \n • Medio Oriente: **
 \n • África: **
 \n • Antártida: *
-\n ¡Más países alrededor del globo están disponibles para descargar! Desde Afganistán a Zimbabue, desde Australia a Estados Unidos. Argentina, Brasil, Canadá, Francia, Alemania, México, Reino Unido, España, …
+\n ¡Más países alrededor del globo están disponibles para descargar!
+\nDesde Afganistán a Zimbabue, desde Australia a Estados Unidos. Argentina, Brasil, Canadá, Francia, Alemania, México, Reino Unido, España, …
 \n</string>
     <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions, y en español, Guía de Navegación Automatizada de OSM) es una aplicación de mapa y navegación con acceso a los datos libres de OSM, en todo el mundo y de alta calidad. 
 \n Disfruta del navegador por voz y óptico, la visualización de PDI (puntos de interés), la creación y gestión de trazas GPX, utiliza la información de visualización y la altitud de las curvas de nivel (mediante un complemento), elige entre modos de automóvil, bicicleta o peatón, edita en OSM y mucho más. 
@@ -3776,7 +3777,7 @@
 \nPulsa en «%2$s», para borrar todos los datos relacionados con los radares de velocidad (alertas, notificaciones y PDI) hasta reinstalar OsmAnd completamente.</string>
     <string name="uninstall_speed_cameras">Desinstalar radares de velocidad</string>
     <string name="speed_camera_pois">PDI de los radares de velocidad</string>
-    <string name="speed_cameras_restart_descr">Se debe reiniciar para borrar completamente los datos de los radares de velocidad.</string>
+    <string name="speed_cameras_restart_descr">Reiniciar la aplicación para borrar todos los datos de los radares de velocidad.</string>
     <string name="shared_string_legal">Legal</string>
     <string name="keep_active">Mantener</string>
     <string name="shared_string_uninstall">Desinstalar</string>
@@ -3791,10 +3792,10 @@
     <string name="routing_attr_length_name">Límite de longitud</string>
     <string name="speed_cameras_removed_descr">Este dispositivo no tiene radares de velocidad.</string>
     <string name="app_mode_inline_skates">Patines en línea</string>
-    <string name="use_volume_buttons_as_zoom_descr">Permite controlar el nivel de zoom del mapa con los botones de volumen del dispositivo.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Controla el nivel de zoom del mapa usando los botones de volumen del dispositivo.</string>
     <string name="use_volume_buttons_as_zoom">Botones de volumen como zoom</string>
     <string name="lenght_limit_description">Proporciona la longitud del vehículo, se pueden aplicar algunas restricciones de rutas para vehículos largos.</string>
-    <string name="quick_action_remove_next_destination">Borrar el siguiente punto de destino</string>
+    <string name="quick_action_remove_next_destination">Borrar el punto de destino más cercano</string>
     <string name="please_provide_point_name_error">Proporciona un nombre para el punto</string>
     <string name="quick_action_remove_next_destination_descr">El punto de destino actual de la ruta será borrado. Si será el destino, la navegación se detendrá.</string>
     <string name="search_download_wikipedia_maps">Descargar datos de Wikipedia</string>
@@ -3805,7 +3806,7 @@
     <string name="app_mode_go_cart">Go-kart</string>
     <string name="osm_edit_closed_note">Nota de OSM cerrada</string>
     <string name="app_mode_wheelchair_forward">Silla de ruedas (hacia adelante)</string>
-    <string name="set_working_days_to_continue">Debes definir los días laborales para continuar</string>
+    <string name="set_working_days_to_continue">Definir los días laborales para continuar</string>
     <string name="route_between_points">Ruta entre puntos</string>
     <string name="plan_a_route">Crear una ruta</string>
     <string name="add_to_a_track">Añadir a una traza</string>
@@ -3821,24 +3822,22 @@
     <string name="plan_route_import_track">Importar traza</string>
     <string name="plan_route_open_existing_track">Abrir traza existente</string>
     <string name="plan_route_create_new_route">Crear nueva ruta</string>
-    <string name="plan_route_select_track_file_for_open">Marca un archivo de traza para abrir.</string>
+    <string name="plan_route_select_track_file_for_open">Marcar un archivo de traza para abrir.</string>
     <string name="shared_string_done">Listo</string>
     <string name="overwrite_track">Sobrescribir traza</string>
     <string name="save_as_new_track">Guardar como nueva traza</string>
     <string name="reverse_route">Ruta inversa</string>
-    <string name="rourte_between_points_next_segment_button_desc">Recalcular sólo el siguiente segmento usando el perfil elegido.</string>
-    <string name="rourte_between_points_whole_track_button_desc">Recalcular toda la traza usando el perfil elegido.</string>
-    <string name="rourte_between_points_desc">Marca cómo conectar los puntos, con una línea recta o calcular una ruta entre ellos con el perfil elegido.</string>
+    <string name="route_between_points_next_segment_button_desc">Recalcular sólo el siguiente segmento usando el perfil elegido.</string>
+    <string name="route_between_points_whole_track_button_desc">Recalcular toda la traza usando el perfil elegido.</string>
+    <string name="route_between_points_desc">Marca cómo conectar los puntos, con una línea recta o calcular una ruta entre ellos como se detalla a continuación.</string>
     <string name="whole_track">Traza completa</string>
     <string name="next_segment">Siguiente segmento</string>
-    <string name="rourte_between_points_warning_desc">Para utilizar esta opción, OsmAnd debe ajustar su traza a los caminos del mapa.
-\n
-\n En el siguiente paso se debe elegir el perfil de navegación para detectar los caminos permitidos y el umbral de distancia para aproximar la traza a los caminos.</string>
+    <string name="route_between_points_warning_desc">A continuación, ajusta la traza al camino permitido más cercano con un perfil de navegación.</string>
     <string name="threshold_distance">Distancia de umbral</string>
     <string name="navigation_profile">Perfil de navegación</string>
-    <string name="rourte_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string>
+    <string name="route_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string>
     <string name="street_level_imagery">Imágenes a nivel de calle</string>
-    <string name="plan_route_exit_dialog_descr">¿Cerrar el plan de ruta sin guardar\? Se perderán todos los cambios.</string>
+    <string name="plan_route_exit_dialog_descr">¿Cerrar el plan de ruta sin guardar\?, se descartarán todos los cambios.</string>
     <string name="in_case_of_reverse_direction">En caso de dirección inversa</string>
     <string name="save_track_to_gpx">Grabar la traza automáticamente al navegar</string>
     <string name="shared_string_gpx_files">Trazas</string>
@@ -3856,7 +3855,7 @@
     <string name="marker_save_as_track">Guardar como archivo de traza</string>
     <string name="follow_track">Seguir traza</string>
     <string name="follow_track_descr">Elige el archivo de la traza a seguir</string>
-    <string name="import_track_descr">Elige el archivo de la traza a seguir o importa una.</string>
+    <string name="import_track_descr">Elige el archivo de la traza a seguir o impórtala desde el dispositivo.</string>
     <string name="select_another_track">Elegir otra traza</string>
     <string name="navigate_to_track_descr">Navegar desde mi ubicación a la traza</string>
     <string name="pass_whole_track_descr">Punto de la traza para navegar</string>
@@ -3872,7 +3871,7 @@
     <string name="plan_route_change_route_type_after">Cambiar el tipo de ruta posterior</string>
     <string name="simplified_track">Traza simplificada</string>
     <string name="shared_string_file_name">Nombre del archivo</string>
-    <string name="monitoring_control_start">GRABAR</string>
+    <string name="monitoring_control_start">Grabar</string>
     <string name="disable_recording_once_app_killed_descrp">La grabación de la traza se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.)</string>
     <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación de viaje sobre el mapa).</string>
     <string name="gpx_monitoring_stop">Pausar grabación del viaje</string>
@@ -3890,4 +3889,19 @@
     <string name="number_of_gpx_files_selected_pattern">%s archivo(s) de trazas marcado(s)</string>
     <string name="one_point_error">Añade al menos dos puntos.</string>
     <string name="shared_string_redo">Rehacer</string>
+    <string name="release_3_8">• Se ha actualizado la función «Planificar ruta»: permite utilizar diferentes tipos de navegación por segmento y la inclusión de trazas
+\n
+\n • Nuevo menú con el aspecto de las trazas: elegir el color, el grosor, mostrar las flechas de dirección y los iconos de inicio/fin.
+\n
+\n • Mejoras en la visibilidad de los nodos de bicicleta.
+\n
+\n • Las trazas ahora se pueden pulsar, contiene un menú contextual con información básica.
+\n
+\n • Algoritmos de búsqueda mejorados
+\n
+\n • Mejoras en las opciones de seguimiento de la navegación
+\n
+\n • Se han solucionado los problemas de la importación y exportación en los ajustes de los perfiles
+\n
+\n</string>
 </resources>

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

@@ -333,7 +333,7 @@
     <string name="poi_doctors">Doctor</string>
     <string name="poi_clinic">Clínica</string>
     <string name="poi_first_aid">Primeros auxilios</string>
-    <string name="poi_dentist">Dentista;Odontólogo</string>
+    <string name="poi_dentist">Dentista;Odontología</string>
     <string name="poi_nursing_home">Asilo de ancianos;Geriátrico</string>
     <string name="poi_baby_hatch">Escotilla de bebé</string>
     <string name="poi_veterinary">Veterinaria</string>
@@ -2309,7 +2309,7 @@
     <string name="poi_health_specialty_maxillofacial_surgery_yes">Cirugía maxilofacial</string>
     <string name="poi_health_specialty_diagnostic_radiology_yes">Radiología diagnóstica</string>
     <string name="poi_health_specialty_gastroenterology_yes">Gastroenterología</string>
-    <string name="poi_health_specialty_dentistry_yes">Odontología</string>
+    <string name="poi_health_specialty_dentistry_yes">Dentista;Odontología</string>
     <string name="poi_health_specialty_nephrology_yes">Nefrología (enfermedades renales)</string>
     <string name="poi_health_specialty_neurosurgery_yes">Neurocirugía</string>
     <string name="poi_health_specialty_neuropsychiatry_yes">Neuropsiquiatría</string>
@@ -3822,7 +3822,7 @@
     <string name="poi_seamark_water_level_above_mwl">Nivel del agua: por encima del nivel medio del agua</string>
     <string name="poi_seamark_water_level_below_mwl">Nivel del agua: por debajo del nivel medio del agua</string>
     <string name="poi_seamark_obstruction">Obstrucción</string>
-    <string name="poi_drinking_water_refill_yes">Recarga de agua potable: sí</string>
+    <string name="poi_drinking_water_refill_yes">Sí</string>
     <string name="poi_drinking_water_refill_no">Recarga de agua potable: no</string>
     <string name="poi_drinking_water_refill_network">Red de recarga de agua potable</string>
     <string name="poi_osmand_fire_hydrant_pressure_suction">Succión</string>
@@ -3841,4 +3841,12 @@
     <string name="poi_borough">Municipio</string>
     <string name="poi_elevator">Ascensor</string>
     <string name="poi_traffic_signals_arrow_no">Flecha: no</string>
+    <string name="poi_recycling_small_electrical_appliances">Pequeños electrodomésticos</string>
+    <string name="poi_drinking_water_refill">Recarga de agua potable</string>
+    <string name="poi_departures_board_yes">Sí</string>
+    <string name="poi_departures_board_timetable">A horario</string>
+    <string name="poi_departures_board_realtime">En tiempo real</string>
+    <string name="poi_departures_board_no">Tablero de partidas: no</string>
+    <string name="poi_departures_board_delay">Con retraso</string>
+    <string name="poi_departures_board">Tablero de partidas</string>
 </resources>

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

@@ -2014,7 +2014,7 @@
     <string name="no_inet_connection_desc_map">Necesario para descargar mapas.</string>
     <string name="search_location">Buscando la ubicación…</string>
     <string name="storage_free_space">Espacio libre</string>
-    <string name="storage_place_description">Almacenamiento de datos de OsmAnd (para mapas, archivos GPX, etc.): %1$s.</string>
+    <string name="storage_place_description">Almacenamiento de datos de OsmAnd (para mapas, archivos de trazas, etc.): %1$s.</string>
     <string name="give_permission">Conceder permiso</string>
     <string name="allow_access_location">Permitir el acceso a la ubicación</string>
     <string name="first_usage_greeting">Obtén direcciones y descubre sitios nuevos sin una conexión a Internet</string>
@@ -2066,8 +2066,8 @@
     <string name="trip_rec_notification_settings">Activar la grabación rápida</string>
     <string name="trip_rec_notification_settings_desc">Muestra una notificación del sistema que permite iniciar la grabación del viaje.</string>
     <string name="shared_string_notifications">Notificaciones</string>
-    <string name="gpx_no_tracks_title">Sin archivos GPX aún</string>
-    <string name="gpx_no_tracks_title_folder">También puedes añadir archivos GPX a la carpeta</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="shared_string_appearance">Aspecto</string>
     <string name="rendering_value_fine_name">Muy fino</string>
@@ -2337,7 +2337,8 @@
 \n • Medio Oriente: **
 \n • África: **
 \n • Antártida: *
-\n ¡Más países alrededor del globo están disponibles para descargar! Desde Afganistán a Zimbabue, desde Australia a Estados Unidos. Argentina, Brasil, Canadá, Francia, Alemania, México, Reino Unido, España, …
+\n ¡Más países alrededor del globo están disponibles para descargar!
+\nDesde Afganistán a Zimbabue, desde Australia a Estados Unidos. Argentina, Brasil, Canadá, Francia, Alemania, México, Reino Unido, España, …
 \n</string>
     <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions, y en español, Guía de Navegación Automatizada de OSM) es una aplicación de mapa y navegación con acceso a los datos libres de OSM, en todo el mundo y de alta calidad. 
 \n Disfruta del navegador por voz y óptico, la visualización de PDI (puntos de interés), la creación y gestión de trazas GPX, utiliza la información de visualización y la altitud de las curvas de nivel (mediante un complemento), elige entre modos de automóvil, bicicleta o peatón, edita en OSM y mucho más. 
@@ -2625,7 +2626,7 @@
     <string name="av_locations_all_desc">Archivo GPX con coordenadas y datos de todas las notas.</string>
     <string name="shared_string_actions">Acciones</string>
     <string name="shared_string_marker">Marcador</string>
-    <string name="osm_recipient_stat">\'%1$s ediciones, suman %2$s mBTC\'</string>
+    <string name="osm_recipient_stat">%1$s ediciones, suman %2$s mBTC</string>
     <string name="osm_recipients_label">Destinatarios de OSM</string>
     <string name="total_donations">Total de donaciones</string>
     <string name="shared_string_without_name">Sin nombre</string>
@@ -2897,10 +2898,10 @@
     <string name="routeInfo_road_types_name">Tipos de caminos</string>
     <string name="exit_at">Bajar en</string>
     <string name="sit_on_the_stop">Esperar en la parada</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas GPX</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas GPX elegidas en el mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Ocultar trazas GPX</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar trazas GPX</string>
+    <string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
+    <string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
+    <string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
     <string name="release_3_3">• Nueva pantalla «Direcciones»: Muestra los botones de destino «Casa» y «Trabajo», el atajo de la «ruta anterior», la lista de trazas, marcadores GPX activos y el historial de búsqueda.
 \n
 \n • Información adicional en «Detalles de la ruta»: Tipos de caminos, superficie, pendiente y suavidad
@@ -3782,17 +3783,17 @@
     <string name="quick_action_showhide_mapillary_descr">Un botón que alterna la capa de Mapillary en el mapa.</string>
     <string name="shared_string_bearing">Rumbo</string>
     <string name="item_deleted">%1$s borrado</string>
-    <string name="speed_cameras_restart_descr">Se debe reiniciar para borrar completamente los datos de los radares de velocidad.</string>
+    <string name="speed_cameras_restart_descr">Reiniciar la aplicación para borrar todos los datos de los radares de velocidad.</string>
     <string name="shared_string_uninstall_and_restart">Desinstalar y reiniciar</string>
     <string name="routing_attr_length_description">Indica la longitud permitida del vehículo en rutas.</string>
     <string name="routing_attr_length_name">Límite de longitud</string>
     <string name="speed_cameras_removed_descr">Este dispositivo no tiene radares de velocidad.</string>
     <string name="app_mode_inline_skates">Patines en línea</string>
-    <string name="use_volume_buttons_as_zoom_descr">Permite controlar el nivel de zoom del mapa con los botones de volumen del dispositivo.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Controla el nivel de zoom del mapa usando los botones de volumen del dispositivo.</string>
     <string name="use_volume_buttons_as_zoom">Botones de volumen como zoom</string>
     <string name="search_download_wikipedia_maps">Descargar datos de Wikipedia</string>
     <string name="quick_action_remove_next_destination_descr">El punto de destino actual de la ruta será borrado. Si será el destino, la navegación se detendrá.</string>
-    <string name="quick_action_remove_next_destination">Borrar el siguiente punto de destino</string>
+    <string name="quick_action_remove_next_destination">Borrar el punto de destino más cercano</string>
     <string name="plugin_wikipedia_description">Obtén información sobre los puntos de interés de Wikipedia. Es tu guía de bolsillo sin conexión - sólo activa el complemento de Wikipedia y disfruta los artículos sobre los objetos de alrededor.</string>
     <string name="please_provide_point_name_error">Proporciona un nombre para el punto</string>
     <string name="lenght_limit_description">Proporciona la longitud del vehículo, se pueden aplicar algunas restricciones de rutas para vehículos largos.</string>
@@ -3801,7 +3802,7 @@
     <string name="track_show_start_finish_icons">Mostrar los iconos de inicio y fin</string>
     <string name="track_coloring_solid">Sólido</string>
     <string name="shared_string_custom">Personalizado</string>
-    <string name="set_working_days_to_continue">Debes definir los días laborales para continuar</string>
+    <string name="set_working_days_to_continue">Definir los días laborales para continuar</string>
     <string name="select_track_width">Elegir la anchura</string>
     <string name="route_between_points">Ruta entre puntos</string>
     <string name="plan_a_route">Crear una ruta</string>
@@ -3834,23 +3835,21 @@
     <string name="save_track_to_gpx">Grabar la traza automáticamente al navegar</string>
     <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación de viaje sobre el mapa).</string>
     <string name="save_as_new_track">Guardar como nueva traza</string>
-    <string name="rourte_between_points_whole_track_button_desc">Recalcular toda la traza usando el perfil elegido.</string>
-    <string name="rourte_between_points_warning_desc">Para utilizar esta opción, OsmAnd debe ajustar su traza a los caminos del mapa.
-\n
-\n En el siguiente paso se debe elegir el perfil de navegación para detectar los caminos permitidos y el umbral de distancia para aproximar la traza a los caminos.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Recalcular sólo el siguiente segmento usando el perfil elegido.</string>
-    <string name="rourte_between_points_desc">Marca cómo conectar los puntos, con una línea recta o calcular una ruta entre ellos con el perfil elegido.</string>
-    <string name="rourte_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string>
+    <string name="route_between_points_whole_track_button_desc">Recalcular toda la traza usando el perfil elegido.</string>
+    <string name="route_between_points_warning_desc">A continuación, ajusta la traza al camino permitido más cercano con un perfil de navegación.</string>
+    <string name="route_between_points_next_segment_button_desc">Recalcular sólo el siguiente segmento usando el perfil elegido.</string>
+    <string name="route_between_points_desc">Marca cómo conectar los puntos, con una línea recta o calcular una ruta entre ellos con el perfil elegido.</string>
+    <string name="route_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string>
     <string name="reverse_route">Ruta inversa</string>
     <string name="quick_action_add_gpx">Añadir punto de referencia de la traza</string>
     <string name="previous_segment">Segmento anterior</string>
     <string name="plan_route_trim_before">Recortar antes</string>
     <string name="plan_route_trim_after">Recortar después</string>
-    <string name="plan_route_select_track_file_for_open">Marca un archivo de traza para abrir.</string>
+    <string name="plan_route_select_track_file_for_open">Marcar un archivo de traza para abrir.</string>
     <string name="plan_route_open_existing_track">Abrir traza existente</string>
     <string name="plan_route_last_edited">Última edición</string>
     <string name="plan_route_import_track">Importar traza</string>
-    <string name="plan_route_exit_dialog_descr">¿Cerrar el plan de ruta sin guardar\? Se perderán todos los cambios.</string>
+    <string name="plan_route_exit_dialog_descr">¿Cerrar el plan de ruta sin guardar\?, se descartarán todos los cambios.</string>
     <string name="plan_route_create_new_route">Crear nueva ruta</string>
     <string name="plan_route_change_route_type_before">Cambiar el tipo de ruta anterior</string>
     <string name="plan_route_change_route_type_after">Cambiar el tipo de ruta posterior</string>
@@ -3863,12 +3862,12 @@
     <string name="nearest_point">Punto más cercano</string>
     <string name="navigation_profile">Perfil de navegación</string>
     <string name="navigate_to_track_descr">Navegar desde mi ubicación a la traza</string>
-    <string name="monitoring_control_start">GRABAR</string>
+    <string name="monitoring_control_start">Grabar</string>
     <string name="marker_save_as_track">Guardar como archivo de traza</string>
     <string name="map_widget_monitoring">Grabación del viaje</string>
     <string name="layer_gpx_layer">Trazas</string>
     <string name="in_case_of_reverse_direction">En caso de dirección inversa</string>
-    <string name="import_track_descr">Elige el archivo de la traza a seguir o importa una.</string>
+    <string name="import_track_descr">Elige el archivo de la traza a seguir o impórtala desde el dispositivo.</string>
     <string name="gpx_monitoring_stop">Pausar grabación del viaje</string>
     <string name="gpx_monitoring_start">Reanudar grabación del viaje</string>
     <string name="follow_track_descr">Elige el archivo de la traza a seguir</string>
@@ -3886,4 +3885,20 @@
     <string name="add_segment_to_the_track">Añadir a un archivo de trazas</string>
     <string name="add_address">Añadir dirección</string>
     <string name="access_hint_enter_address">Ingresar dirección</string>
+    <string name="shared_string_redo">Rehacer</string>
+    <string name="release_3_8">• Se ha actualizado el modo «Planificar ruta»: ahora permite usar diferentes tipos de navegación para cada segmento y adjunta cualquier traza a los caminos
+\n
+\n • Nuevas opciones en el aspecto de las trazas: elegir el color, cambiar el grosor de las flechas de dirección y las marcas de inicio/fin.
+\n
+\n • Mejoras en la visibilidad de los nodos de bicicleta
+\n
+\n • Menú contextual con información básica para las trazas
+\n
+\n • Algoritmos de búsqueda mejorados
+\n
+\n • Mejoras en las opciones de seguimiento de la navegación
+\n
+\n • Se han solucionado los problemas de la importación y exportación en los ajustes de los perfiles
+\n
+\n</string>
 </resources>

OsmAnd/res/values-et/phrases.xml

@@ -3792,7 +3792,7 @@
     <string name="poi_sms">SMS</string>
     <string name="poi_drinking_water_refill_network">Joogivee täitmise võrgustik</string>
     <string name="poi_drinking_water_refill_no">Joogivee täitmine: ei</string>
-    <string name="poi_drinking_water_refill_yes">Joogivee täitmine: jah</string>
+    <string name="poi_drinking_water_refill_yes">Jah</string>
     <string name="poi_seamark_obstruction">Takistus</string>
     <string name="poi_seamark_water_level_below_mwl">Veetase: alla keskmise veetaseme</string>
     <string name="poi_seamark_water_level_above_mwl">Veetase: üle keskmise veetaseme</string>
@@ -3816,4 +3816,13 @@
     <string name="poi_fire_hydrant_pressure_filter">Surve</string>
     <string name="poi_traffic_signals_arrow_no">Nool: ei</string>
     <string name="poi_elevator">Lift</string>
+    <string name="poi_departures_board_timetable">Sõiduplaan</string>
+    <string name="poi_departures_board_realtime">Reaalajas</string>
+    <string name="poi_departures_board_delay">Viivitus</string>
+    <string name="poi_departures_board_yes">Jah</string>
+    <string name="poi_departures_board_no">Väljuvate reiside tabloo: ei</string>
+    <string name="poi_departures_board">Väljuvate reiside tabloo</string>
+    <string name="poi_drinking_water_refill">Joogivee täitmine</string>
+    <string name="poi_recycling_small_electrical_appliances">Väikesed elektriseadmed</string>
+    <string name="poi_beehive">Mesitaru</string>
 </resources>

OsmAnd/res/values-et/strings.xml

@@ -166,7 +166,7 @@
     <string name="quick_action_osmbugs_show">Näita OSM märkmed</string>
     <string name="quick_action_osmbugs_hide">Peida OSM Notes</string>
     <string name="thank_you_for_feedback">Täname sind tagasiside eest</string>
-    <string name="poi_cannot_be_found">Punkti või teed ei leitud.</string>
+    <string name="poi_cannot_be_found">Sõlme või teed ei leidunud.</string>
     <string name="search_no_results_feedback">Otsingutulemused puuduvad\?
 \nJaga tagasisidet</string>
     <string name="increase_search_radius_to">Laienda otsingu raadiust kuni %1$s</string>
@@ -601,10 +601,10 @@
     <string name="step_by_step">Pöörangupõhine</string>
     <string name="exit_at">Välju</string>
     <string name="sit_on_the_stop">Sisene peatuses</string>
-    <string name="quick_action_show_hide_gpx_tracks">Kuva/peida GPX rajad</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Nupp valitud GPX radade kaardil kuvamiseks või peitmiseks.</string>
-    <string name="quick_action_gpx_tracks_hide">Peida GPX rajad</string>
-    <string name="quick_action_gpx_tracks_show">Kuva GPX rajad</string>
+    <string name="quick_action_show_hide_gpx_tracks">Kuva/peida rajad</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Nupp valitud radade kaardil kuvamiseks või peitmiseks.</string>
+    <string name="quick_action_gpx_tracks_hide">Peida rajad</string>
+    <string name="quick_action_gpx_tracks_show">Kuva rajad</string>
     <string name="add_destination_query">Palun määra esmalt sihtkoht</string>
     <string name="use_osm_live_public_transport_description">Luba ühistransport OsmAnd Live muudatustele.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live ühistransport</string>
@@ -891,7 +891,7 @@
     <string name="screen_alerts_descr">Hoiatused kuvatakse navigeerimise ajal all vasakul.</string>
     <string name="switch_profile">Vaheta profiili</string>
     <string name="language_and_output">Keel ja väljund</string>
-    <string name="reset_to_default">Taasta vaikeseaded</string>
+    <string name="reset_to_default">Taasta algväärtused</string>
     <string name="manage_profiles_descr">Loo, impordi, muuda profiile</string>
     <string name="manage_profiles">Halda rakenduse profiile…</string>
     <string name="osmand_settings_descr">Jõus kogu rakenduses</string>
@@ -2673,7 +2673,7 @@
     <string name="routing_attr_width_name">Laiuspiirang</string>
     <string name="routing_attr_width_description">Määra teedel lubatud sõiduki laius.</string>
     <string name="simulate_your_location_gpx_descr">Simuleeri oma asukohta kasutades salvestatud GPX rada.</string>
-    <string name="quick_action_directions_from_desc">Nupp ekraani keskkoha lähtekohaks muutmiseks ja sihtkohta teekonna arvutamiseks või sihtkoha valimise dialoogi avamiseks kui sihtkoha marker puudub kaardil.</string>
+    <string name="quick_action_directions_from_desc">Nupp ekraani keskkoha lähtekohaks muutmiseks. Seejärel on kas võimalik valida sihtkohta või alustada teekonna arvutamist.</string>
     <string name="record_plugin_description">See lisa aktiveerib radade salvestamise funktsionaalsuse, puudutades käsitsi kaardil GPX logimisvidinat või logides automaatselt kõik oma navigeerimise marsruudid GPX faili.
 \n
 \nSalvestatud radu saab jagada oma sõpradega või kasutada OSM kaastöödeks. Sportlased saavad kasutada salvestatud radu oma treeningute jälgimiseks. Mõningast raja põhianalüüsi saab teha otse OsmAnd sees, näiteks ringiajad, keskmine kiirus jne. Lisaks muidugi saab radu hiljem analüüsia ka spetsiaalsetete 3. osapoolte analüüsitööriistadega.</string>
@@ -2706,7 +2706,7 @@
     <string name="osmand_parking_plugin_description">Võimaldab registreerida oma auto parkimiskoha ja jälgida järelejäänud parkimisaega.
 \nNii asukoht kui aeg on nähtavad nii OsmAnd armatuurlaual kui kaardi vidinas. Meeldetuletust saab lisada Androidi kalendrisse.</string>
     <string name="unit_of_length_descr">Muuda kauguse mõõtmise ühikuid.</string>
-    <string name="osmand_distance_planning_plugin_description">See lisa annab kaardi vidina, mis võimaldab teekondade loomist kaarti koputades või olemasolevaid GPX-faile kasutades, et reise kavandada ja punktide vahelist kaugust mõõta. Tulemusi saab salvestada GPX-failina, mida saab hiljem juhendamiseks kasutada.</string>
+    <string name="osmand_distance_planning_plugin_description">Selleks, et reise kavandada ja punktide vahelist kaugust mõõta, loo teekondi kaardil koputades või olemasolevaid GPX-faile kasutades, Tulemusi saad salvestada GPX-failina, mida on hiljem võimalik juhendamiseks kasutada.</string>
     <string name="osmand_accessibility_description">See lisa teeb seadme erivajadusega kasutajatele mõeldud funktsioonid otse OsmAndis kättesaadavaks. See lihtsustab nt. kõnesünteesi häälte kõnekiiruse reguleerimist, ekraanil navigeerimise suuna seadistamist, rulliku kasutamist suurenduse juhtimiseks või kõnesünteesi tagasisidet, näiteks oma asukoha automaatseks teatamiseks.</string>
     <string name="osm_editing_plugin_description">See lisa võimaldab OsmAnd abil OSM kaastöid teha, näiteks OSM huvipunkte luua või muuta, OSM märkmeid avada või kommenteerida ning salvestatud GPX faile lisada. OSM on kogukonna juhitud globaalne üldkasutatav kaardistamisprojekt. Üksikasju leiad https://openstreetmap.org. Aktiivset osalemist hinnatakse ja panust saab teha otse OsmAnd rakendusest, kui seadistada rakenduses oma isiklikud OSM kasutajatunnused.</string>
     <string name="osmand_development_plugin_description">See lisa kuvab arendus- ja silumisfunktsioonide sätteid nagu teekonna arvutamine, renderdamise jõudlus või hääljuhiste testimine ja simuleerimine. Need seaded on mõeldud arendajatele ja pole tavakasutaja jaoks vajalikud.</string>
@@ -3495,7 +3495,7 @@
     <string name="lang_an">Aragoni</string>
     <string name="lang_lmo">Lombardi</string>
     <string name="custom_color">Kohandatud värv</string>
-    <string name="set_working_days_to_continue">Jätkamiseks pead valima tööpäevad</string>
+    <string name="set_working_days_to_continue">Jätkamiseks vali tööpäevad</string>
     <string name="route_between_points">Teekond punktide vahel</string>
     <string name="plan_a_route">Kavanda teekonda</string>
     <string name="add_to_a_track">Lisa rajale</string>
@@ -3552,8 +3552,8 @@
     <string name="quick_action_showhide_mapillary_descr">Nupp, mis näitab või peidab kaardil Mapillary kihti.</string>
     <string name="shared_string_uninstall_and_restart">Eemalda ja taaskäivita</string>
     <string name="app_mode_inline_skates">Rulluisud</string>
-    <string name="quick_action_remove_next_destination">Kustuta järgmine sihtpunkt</string>
-    <string name="use_volume_buttons_as_zoom_descr">Sisselülitades saad seadme helitugevuse nuppudega kontrollida kaardi suumi taset.</string>
+    <string name="quick_action_remove_next_destination">Kustuta lähim sihtpunkt</string>
+    <string name="use_volume_buttons_as_zoom_descr">Nutiseadme helitugevuse nuppudega kontrollida saad kaardi suumi taset.</string>
     <string name="use_volume_buttons_as_zoom">Helitugevuse nupud toimivad suumina</string>
     <string name="please_provide_point_name_error">Palun sisestage punkti nimi</string>
     <string name="search_download_wikipedia_maps">Lae alla Vikipeedia kaardid</string>
@@ -3582,7 +3582,7 @@
     <string name="routing_attr_length_name">Pikkuse piirang</string>
     <string name="shared_string_bearing">Kurss</string>
     <string name="item_deleted">%1$s on kustutatud</string>
-    <string name="speed_cameras_restart_descr">Selleks, et eemaldada kõik kiiruskaamerate andmed on vajalik seadme taaskäivitamine.</string>
+    <string name="speed_cameras_restart_descr">Kiiruskaamerate kõikide andmete eemaldamiseks on vajalik nutiseadme taaskäivitamine.</string>
     <string name="speed_cameras_removed_descr">Siin seadmes puudub teave liikluskaamerate kohta.</string>
     <string name="shared_string_add_profile">Lisa profiil</string>
     <string name="change_application_profile">Muuda rakenduse profiili</string>
@@ -3644,9 +3644,9 @@
     <string name="whole_track">Terve rada</string>
     <string name="next_segment">Järgmine segment</string>
     <string name="navigation_profile">Navigeerimisprofiil</string>
-    <string name="rourte_between_points_add_track_desc">Vali rajafail, millele lisame uue segmendi.</string>
+    <string name="route_between_points_add_track_desc">Vali rajafail, millele lisame uue segmendi.</string>
     <string name="street_level_imagery">Tänavataseme vaated</string>
-    <string name="plan_route_exit_dialog_descr">Kas sa oled kindel et soovid sulgeda teekonna planeerija ilma seda salvestamata\? Kõik muudatused lähevad kaotsi.</string>
+    <string name="plan_route_exit_dialog_descr">Kas sa oled kindel et soovid sulgeda teekonna planeerija ilma seda salvestamata\?</string>
     <string name="in_case_of_reverse_direction">Vastupidise suuna korral</string>
     <string name="reorder_or_hide_from">Muuda järjekorda või peida kirjed %1$s\'st.</string>
     <string name="hidden_items_descr">Need kirjed on menüüs peidetuna, kuid tehtud valikud või lisaprogrammid on jätkuvalt kasutatavad.</string>
@@ -3662,7 +3662,7 @@
     <string name="reset_to_default_category_button_promo">„Lähtesta vaikeseadeteks“ taastab paigaldusjärgse vaikimisi sortimisjärjekorra.</string>
     <string name="developer_plugin">Lisaprogramm arendajale</string>
     <string name="download_unsupported_action">Toiming %1$s ei ole toetatud</string>
-    <string name="rourte_between_points_whole_track_button_desc">Terve rada arvutatakse valitud profiili abil uuesti.</string>
+    <string name="route_between_points_whole_track_button_desc">Terve rada arvutatakse valitud profiili abil uuesti.</string>
     <string name="save_as_new_track">Salvesta uue rajana</string>
     <string name="overwrite_track">Kirjuta rada üle</string>
     <string name="create_poi_link_to_osm_doc"><u>Veebipõhine OSM</u> kaartide klassifikatsioon piltidega.</string>
@@ -3682,7 +3682,7 @@
     <string name="marker_save_as_track">Salvesta rada failina</string>
     <string name="follow_track">Jälgi rada</string>
     <string name="follow_track_descr">Vali rajafail, mida soovid kasutada</string>
-    <string name="import_track_descr">Vali rajafail, mida soovid kasutada või impordi see.</string>
+    <string name="import_track_descr">Vali rajafail, mida soovid kasutada või impordi see oma nutiseadmest.</string>
     <string name="select_another_track">Vali muu rada</string>
     <string name="navigate_to_track_descr">Navigeeri minu asukohast rajale</string>
     <string name="pass_whole_track_descr">Asukoht rajal, kuhu me liigume</string>
@@ -3712,4 +3712,45 @@
     <string name="threshold_distance">Läve kaugus</string>
     <string name="one_point_error">Palun lisa vähemalt kaks punkti.</string>
     <string name="shared_string_redo">Korda tegevust</string>
+    <string name="rearrange_categories">Järjesta kategooriad ümber</string>
+    <string name="shared_string_rendering_style">Visualiseerimise stiil</string>
+    <string name="speed_cameras_legal_descr">Mõnedes riikides või piirkondades on kiiruskaamerate eest hoiatavad rakendused seadusega keelatud,
+\n
+\nVastavalt oma maa seadustele pead sa otsuse tegema.
+\n
+\nValides %1$s sa saad kiiruskaamerate-kohaseid teateid ja hoiatusi.
+\n 
+\nValides %s$s kustutatakse kõik kiiruskaameratega seotud andmed, nagu hoiatused, teated ja huvipunktid seniks, kuni sa OsmAnd\'ile ei tee täiesti uut paigaldust.</string>
+    <string name="quick_action_remove_next_destination_descr">Praegune teekonna vahepunkt saab kustutatud. Kui ta osutub sihtkohaks, siis navigatsioon lõppeb.</string>
+    <string name="plan_route_change_route_type_after">Muuda teekonna tüüpi pärast</string>
+    <string name="plan_route_change_route_type_before">Muuda teekonna tüüpi enne</string>
+    <string name="plan_route_trim_after">Kärbi pärast</string>
+    <string name="plan_route_trim_before">Kärbi enne</string>
+    <string name="attach_to_the_roads">Kinnita teede külge</string>
+    <string name="route_between_points_warning_desc">Selle valiku kasutamiseks mõne oma navigeerimisprofiili kasutamisel kinnita oma rada lähimale lubatud teele.</string>
+    <string name="route_between_points_next_segment_button_desc">Valitud profiili alusel arvutatakse uus teekond vaid järgmise segmendi osas.</string>
+    <string name="main_actions">Põhitegevused</string>
+    <string name="osm_live_payment_subscription_management">Ostu kinnitusel võetakse sinu Google Play kontolt tasu.
+\n
+\nTellimus uuendatakse automaatselt, kui sa seda enne uuendamise kuupäeva ei tühista. Sonu kontolt võetakse pikendamisperioodi eest (kuu/kolm kuud/aasta) tasu ainult uuendamise kuupäeval.
+\n
+\nTellimuste haldamiseks ja tühistamiseks ava Google Play seadistused.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Kiirtegevusi saad eksportida või importida koos rakenduse profiilidega.</string>
+    <string name="delete_all_actions_message_q">Kas sa oled kindel, et soovid pöördumatult kustutada %d kiirtegevust\?</string>
+    <string name="route_between_points_desc">Vali kas soovid ühendada punkte sirge joonega või arvutada nendevahelist teekonda vastavalt oma valitud profiilile.</string>
+    <string name="release_3_8">• Uuendatud teekonnaplaneerija: võimaldab kasutada igal segmendil erinevat liikumisviisi ning radade kaasamist
+\n
+\n • Uus radade kujunduse seadistamise menüü: valida saad värve, joone paksust, suunanoolte kuvamist ning alguse ja lõpu ikoone
+\n
+\n • Rattasõlmede parandatud nähtavus
+\n
+\n • Radasid saad nüüd puudutada, misjärel kuvatakse põhiteabega kontekstimenüü
+\n
+\n • Parandatud on otsingualgoritme
+\n
+\n • Parandatud raja jälgimise valikud navigeerimisel
+\n
+\n • Parandatud on profiili seadistuste impordi ja ekspordiga seotud vead
+\n
+\n</string>
 </resources>

OsmAnd/res/values-eu/strings.xml

@@ -3781,7 +3781,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="gpx_direction_arrows">Norabideko geziak</string>
     <string name="plan_route_create_new_route">Sortu ibilbide berria</string>
     <string name="threshold_distance">Distantzia margena</string>
-    <string name="rourte_between_points_warning_desc">Aukera hau erabiltzeko OsmAnd-ek zure arrastoak mapako errepideetara atxiki behar ditu.
+    <string name="route_between_points_warning_desc">Aukera hau erabiltzeko OsmAnd-ek zure arrastoak mapako errepideetara atxiki behar ditu.
 \n
 \nHurrengo urratsean, nabigazio profila hautatu beharko duzu baimendutako errepideak eta zure arrastoa errepideetara hurbiltzeko distantzia tartea atzemateko.</string>
     <string name="plan_route_last_edited">Editatutako azkena</string>
@@ -3791,12 +3791,12 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="overwrite_track">Gainidatzi arrastoa</string>
     <string name="save_as_new_track">Gorde arrasto berri gisa</string>
     <string name="reverse_route">Alderantzizko ibilbidea</string>
-    <string name="rourte_between_points_whole_track_button_desc">Arrasto osoa birkalkulatuko da hautatutako profilaren bidez.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Bakarrik hurrengo segmentua birkalkulatuko da hautatutako profilaren bidez.</string>
-    <string name="rourte_between_points_desc">Hautatu nola konektatu puntuak, lerro zuzen batez, edo kalkulatu horien arteko ibilbidea hautatutako profilarekin.</string>
+    <string name="route_between_points_whole_track_button_desc">Arrasto osoa birkalkulatuko da hautatutako profilaren bidez.</string>
+    <string name="route_between_points_next_segment_button_desc">Bakarrik hurrengo segmentua birkalkulatuko da hautatutako profilaren bidez.</string>
+    <string name="route_between_points_desc">Hautatu nola konektatu puntuak, lerro zuzen batez, edo kalkulatu horien arteko ibilbidea hautatutako profilarekin.</string>
     <string name="whole_track">Arrasto osoa</string>
     <string name="next_segment">Hurrengo segmentua</string>
     <string name="navigation_profile">Nabigazio profila</string>
-    <string name="rourte_between_points_add_track_desc">Hautatu zein arrasto fitxategiari gehituko zaion segmentu berria.</string>
+    <string name="route_between_points_add_track_desc">Hautatu zein arrasto fitxategiari gehituko zaion segmentu berria.</string>
     <string name="set_working_days_to_continue">Ezarri behar dituzu lanegunak jarraitzeko</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -3843,4 +3843,23 @@
     <string name="plan_route_select_track_file_for_open">یک فایل رد انتخاب کنید تا باز شود.</string>
     <string name="shared_string_done">تمام</string>
     <string name="overwrite_track">بَرنویسی رد</string>
+    <string name="open_saved_track">بازکردن رد ذخیره‌شده</string>
+    <string name="shared_string_is_saved">ذخیره شد</string>
+    <string name="one_point_error">لطفاً حداقل دو نقطه اضافه کنید.</string>
+    <string name="shared_string_redo">ازنو</string>
+    <string name="release_3_8">• قابلیت «طرح‌ریزی مسیر» روزآمد شد: امکان استفاده از شیوهٔ ناوبری متفاوت برای هر پاره از مسیر و در کار آوردن ردها اضافه شده است.
+\n
+\n• منوی جدید «ظاهر» برای ردها: رنگ و ضخامت را مشخص کنید، فلش‌های جهت‌نما و نمادهای آغاز/پایان را نمایش دهید.
+\n
+\n• پدیداری گره‌های شبکهٔ دوچرخه بهبود یافته است.
+\n
+\n• اکنون می‌توان ردها را لمس کرد و منوی زمینه با اطلاعات پایه را مشاهده کرد.
+\n
+\n• الگوریتم «جستجو» بهبود یافته است.
+\n
+\n• گزینه‌های «دنبال‌کردن رد» در ناوبری بهبود یافته است.
+\n
+\n• مشکلاتی مربوط به درون‌برد/برون‌برد تنظیمات پروفایل برطرف شده است.
+\n
+\n</string>
 </resources>

OsmAnd/res/values-fi/strings.xml

@@ -2543,5 +2543,21 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="mapillary_item">OsmAnd + mapillary</string>
     <string name="quick_action_item">Pikatoiminto</string>
     <string name="radius_ruler_item">Sädeviivain</string>
-    <string name="download_unsupported_action">Toimintoa ei tuettu %1$s</string>
+    <string name="download_unsupported_action">Ei tuettu toiminto %1$s</string>
+    <string name="travel_item">Matkailu (Wikivoyage ja Wikipedia)</string>
+    <string name="select_track_file">"Valitse reitti tiedosto "</string>
+    <string name="wiki_menu_download_descr">Lisäkarttoja tarvitaan Wikipedian erikoiskohteiden tarkastelemiseen kartalla.</string>
+    <string name="select_wikipedia_article_langs">Valitse kielet, joilla Wikipedia-artikkelit näkyvät kartalla. Voit vaihtaa kaikkien käytettävissä olevien kielten välillä lukiessasi artikkelia.</string>
+    <string name="some_articles_may_not_available_in_lang">Jotkut Wikipedia-artikkelit eivät välttämättä ole saatavilla omalla kielelläsi.</string>
+    <string name="lang_zhyue">Kantoninkiina</string>
+    <string name="lang_uz">uzbekki</string>
+    <string name="lang_tt">tataari</string>
+    <string name="lang_sco">skotti</string>
+    <string name="lang_ne">nepali</string>
+    <string name="search_poi_types">Etsi POI-tyyppejä</string>
+    <string name="custom_osmand_plugin">Muokattu OsmAnd-laajennus</string>
+    <string name="changes_applied_to_profile">Muutokset lisätty \'%1$s\' profiiliin.</string>
+    <string name="settings_item_read_error">Ei voitu lukea \'%1$s\'.</string>
+    <string name="settings_item_write_error">Ei voitu kirjoittaa \'%1$s\'.</string>
+    <string name="settings_item_import_error">Ei voitu tuoda kohteesta \'%1$s\'.</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -3231,7 +3231,7 @@
     <string name="map_look_descr">Apparence de la carte</string>
     <string name="map_look">Apparence de la carte</string>
     <string name="general_settings_profile_descr">Thème de l\'application, unités, région</string>
-    <string name="reset_to_default">Restaurer les valeurs par défaut</string>
+    <string name="reset_to_default">Rétablir les paramètres par défaut</string>
     <string name="screen_alerts">Alertes visuelles</string>
     <string name="route_parameters_descr">Définir les paramètres de l\'itinéraire</string>
     <string name="route_parameters">Paramètres de l\'itinéraire</string>
@@ -3755,7 +3755,7 @@
 \n
 \nSélectionnez %2$s. Toutes les données relatives aux radars (alertes, notifications, PI) seront supprimées.</string>
     <string name="keep_active">Garder actif</string>
-    <string name="speed_cameras_restart_descr">Un redémarrage est nécessaire pour supprimer complètement les données des radars.</string>
+    <string name="speed_cameras_restart_descr">Redémarrez l\'application pour supprimer les données radars.</string>
     <string name="uninstall_speed_cameras">Désinstaller les radars</string>
     <string name="shared_string_legal">Légal</string>
     <string name="speed_camera_pois">PI radars</string>
@@ -3769,12 +3769,12 @@
     <string name="speed_cameras_removed_descr">Cet appareil n\'a pas de radars.</string>
     <string name="app_mode_inline_skates">Patins à roulettes en ligne</string>
     <string name="use_volume_buttons_as_zoom">Zoomer avec les boutons de volume</string>
-    <string name="use_volume_buttons_as_zoom_descr">Activer pour contrôler le niveau de zoom de la carte avec les boutons de réglage du volume sonore.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Contrôler le niveau de zoom de la carte avec les boutons de réglage du volume sonore.</string>
     <string name="quick_action_remove_next_destination_descr">Le prochain point sur la route va être supprimé. S\'il s\'agit de la destination finale, la navigation s\'arrêtera.</string>
     <string name="lenght_limit_description">Indiquez la longueur de votre véhicule, certaines restrictions d\'itinéraire peuvent s\'appliquer aux véhicules longs.</string>
     <string name="quick_action_remove_next_destination">Supprimer le prochain point</string>
     <string name="please_provide_point_name_error">Merci de renseigner un nom pour le point</string>
-    <string name="plugin_wikipedia_description">Utilisez un guide de poche hors ligne grâce à Wikipédia. Activez le plugin Wikipédia : des points d\'intérêt seront affichés, ils vous permettrons d\'obtenir des informations sur les lieux qui vous entourent.</string>
+    <string name="plugin_wikipedia_description">Utilisez le guide Wikipédia hors ligne. Activez le plugin Wikipédia : des points d\'intérêt seront affichés, ils vous permettrons d\'obtenir des informations sur les lieux qui vous entourent.</string>
     <string name="search_download_wikipedia_maps">Télécharger les cartes Wikipédia</string>
     <string name="app_mode_motor_scooter">Scooter</string>
     <string name="app_mode_enduro_motorcycle">Moto enduro</string>
@@ -3782,7 +3782,7 @@
     <string name="osm_edit_closed_note">Note OSM fermée</string>
     <string name="app_mode_wheelchair">Fauteuil roulant</string>
     <string name="app_mode_wheelchair_forward">Fauteuil roulant vers l\'avant</string>
-    <string name="set_working_days_to_continue">Vous devez définir les jours travaillés avant de poursuivre</string>
+    <string name="set_working_days_to_continue">Définissez les jours travaillés pour continuer</string>
     <string name="route_between_points">Itinéraire entre points</string>
     <string name="plan_a_route">Planifier un itinéraire</string>
     <string name="add_to_a_track">Ajouter à une trace</string>
@@ -3801,13 +3801,11 @@
     <string name="plan_route_select_track_file_for_open">Sélectionnez un fichier de trace à ouvrir.</string>
     <string name="shared_string_done">Terminé</string>
     <string name="overwrite_track">Remplacer la trace</string>
-    <string name="rourte_between_points_desc">Sélectionnez comment relier les points : par une ligne droite ou en calculant un itinéraire avec le profil sélectionné.</string>
-    <string name="rourte_between_points_whole_track_button_desc">Toute la trace sera recalculée en utilisant le profil sélectionné.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Seul le prochain segment sera recalculé en utilisant le profil sélectionné.</string>
-    <string name="rourte_between_points_warning_desc">Pour utiliser cette option, OsmAnd doit aligner votre trace sur les routes de la carte.
-\n
-\n À l\'étape suivante, vous devrez sélectionner le profil de navigation pour détecter les routes autorisées et le seuil de distance pour rapprocher votre trace des routes.</string>
-    <string name="rourte_between_points_add_track_desc">Sélectionnez un fichier de trace auquel ajouter un nouveau segment.</string>
+    <string name="route_between_points_desc">Sélectionnez comment relier les points : par une ligne droite ou en calculant un itinéraire reliant les points comme indiqué ci-dessous.</string>
+    <string name="route_between_points_whole_track_button_desc">Toute la trace sera recalculée en utilisant le profil sélectionné.</string>
+    <string name="route_between_points_next_segment_button_desc">Seul le prochain segment sera recalculé en utilisant le profil sélectionné.</string>
+    <string name="route_between_points_warning_desc">Ensuite, sélectionnez le profil de navigation pour détecter les routes autorisées et le seuil de distance afin de déplacer votre trace.</string>
+    <string name="route_between_points_add_track_desc">Sélectionnez un fichier de trace auquel ajouter un nouveau segment.</string>
     <string name="save_as_new_track">Enregistrer comme nouvelle trace</string>
     <string name="reverse_route">Inverser l\'itinéraire</string>
     <string name="whole_track">Trace entière</string>
@@ -3815,7 +3813,7 @@
     <string name="threshold_distance">Seuil de distance</string>
     <string name="navigation_profile">Profil de navigation</string>
     <string name="street_level_imagery">Photos des rues</string>
-    <string name="plan_route_exit_dialog_descr">Voulez-vous vraiment fermer l\'itinéraire planifié sans enregistrer \? Vous perdrez toutes les modifications.</string>
+    <string name="plan_route_exit_dialog_descr">Voulez-vous vraiment fermer l\'itinéraire planifié sans enregistrer \? (vous perdrez vos modifications)</string>
     <string name="in_case_of_reverse_direction">Si inversion du sens</string>
     <string name="pass_whole_track_descr">Point de la trace vers lequel naviguer</string>
     <string name="shared_string_gpx_route">Enregistrer le parcours</string>
@@ -3831,14 +3829,14 @@
     <string name="shared_string_gpx_files">Traces</string>
     <string name="layer_gpx_layer">Traces</string>
     <string name="show_gpx">Traces</string>
-    <string name="monitoring_control_start">REC</string>
+    <string name="monitoring_control_start">ENR</string>
     <string name="save_track_to_gpx_globally">Enregistrer le parcours dans un fichier GPX</string>
     <string name="map_widget_monitoring">Enregistrement du parcours</string>
     <string name="marker_save_as_track">Enregistrer comme fichier de trace</string>
     <string name="follow_track">Suivre la trace</string>
     <string name="follow_track_descr">Sélectionner un fichier de trace à suivre</string>
     <string name="select_another_track">Sélectionner une autre trace</string>
-    <string name="navigate_to_track_descr">Naviguez de ma position vers la trace</string>
+    <string name="navigate_to_track_descr">Naviguer de ma position vers la trace</string>
     <string name="nearest_point">Point le plus proche</string>
     <string name="delete_address">Supprimer l\'adresse</string>
     <string name="add_address">Ajouter une adresse</string>
@@ -3850,9 +3848,36 @@
     <string name="open_saved_track">Ouvrir une trace enregistrée</string>
     <string name="shared_string_is_saved">a été enregistré</string>
     <string name="one_point_error">Veuillez ajouter au moins deux points.</string>
-    <string name="import_track_descr">Sélectionnez le fichier de trace à suivre ou importez-en un.</string>
+    <string name="import_track_descr">Sélectionnez le fichier de trace à suivre ou importez-le depuis votre appareil.</string>
     <string name="gpx_monitoring_start">Reprendre l\'enregistrement du trajet</string>
     <string name="gpx_monitoring_stop">Suspendre l\'enregistrement du trajet</string>
     <string name="save_global_track_interval_descr">Définit la fréquence d’enregistrement du parcours (enregistrement activé depuis le gadget sur la carte).</string>
     <string name="disable_recording_once_app_killed_descrp">Suspend l\'enregistrement du parcours lorsque l\'application est arrêtée via Applications récentes ; les indications OsmAnd ne seront plus affichées dans la barre de notifications.</string>
+    <string name="all_next_segments_will_be_recalc">Tous les segments suivants seront recalculés avec le profil sélectionné.</string>
+    <string name="all_previous_segments_will_be_recalc">Tous les segments précédents seront recalculés avec le profil sélectionné.</string>
+    <string name="all_next_segments">Tous les segments suivants</string>
+    <string name="previous_segment">Segment précédent</string>
+    <string name="all_previous_segments">Tous les segments précédents</string>
+    <string name="only_selected_segment_recalc">Seul le segment sélectionné sera recalculé avec le profil sélectionné.</string>
+    <string name="release_3_8">• Mise à jour du mode de planification d\'itinéraire autorisant différents types de navigation pour chaque segment et permettant de déplacer n\'importe quelle trace sur les routes
+\n
+\n• Nouvelles options pour l\'apparence des traces : choix de la couleur et de l\'épaisseur des flèches de direction et affichage des marques de départ et d\'arrivée
+\n
+\n• Amélioration de \"bicycle nodes visibility\"
+\n
+\n• Nouveau menu contextuel pour les traces affichant des informations basiques
+\n
+\n• Amélioration de l\'algorithme de recherche
+\n
+\n• Amélioration du suivi des traces lors de la Navigation
+\n
+\n• Correction de l\'import / export des profils
+\n
+\n</string>
+    <string name="plan_route_trim_before">Couper avant</string>
+    <string name="plan_route_trim_after">Couper après</string>
+    <string name="plan_route_change_route_type_before">Modifier le type d’itinéraire avant</string>
+    <string name="plan_route_change_route_type_after">Modifier le type d’itinéraire après</string>
+    <string name="simplified_track_description">Seule la ligne d\'itinéraire sera enregistrée, les points de passage seront supprimés.</string>
+    <string name="shared_string_redo">Rétablir</string>
 </resources>

OsmAnd/res/values-gl/strings.xml

@@ -3839,4 +3839,17 @@ Lon %2$s</string>
     <string name="shared_string_custom">Personalizado</string>
     <string name="gpx_direction_arrows">Frechas de dirección</string>
     <string name="track_coloring_solid">Sólido</string>
+    <string name="gpx_monitoring_stop">Deter a gravación da viaxe</string>
+    <string name="gpx_monitoring_start">Retomar a gravación da viaxe</string>
+    <string name="system_default_theme">Predefinido do sistema</string>
+    <string name="all_next_segments">Todos os segmentos seguintes</string>
+    <string name="previous_segment">Segmento anterior</string>
+    <string name="all_previous_segments">Todos os segmentos anteriores</string>
+    <string name="only_selected_segment_recalc">Só o segmento marcado será recalculado empregando o perfil escollido.</string>
+    <string name="all_next_segments_will_be_recalc">Todos os segmentos seguintes serán recalculados empregando o perfil escollido.</string>
+    <string name="all_previous_segments_will_be_recalc">Todos os segmentos anteriores serán recalculados empregando o perfil escollido.</string>
+    <string name="open_saved_track">Abrir pista gardada</string>
+    <string name="shared_string_is_saved">está gardado</string>
+    <string name="one_point_error">Engade polo menos dous puntos.</string>
+    <string name="shared_string_redo">Refacer</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -1863,7 +1863,7 @@
     <string name="poi_scout_camp">Cserkésztáborhely</string>
     <string name="poi_backcountry">Nomád</string>
     <string name="poi_resort_type">Típus</string>
-    <string name="poi_drive_in">Autós</string>
+    <string name="poi_drive_in">Autós (drive-in)</string>
     <string name="poi_beauty_salon_service">Szolgáltatás</string>
     <string name="poi_recycling_type">Típus</string>
     <string name="poi_recycling_accepted_waste">Elfogadott hulladék</string>
@@ -3050,7 +3050,7 @@
     <string name="poi_wetland_palsa_bog">Dagadóláp (palsa-láp)</string>
     <string name="poi_fuel_100ll">Avgas 100LL repülőbenzin</string>
     <string name="poi_fuel_jeta1">Jet A-1 kerozin</string>
-    <string name="poi_fuel_adblue">AdBlue adalékanyag</string>
+    <string name="poi_fuel_adblue">Diesel kipufogó-folyadék</string>
     <string name="poi_social_facility_outreach">Szolgáltatóközpont hátrányos helyzetűeknek</string>
     <string name="poi_fortification_type_sconce">Erődítmény típusa: földsánc</string>
     <string name="poi_fortification_type_ring_ditch">Erődítmény típusa: újkőkori körárok</string>
@@ -3797,7 +3797,7 @@
     <string name="poi_bowling_alley">Bowling</string>
     <string name="poi_shop_security">Biztonságtechnikai szaküzlet</string>
     <string name="poi_mountain_rescue">Hegyimentő</string>
-    <string name="poi_traffic_signals_arrow_yes">Nincs</string>
+    <string name="poi_traffic_signals_arrow_yes">Van</string>
     <string name="poi_traffic_signals_vibration_yes">Van</string>
     <string name="poi_traffic_signals_vibration_no">Rezgés nincs</string>
     <string name="poi_give_box">Adománygyűjtő doboz</string>
@@ -3808,7 +3808,7 @@
     <string name="poi_fire_hydrant_type_pipe">Cső</string>
     <string name="poi_drinking_water_refill_network">Ivóvíz-utántöltő hálózat</string>
     <string name="poi_drinking_water_refill_no">Ivóvíz-utántöltés nincs</string>
-    <string name="poi_drinking_water_refill_yes">Ivóvíz-utántöltés</string>
+    <string name="poi_drinking_water_refill_yes">van</string>
     <string name="poi_seamark_water_level_below_mwl">Vízszint: közepes vízszint alatt</string>
     <string name="poi_seamark_water_level_above_mwl">Vízszint: közepes vízszint fölött</string>
     <string name="poi_seamark_water_level_floating">Vízszint: lebegő</string>
@@ -3821,4 +3821,16 @@
     <string name="poi_tactile_paving_incorrect">Félrevezető</string>
     <string name="poi_tactile_paving_primitive">Véletlenül használható más elemek</string>
     <string name="poi_tactile_paving_contrasted">Kontrasztos színű</string>
+    <string name="poi_departures_board_timetable">Menetrend</string>
+    <string name="poi_departures_board_realtime">Valós idejű</string>
+    <string name="poi_departures_board_delay">Késés</string>
+    <string name="poi_departures_board_yes">van</string>
+    <string name="poi_departures_board_no">Indulásiidő-kijelző nincs</string>
+    <string name="poi_elevator">Lift</string>
+    <string name="poi_traffic_signals_arrow_no">Nyíl nincs</string>
+    <string name="poi_pump_status_missing_beam">Szivattyú állapota: hiányzik a kar</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Szívás</string>
+    <string name="poi_recycling_small_electrical_appliances">Kis elektronikus készülékek</string>
+    <string name="poi_departures_board">Indulásiidő-kijelző</string>
+    <string name="poi_drinking_water_refill">Ivóvíz-utántöltés</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -134,11 +134,11 @@
     <string name="pref_raster_map">Térképforrás beállítások</string>
     <string name="pref_vector_map">Vektoros térkép beállítások</string>
     <string name="delete_confirmation_msg">Biztosan törli: %1$s\?</string>
-    <string name="city_type_suburb">településrész</string>
-    <string name="city_type_hamlet">falucska</string>
-    <string name="city_type_village">község</string>
-    <string name="city_type_town">város</string>
-    <string name="city_type_city">város</string>
+    <string name="city_type_suburb">Településrész</string>
+    <string name="city_type_hamlet">Falucska</string>
+    <string name="city_type_village">Község</string>
+    <string name="city_type_town">Kisváros</string>
+    <string name="city_type_city">Város</string>
     <string name="animate_route_off">Szimuláció leállítása</string>
     <string name="animate_route">Szimuláció indítása</string>
     <string name="file_can_not_be_renamed">Nem sikerült átnevezni a fájlt.</string>
@@ -350,7 +350,7 @@
     <string name="renderers_descr">Megjelenítési stílus kiválasztása</string>
     <string name="poi_context_menu_website">POI weboldal megtekintése</string>
     <string name="poi_context_menu_call">POI telefonszám megtekintése</string>
-    <string name="website">weboldal</string>
+    <string name="website">Weboldal</string>
     <string name="phone">telefon</string>
     <string name="download_type_to_filter">szűrés</string>
     <string name="use_high_res_maps">Nagy felbontású kijelző</string>
@@ -901,7 +901,7 @@
     <string name="recording_context_menu_play">Lejátszás</string>
     <string name="recording_default_name">Felvétel</string>
     <string name="shared_string_control_start">Indítás</string>
-    <string name="map_widget_av_notes">hang/videojegyzetek</string>
+    <string name="map_widget_av_notes">Hang/videojegyzetek</string>
     <string name="osmand_srtm_short_description_80_chars">OsmAnd-bővítmény offline szintvonalakhoz</string>
     <string name="map_widget_distancemeasurement">Távolságmérés</string>
     <string name="audionotes_plugin_description">Készítsen hang/fénykép/videó jegyzeteket utazás közben egy térképen lévő gomb vagy egy pozíció helyi menüjének használatával.</string>
@@ -1727,7 +1727,7 @@
     <string name="instalation_troubleshooting_item">Telepítés és hibaelhárítás</string>
     <string name="techical_articles_item">Technikai cikkek</string>
     <string name="versions_item">Verziók</string>
-    <string name="feedback">szavazás</string>
+    <string name="feedback">Visszajelzés</string>
     <string name="contact_us">Kapcsolat</string>
     <string name="read_more">Bővebben</string>
     <string name="whats_new">Újdonságok</string>
@@ -2006,7 +2006,7 @@
     <string name="no_inet_connection_desc_map">A térképek letöltéséhez szükséges.</string>
     <string name="search_location">Hely keresése…</string>
     <string name="storage_free_space">Szabad hely</string>
-    <string name="storage_place_description">Az OsmAnd tárolt adatai (térképek, GPX fájlok, stb.): %1$s.</string>
+    <string name="storage_place_description">Az OsmAnd tárolt adatai (térképek, nyomvonalfájlok, stb.): %1$s.</string>
     <string name="give_permission">Engedélyezés</string>
     <string name="allow_access_location">Hozzáférés a pozíciódhoz engedélyezése</string>
     <string name="search_my_location">Pozícióm meghatározása</string>
@@ -2037,8 +2037,8 @@
     <string name="route_roundabout_short">Hajts ki a(z) %1$d kijáraton és menj</string>
     <string name="upload_poi">POI feltöltése</string>
     <string name="route_calculation">Útvonalszámítás</string>
-    <string name="gpx_no_tracks_title">Még nincsenek GPX fájljaid</string>
-    <string name="gpx_no_tracks_title_folder">A mappához GPX-fájlokat is hozzáadhat</string>
+    <string name="gpx_no_tracks_title">Még nincsenek nyomvonalfájljai</string>
+    <string name="gpx_no_tracks_title_folder">A mappához ön is adhat nyomvonalfájlokat</string>
     <string name="gpx_add_track">Továbbiak hozzáadása…</string>
     <string name="shared_string_appearance">Megjelenés</string>
     <string name="trip_rec_notification_settings">Gyors rögzítés bekapcsolása</string>
@@ -2493,9 +2493,9 @@
     <string name="context_menu_points_of_group">A csoport összes pontja</string>
     <string name="open_from">Nyitva ekkortól:</string>
     <string name="open_till">Nyitva eddig:</string>
-    <string name="will_close_at">Ekkor fog bezárni:</string>
-    <string name="will_open_at">Ekkor fog kinyitni:</string>
-    <string name="will_open_on">Ekkor fog kinyitni:</string>
+    <string name="will_close_at">Bezár ekkor:</string>
+    <string name="will_open_at">Kinyit ekkor:</string>
+    <string name="will_open_on">Kinyit ekkor:</string>
     <string name="additional_actions">További műveletek</string>
     <string name="av_locations_selected_desc">GPX fájl a kijelölt jegyzetek koordinátáival és adataival.</string>
     <string name="av_locations_all_desc">GPX fájl az összes jegyzet koordinátáival és adataival.</string>
@@ -2747,8 +2747,8 @@
     <string name="add_intermediate_point">Köztes célpont hozzáadása</string>
     <string name="add_start_point">Kiindulópont megadása</string>
     <string name="intermediate_waypoint">Köztes célpont</string>
-    <string name="transfers">átszállások</string>
-    <string name="on_foot">gyalog</string>
+    <string name="transfers">Átszállások</string>
+    <string name="on_foot">Gyalog</string>
     <string name="route_way">Út</string>
     <string name="points_of_interests">Érdekes helyek (POI)</string>
     <string name="waiting_for_route_calculation">Útvonal tervezése…</string>
@@ -2849,10 +2849,10 @@
     <string name="step_by_step">Részletes navigáció</string>
     <string name="routeInfo_road_types_name">Úttípusok</string>
     <string name="exit_at">Szálljon le itt:</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX-nyomvonalak megjelenítése/elrejtése</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Gomb, amely a térképen megjeleníti vagy elrejti a GPX-nyomvonalakat.</string>
-    <string name="quick_action_gpx_tracks_hide">GPX nyomvonalak elrejtése</string>
-    <string name="quick_action_gpx_tracks_show">GPX nyomvonalak megjelenítése</string>
+    <string name="quick_action_show_hide_gpx_tracks">Nyomvonalak megjelenítése/elrejtése</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Gomb, amely a térképen megjeleníti vagy elrejti a nyomvonalakat.</string>
+    <string name="quick_action_gpx_tracks_hide">Nyomvonalak elrejtése</string>
+    <string name="quick_action_gpx_tracks_show">Nyomvonalak megjelenítése</string>
     <string name="add_destination_query">Először adjon meg egy célpontot</string>
     <string name="release_3_3">"• Új \'Navigáció\' képernyő:  Új gomb az Otthon és Munkahely célpontokhoz, \'előző útvonal\' gyors gomb, az aktív GPX útvonalak és jelölők listája, keresési előzmények
 \n
@@ -3314,7 +3314,7 @@
     <string name="reorder_profiles">Profilok listájának szerkesztése</string>
     <string name="selected_profile">Kiválasztott profil</string>
     <string name="select_base_profile_dialog_message">A létrehozandó egyedi profil az alkalmazás egyik alapprofilján fog alapulni, ez határozza meg az alapvető beállításokat, mint például a widgetek láthatóságát vagy a sebesség és távolság mértékegységeit. Ezek az alapprofilok, néhány pédával az egyedi profilokra, amikre kiterjeszthetők:</string>
-    <string name="get_discount_title">Szerezze meg %1$d %2$s %3$s kedvezménnyel</string>
+    <string name="get_discount_title">Szerezze meg %1$d %2$s %3$s kedvezménnyel.</string>
     <string name="get_discount_first_part">%1$s az első %2$s</string>
     <string name="get_discount_first_few_part">%1$s az első %2$s</string>
     <string name="get_discount_second_part">utána %1$s</string>
@@ -3702,7 +3702,7 @@
     <string name="speed_cameras_alert">Bizonyos országokban a traffipax riasztások törvényileg tiltottak.</string>
     <string name="shared_string_bearing">Tájolás</string>
     <string name="item_deleted">%1$s törölve</string>
-    <string name="speed_cameras_restart_descr">A traffipax adatok végleges eltávolításához újraindítás szükséges.</string>
+    <string name="speed_cameras_restart_descr">A traffipaxadatok végleges törléséhez indítsa újra az alkalmazást.</string>
     <string name="shared_string_uninstall_and_restart">Eltávolítás és Újraindítás</string>
     <string name="routing_attr_length_description">Adja meg az útvonalakon a járművekre vonatkozó hosszkorlátozást.</string>
     <string name="routing_attr_length_name">Hosszkorlátozás</string>
@@ -3728,12 +3728,12 @@
     <string name="monitoring_min_accuracy">Legkisebb pontosság</string>
     <string name="monitoring_min_distance">Legkisebb elmozdulás</string>
     <string name="reset_plugin_to_default">Bővítménybeállítások visszaállítása alapértelmezettre</string>
-    <string name="use_volume_buttons_as_zoom_descr">Engedélyezésével a térkép nagyítási szintje az eszköz hangerőgombjaival állítható.</string>
+    <string name="use_volume_buttons_as_zoom_descr">A térképnagyítás szintjének vezérlése a készülék hangerőgombjaival.</string>
     <string name="use_volume_buttons_as_zoom">Hangerőgombok használata nagyításhoz</string>
     <string name="app_mode_inline_skates">Görkorcsolya</string>
     <string name="please_provide_point_name_error">Kérem, adjon nevet a pontnak</string>
     <string name="lenght_limit_description">Adja meg a járműve hosszát (a hosszú járművekre útvonalkorlátozások vonatkozhatnak).</string>
-    <string name="quick_action_remove_next_destination">Következő célpont törlése</string>
+    <string name="quick_action_remove_next_destination">Legközelebbi célpont törlése</string>
     <string name="search_download_wikipedia_maps">Wikipédia térképek letöltése</string>
     <string name="export_profile_dialog_description">További adatokat is kijelölhet exportálásra a profillal együtt.</string>
     <string name="shared_string_include_data">Kiegészítő adatok átvétele</string>
@@ -3745,14 +3745,14 @@
 \n
 \nAz előfizetéseit a Google Play beállításainál tudja kezelni és lemondani.</string>
     <string name="quick_action_remove_next_destination_descr">Törli az útvonal soron következő célpontját. Amennyiben ez a végző célpont, a navigáció megáll.</string>
-    <string name="plugin_wikipedia_description">Szerezzen információt az érdekes helyekkel kapcsolatban a Wikipédiáról. Ez az ön offline zseb útikönyve - egyszerűen engedélyezze a Wikipédia bővítményt és élvezze az ön körül lévő objektumokról szóló cikkeket.</string>
+    <string name="plugin_wikipedia_description">Tudjon meg többet az érdekes pontokról a Wikipédiából. Ez az Ön offline zsebútikönyve – egyszerűen kapcsolja be a Wikipédia-bővítményt, és élvezze az Ön körüli objektumokról szóló cikkeket.</string>
     <string name="app_mode_enduro_motorcycle">Salakmotor</string>
     <string name="app_mode_motor_scooter">Robogó</string>
     <string name="app_mode_wheelchair">Kerekesszék</string>
     <string name="app_mode_go_cart">Gokart</string>
     <string name="osm_edit_closed_note">Lezárt OSM-jegyzet</string>
     <string name="app_mode_wheelchair_forward">Előre döntött kerekesszék</string>
-    <string name="set_working_days_to_continue">A folytatáshoz adja meg a munkanapokat</string>
+    <string name="set_working_days_to_continue">A folytatáshoz állítsa be a munkanapokat</string>
     <string name="route_between_points">Útvonal pontok között</string>
     <string name="plan_a_route">Útvonaltervezés</string>
     <string name="add_to_a_track">Hozzáadás nyomvonalhoz</string>
@@ -3785,7 +3785,7 @@
     <string name="gpx_split_interval_descr">Válassza ki, hogy a nyomvonalon milyen távolság- vagy időintervallumok jelzései jelenjenek meg.</string>
     <string name="monitoring_min_distance_descr">Ez a szűrő kiküszöböli az ismétlődő pontok rögzítését ott, ahol túl kevés tényleges mozgás történhetett, így szebb lesz a később utólag fel nem dolgozott nyomvonalak térbeli megjelenése.</string>
     <string name="multimedia_rec_split_title">Felvétel vágása</string>
-    <string name="disable_recording_once_app_killed_descrp">Szünetelteti a nyomvonal naplózását, amikor az alkalmazást (később megnyitott alkalmazások) bezárják. (Az OsmAnd háttérjelzése eltűnik az Android értesítési sávjáról.)</string>
+    <string name="disable_recording_once_app_killed_descrp">Szünetelteti a nyomvonal naplózását, amikor az alkalmazást bezárják (a \'mostanában használt alkalmazások\' felületen). (Az OsmAnd háttérjelzése eltűnik az Android értesítési sávjáról.)</string>
     <string name="monitoring_min_speed_descr_recommendation">Javaslat: Először próbálja meg a mozgásérzékelést használni a legkisebb elmozdulást naplózó szűrővel (B). Ez jobb eredményeket hozhat, és kevesebb adatot veszít. Ha a nyomvonalak alacsony sebességnél továbbra is zajosak, próbálkozzon itt nullától eltérő értékekkel. Felhívjuk figyelmét, hogy egyes (hálózatalapú módszereket használó) mérőeszközök egyáltalán nem adnak sebességértéket, így ebben az esetben semmi sem fog rögzülni.</string>
     <string name="street_level_imagery">Utcaszintű képek</string>
     <string name="simplified_track_description">Csak az út vonala lesz elmentve, az útpontok törlődnek.</string>
@@ -3826,7 +3826,7 @@
     <string name="marker_save_as_track">Mentés nyomvonalfájlként</string>
     <string name="select_another_track">Másik nyomvonal kiválasztása</string>
     <string name="open_saved_track">Elmentett nyomvonal megnyitása</string>
-    <string name="import_track_descr">Válassza ki a követni kívánt nyomvonalfájlt, vagy importáljon egyet.</string>
+    <string name="import_track_descr">Válassza ki a követni kívánt nyomvonalfájlt, vagy importáljon egyet a készülékéről.</string>
     <string name="gpx_direction_arrows">Irányt mutató nyilak</string>
     <string name="monitoring_min_distance_descr_recommendation">Javaslat: Az 5 méteres beállítás megfelelő lehet, ha nem szükséges ennél finomabb részleteket rögzítenie, és nyugalmi állapotban sem akar kifejezetten adatokat rögzíteni.</string>
     <string name="next_segment">Következő szakasz</string>
@@ -3834,7 +3834,7 @@
     <string name="simplified_track">Egyszerűsített nyomvonal</string>
     <string name="shared_string_done">Kész</string>
     <string name="shared_string_is_saved">elmentve</string>
-    <string name="rourte_between_points_desc">Jelölje ki, hogyan legyenek összekötve a pontok: egyenes vonallal vagy a kiválasztott profilnak megfelelően kiszámított útvonallal.</string>
+    <string name="route_between_points_desc">Jelölje ki, hogyan legyenek összekötve a pontok: egyenes vonallal vagy az alábbiak szerint kiszámított útvonallal.</string>
     <string name="whole_track">Teljes nyomvonal</string>
     <string name="monitoring_min_accuracy_descr_remark">Megjegyzés: Ha a GPS közvetlenül a felvétel előtt ki volt kapcsolva, akkor rosszabb lehet az első mért pont pontossága. A kódban ezért szeretnénk majd talán várni egy-két másodpercet egy pont rögzítése előtt (vagy a 3 egymást követő pont közül a legjobbat rögzíteni vagy valami hasonló), de ezt még nem programoztuk le.</string>
     <string name="delete_address">Cím törlése</string>
@@ -3847,10 +3847,8 @@
     <string name="plan_route_open_existing_track">Meglévő nyomvonal megnyitása</string>
     <string name="track_coloring_solid">Tömör</string>
     <string name="access_hint_enter_address">Adja meg a címet</string>
-    <string name="rourte_between_points_next_segment_button_desc">Csak a következő szakasz lesz újraszámítva a kiválasztott profilnak megfelelően.</string>
-    <string name="rourte_between_points_warning_desc">Ennek a beállításnak a használatához az OsmAndnak hozzá kell tördelnie a nyomvonalát a térképen található utakhoz.
-\n
-\n A következő lépésben ki kell választania a navigációs profilt az engedélyezett utak és a küszöbtávolság észleléséhez, hogy a nyomvonalát közelíteni lehessen az utakhoz.</string>
+    <string name="route_between_points_next_segment_button_desc">Csak a következő szakasz lesz újraszámítva a kiválasztott profilnak megfelelően.</string>
+    <string name="route_between_points_warning_desc">Ezután a beállítás használatához igazítsa a nyomvonalat a legközelebbi úthoz az egyik navigációs profil segítségével.</string>
     <string name="shared_string_custom">Egyedi</string>
     <string name="gpx_monitoring_stop">Utazás rögzítésének szüneteltetése</string>
     <string name="shared_string_save_as_gpx">Mentés új nyomvonalfájlként</string>
@@ -3861,13 +3859,13 @@
     <string name="navigation_profile">Navigációs profil</string>
     <string name="monitoring_min_speed_descr_remark">Megjegyzés a „sebesség &gt; 0” ellenőrzéséhez: A legtöbb GPS lapkakészlet (chipset) csak akkor mutat sebességértéket, ha az algoritmus megállapítja, hogy mozgásban van. Ha nincs mozgás, akkor nem mutatnak sebességet. Ezért ebben a szűrőben a „&gt; 0” beállítás bizonyos értelemben a GPS lapkakészlet mozgásérzékelését használja. De – még ha a rögzítés ideje alatt itt nem is szűrjük – a GPX elemzése során mégis használjuk ezt a funkciót a korrigált távolság meghatározásához, vagyis az abban a mezőben megjelenített érték a mozgás közben rögzített távolság.</string>
     <string name="only_selected_segment_recalc">Csak a kijelölt szakasz lesz újraszámítva a kiválasztott profilnak megfelelően.</string>
-    <string name="plan_route_exit_dialog_descr">Biztos, hogy mentés nélkül bezárja az útvonaltervezőt\? Minden változást elveszít.</string>
+    <string name="plan_route_exit_dialog_descr">Biztos, hogy mentés nélkül bezárja az útvonaltervezőt\? Minden változást elvész.</string>
     <string name="follow_track_descr">Válassza ki a követendő nyomvonalfájlt</string>
     <string name="listed_exist">A felsorolt %1$s már létezik az OsmAndban.</string>
     <string name="all_previous_segments">Minden korábbi szakasz</string>
     <string name="plan_route_select_track_file_for_open">Válassza ki a megnyitni kívánt nyomvonalfájlt.</string>
     <string name="plan_route_change_route_type_before">Útvonaltípus módosítása ez előtt:</string>
-    <string name="rourte_between_points_whole_track_button_desc">A teljes útvonal újra lesz számítva a kiválasztott profilnak megfelelően.</string>
+    <string name="route_between_points_whole_track_button_desc">A teljes útvonal újra lesz számítva a kiválasztott profilnak megfelelően.</string>
     <string name="save_as_new_track">Mentés új nyomvonalként</string>
     <string name="reverse_route">Útvonal megfordítása</string>
     <string name="add_address">Cím hozzáadása</string>
@@ -3877,6 +3875,22 @@
     <string name="monitoring_min_distance_descr_side_effect">Mellékhatások: A nyugalmi periódusok egyáltalán nem vagy csak egy ponttal rögzülnek. Kiszűrhetők a kis (valós) mozgások (pl. az út során egy átvezető út jelzése céljából megtett kitérők). A fájl kevesebb információt tartalmaz az utófeldolgozáshoz és rosszabb a statisztikája, mivel a felvételkor kiszűri a nyilvánvalóan felesleges pontokat, miközben megtarthatja a rossz vétel vagy a GPS lapkakészlet által okozott hibás mintázatok.</string>
     <string name="all_next_segments">Minden későbbi szakasz</string>
     <string name="number_of_gpx_files_selected_pattern">%s nyomvonalfájl kijelölve</string>
-    <string name="rourte_between_points_add_track_desc">Jelölje ki azt a nyomvonalfájlt, amelyhez az új szakasz hozzáadódjék.</string>
+    <string name="route_between_points_add_track_desc">Jelölje ki azt a nyomvonalfájlt, amelyhez az új szakasz hozzáadódjék.</string>
     <string name="show_gpx">Nyomvonalak</string>
+    <string name="shared_string_redo">Mégis</string>
+    <string name="release_3_8">• A Tervezett útvonal mód frissítésével különböző navigációtípusok is használathatók az egyes szakaszokhoz, és bármilyen nyomvonal az utakhoz köthető
+\n
+\n • Új megjelenési lehetőségek a nyomvonalakhoz: válassza ki a színt, a vastagságot, kapcsolja be az iránynyilakat és a kezdő / befejező jeleket
+\n
+\n • A kerékpáros csomópontok jobb láthatósága
+\n
+\n • Helyi menü a nyomvonalak az alapvető adataival
+\n
+\n • Továbbfejlesztett keresési algoritmusok
+\n
+\n • Javított nyomvonalkövetési beállítások a Navigációban
+\n
+\n • Javítva a profilbeállítások importálásával / exportálásával kapcsolatos problémák
+\n
+\n</string>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -3776,9 +3776,9 @@
 \nVeldu %1$s og þú munt fá aðvaranir og ábendingar um hraðamyndavélar. 
 \n
 \nVeldu %2$s: öllum gögnum sem tengjast hraðamyndavélum; t.d. aðvaranir, tilkynningar, staðsetningar o.fl. verður eytt þar til OsmAnd er sett inn aftur frá grunni.</string>
-    <string name="rourte_between_points_add_track_desc">Veldu ferilskrá þar sem nýjum bút verður bætt inn.</string>
-    <string name="rourte_between_points_desc">Veldu hvernig eigi að tengja punkta; með beinni línu eða reikna leið milli þeirra með þessu sniði.</string>
-    <string name="rourte_between_points_whole_track_button_desc">Allur ferillinn verður endurreiknaður með völdu sniði.</string>
+    <string name="route_between_points_add_track_desc">Veldu ferilskrá þar sem nýjum bút verður bætt inn.</string>
+    <string name="route_between_points_desc">Veldu hvernig eigi að tengja punkta; með beinni línu eða reikna leið milli þeirra með þessu sniði.</string>
+    <string name="route_between_points_whole_track_button_desc">Allur ferillinn verður endurreiknaður með völdu sniði.</string>
     <string name="osm_edit_closed_note">Lokaður OSM-minnispunktur</string>
     <string name="whole_track">Allur ferillinn</string>
     <string name="track_show_start_finish_icons">Sýna tákn fyrir upphaf/enda</string>
@@ -3792,7 +3792,7 @@
     <string name="use_volume_buttons_as_zoom_descr">Virkja þetta til að hægt sé að stýra aðdráttarstigi korts með hljóðstyrkshnöppum.</string>
     <string name="routing_attr_length_description">Tilgreindu lengd farartækis sem leyfð er á leiðum.</string>
     <string name="in_case_of_reverse_direction">Ef stefna er öfug</string>
-    <string name="rourte_between_points_next_segment_button_desc">Aðeins næsti bútur verður endurreiknaður með völdu sniði.</string>
+    <string name="route_between_points_next_segment_button_desc">Aðeins næsti bútur verður endurreiknaður með völdu sniði.</string>
     <string name="app_mode_enduro_motorcycle">Enduro-mótorhjól</string>
     <string name="route_between_points">Leið milli punkta</string>
     <string name="next_segment">Næsti bútur</string>
@@ -3858,7 +3858,7 @@
     <string name="access_hint_enter_address">Settu inn heimilisfang</string>
     <string name="import_track_descr">Veldu ferilskrá til að fylgja eða flyttu inn úr tæki.</string>
     <string name="add_segment_to_the_track">Bæta í ferilskrá</string>
-    <string name="rourte_between_points_warning_desc">Til að nota þennan valkost þarf OsmAnd að festa ferilinn þinn við vegi á kortinu.
+    <string name="route_between_points_warning_desc">Til að nota þennan valkost þarf OsmAnd að festa ferilinn þinn við vegi á kortinu.
 \n
 \nÍ næsta skrefi þarftu að velja leiðsagnarsnið svo hægt sé að finna hvaða vegir séu leyfilegir og hvaða þolvik vegalengdar eigi að miða við til að nálga ferilinn þinn við fyrirliggjandi vegi.</string>
     <string name="empty_state_my_tracks">Bæta við ferilskrám</string>

OsmAnd/res/values-it/strings.xml

@@ -563,9 +563,7 @@
     <string name="plugins_screen">Componenti aggiuntivi</string>
     <string name="prefs_plugins_descr">I plugin abilitano funzionalità aggiuntive e impostazioni avanzate.</string>
     <string name="prefs_plugins">Componenti aggiuntivi</string>
-    <string name="osm_editing_plugin_description">Realizza contributi OSM come la creazione o la modifica di PDI OSM, aprendo o commentando note OSM, 
-\ne contribuendo i file GPX registrati in OsmAnd inserendo il tuo nome utente e password.
-\nOpenStreetMap.org è un progetto collaborativo di mappatura globale di dominio pubblico.</string>
+    <string name="osm_editing_plugin_description">Realizza contributi OSM come la creazione o la modifica di PDI OSM, aprendo o commentando note OSM, e contribuendo i file GPX registrati in OsmAnd inserendo il tuo nome utente e password. OpenStreetMap.org è un progetto collaborativo di mappatura globale di dominio pubblico.</string>
     <string name="vector_maps_may_display_faster_on_some_devices">Le mappe vettoriali dovrebbero apparire più velocemente. Su certi dispositivi potrebbero non funzionare bene.</string>
     <string name="play_commands_of_currently_selected_voice">Seleziona una voce e provane gli annunci vocali:</string>
     <string name="debugging_and_development">Sviluppo di OsmAnd</string>
@@ -3823,21 +3821,19 @@
     <string name="plan_route_select_track_file_for_open">Scegli il file di una traccia da aprire.</string>
     <string name="shared_string_done">Fatto</string>
     <string name="navigation_profile">Profilo di navigazione</string>
-    <string name="rourte_between_points_warning_desc">Per utilizzare questa opzione OsmAnd ha bisogno di bloccare la traccia alle strade della mappa.
-\n
-\n Nel prossimo passaggio avrai bisogno di selezionare il profilo di navigazione per determinare le strade permesse e la soglia della distanza per approssimare la strada alle strade.</string>
-    <string name="rourte_between_points_desc">Scegli come collegare i punti, con una linea retta, o calcolando un percorso che li colleghi utilizzando il profilo scelto.</string>
+    <string name="route_between_points_warning_desc">Poi approssima la traccia alle strade più vicine permesse da uno dei tuoi profili di navigazione per utilizzare questa opzione.</string>
+    <string name="route_between_points_desc">Scegli come collegare i punti, con una linea retta, o calcolando un percorso che li colleghi utilizzando il profilo scelto.</string>
     <string name="overwrite_track">Sovrascrivi traccia</string>
     <string name="save_as_new_track">Salva come nuova Traccia</string>
     <string name="reverse_route">Inverti il percorso</string>
-    <string name="rourte_between_points_next_segment_button_desc">Solo il nuovo segmento sarà ricalcolato utilizzando il profilo scelto.</string>
-    <string name="rourte_between_points_whole_track_button_desc">Tutta la traccia sarà ricalcolata utilizzando il profilo scelto.</string>
+    <string name="route_between_points_next_segment_button_desc">Solo il nuovo segmento sarà ricalcolato utilizzando il profilo scelto.</string>
+    <string name="route_between_points_whole_track_button_desc">Tutta la traccia sarà ricalcolata utilizzando il profilo scelto.</string>
     <string name="whole_track">Tutta la traccia</string>
     <string name="next_segment">Nuovo segmento</string>
     <string name="threshold_distance">Soglia distanza</string>
-    <string name="rourte_between_points_add_track_desc">Seleziona un file traccia a cui verrà aggiunto un nuovo segmento.</string>
+    <string name="route_between_points_add_track_desc">Seleziona un file traccia a cui verrà aggiunto un nuovo segmento.</string>
     <string name="street_level_imagery">Immagini stradali</string>
-    <string name="plan_route_exit_dialog_descr">Sei sicuro di voler chiudere la Pianificazione del percorso senza salvare\? Perderai tutti i cambiamenti.</string>
+    <string name="plan_route_exit_dialog_descr">Sei sicuro di voler chiudere la Pianificazione del percorso perdendo così le modifiche effettuate\?</string>
     <string name="in_case_of_reverse_direction">In caso di direzione inversa</string>
     <string name="save_track_to_gpx">Registra automaticamente la traccia durante la navigazione</string>
     <string name="shared_string_save_as_gpx">Salva come un nuovo file traccia</string>
@@ -3845,18 +3841,18 @@
     <string name="shared_string_gpx_files">Tracce</string>
     <string name="layer_gpx_layer">Tracce</string>
     <string name="show_gpx">Tracce</string>
-    <string name="monitoring_control_start">GPX</string>
+    <string name="monitoring_control_start">REG</string>
     <string name="save_track_to_gpx_globally">Registra la traccia in un file GPX</string>
     <string name="shared_string_gpx_route">Traccia di un percorso</string>
     <string name="empty_state_my_tracks">Aggiungi dei file traccia</string>
     <string name="empty_state_my_tracks_desc">Importa o registra dei file traccia</string>
     <string name="context_menu_item_add_waypoint">Aggiungi un punto intermedio alla traccia</string>
     <string name="quick_action_add_gpx">Aggiungi un punto intermedio alla traccia</string>
-    <string name="map_widget_monitoring">Registrazione viaggio</string>
+    <string name="map_widget_monitoring">Registrazione percorso</string>
     <string name="marker_save_as_track">Salva come un file traccia</string>
     <string name="follow_track">Segui la traccia</string>
     <string name="follow_track_descr">Scegli il file della traccia da seguire</string>
-    <string name="import_track_descr">Scegli il file della traccia da seguire o importala dal dispositivo.</string>
+    <string name="import_track_descr">Scegli il file della traccia da seguire o importare dal dispositivo.</string>
     <string name="select_another_track">Seleziona un\'altra traccia</string>
     <string name="navigate_to_track_descr">Naviga dalla mia posizione alla traccia</string>
     <string name="pass_whole_track_descr">Punto della traccia da navigare</string>
@@ -3868,6 +3864,40 @@
     <string name="access_hint_enter_address">Immetti un indirizzo</string>
     <string name="plan_route_trim_before">Taglia prima</string>
     <string name="plan_route_trim_after">Taglia dopo</string>
-    <string name="plan_route_change_route_type_before">Cambia il tipo di percorso prima</string>
-    <string name="plan_route_change_route_type_after">Cambia il tipo di percorso dopo</string>
+    <string name="plan_route_change_route_type_before">Cambia il tipo di percorso precedente</string>
+    <string name="plan_route_change_route_type_after">Cambia il tipo di percorso seguente</string>
+    <string name="simplified_track_description">Solo la linea del percorso verrà salvata, i punti intermedi saranno cancellati.</string>
+    <string name="shared_string_file_name">Nome del file</string>
+    <string name="number_of_gpx_files_selected_pattern">%s file traccia selezionati</string>
+    <string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione della traccia quando l\'applicazione viene terminata (attraverso le app recenti). (L\'indicazione di OsmAnd in background scomparirà dalla barra delle notifiche di Android.)</string>
+    <string name="save_global_track_interval_descr">Specifica l\'intervallo di registrazione per la registrazione delle tracce (abilitata attraverso il pulsante di Registrazione del viaggio sulla mappa).</string>
+    <string name="gpx_monitoring_stop">Sospendi la registrazione del viaggio</string>
+    <string name="gpx_monitoring_start">Riprendi la registrazione del viaggio</string>
+    <string name="system_default_theme">Preimpostazioni di sistema</string>
+    <string name="all_next_segments">Tutti i segmenti successivi</string>
+    <string name="previous_segment">Segmento precedente</string>
+    <string name="all_previous_segments">Tutti i segmenti precedenti</string>
+    <string name="only_selected_segment_recalc">Solo il segmento selezionato verrà ricalcolato con il profilo selezionato.</string>
+    <string name="all_next_segments_will_be_recalc">Tutti i segmenti successivi verranno ricalcolati con il profilo selezionato.</string>
+    <string name="all_previous_segments_will_be_recalc">Tutti i segmenti precedenti verranno ricalcolati con il profilo selezionato.</string>
+    <string name="open_saved_track">Apri una traccia salvata</string>
+    <string name="shared_string_is_saved">è stato salvato</string>
+    <string name="one_point_error">Per favore aggiungi almeno due punti.</string>
+    <string name="shared_string_redo">Ripeti</string>
+    <string name="release_3_8">• Aggiornata la modalità Pianificazione dell\'Itinerario che permette l\'utilizzo di diversi profili di navigazione per ogni segmento e incolla le tracce alle strade
+\n
+\n •Nuove opzioni per l\'Aspetto delle tracce: scegli il colore, lo spessore, la visualizzazione delle frecce di direzione, e i marcatori di inizio e fine
+\n
+\n • Migliorata la visibilità dei nodi ciclistici
+\n
+\n • Menù contestuale con informazioni di base
+\n
+\n • Migliorato l\'algoritmo di ricerca
+\n
+\n • Migliorate le opzioni Segui traccia in Navigazione
+\n
+\n • Corretto il problema all\'importa/esporta le impostazioni dei profili
+\n
+\n</string>
+    <string name="simplified_track">Traccia semplificata</string>
 </resources>

OsmAnd/res/values-iw/strings.xml

@@ -3782,7 +3782,7 @@
     <string name="speed_cameras_alert">אזהרות מפני מצלמות מהירות אסורות על פי חוק בחלק מהמדינות.</string>
     <string name="shared_string_bearing">תכווין</string>
     <string name="item_deleted">%1$s נמחקו</string>
-    <string name="speed_cameras_restart_descr">נדרשת הפעלה מחדש כדי למחוק לחלוטין את נתוני מצלמות המהירות.</string>
+    <string name="speed_cameras_restart_descr">הפעלת היישומון מחדש תמחק את כל נתוני מצלמות המהירות.</string>
     <string name="shared_string_uninstall_and_restart">הסרה והפעלה מחדש</string>
     <string name="speed_cameras_legal_descr">בחלק מהמדינות או האזורים השימוש ביישומוני אזהרה מפני מצלמות מהירות אסור על פי חוק.
 \n
@@ -3795,10 +3795,10 @@
     <string name="routing_attr_length_description">נא לציין את אורך כלי הרכב כדי לבדוק מסלולים מורשים.</string>
     <string name="routing_attr_length_name">מגבלת אורך</string>
     <string name="speed_cameras_removed_descr">למכשיר הזה אין מצלמות מהירות.</string>
-    <string name="use_volume_buttons_as_zoom_descr">מאפשר לשלוח ברמת התקריב של המפה עם כפתורי עצמת השמע של המכשיר.</string>
+    <string name="use_volume_buttons_as_zoom_descr">ניתן לשלוט ברמת התקריב של המפה עם כפתורי עצמת השמע של המכשיר.</string>
     <string name="use_volume_buttons_as_zoom">כפתורי עצמת שמע כתקריב</string>
     <string name="lenght_limit_description">נא לספק את אורך כלי הרכב שלך, מגבלות מסלול מסוימות עשויות לחול על כלי רכב ארוכים.</string>
-    <string name="quick_action_remove_next_destination">מחיקת נקודת היעד הבאה</string>
+    <string name="quick_action_remove_next_destination">מחיקת נקודת היעד הקרובה ביותר</string>
     <string name="please_provide_point_name_error">נא לספק שם לנקודה</string>
     <string name="quick_action_remove_next_destination_descr">נקודת היעד הנוכחית במסלול תימחק. אם זה יהיה היעד, הניווט ייעצר.</string>
     <string name="search_download_wikipedia_maps">הורדת מפות ויקיפדיה</string>
@@ -3809,7 +3809,7 @@
     <string name="app_mode_wheelchair_forward">כסא גלגלים ספורטיבי</string>
     <string name="app_mode_go_cart">קארטינג</string>
     <string name="osm_edit_closed_note">הערת OSM סגורה</string>
-    <string name="set_working_days_to_continue">עליך להגדיר ימי עבודה כדי להמשיך</string>
+    <string name="set_working_days_to_continue">יש להגדיר ימי עבודה כדי להמשיך</string>
     <string name="route_between_points">מסלול בין נקודות</string>
     <string name="plan_a_route">תכנון מסלול</string>
     <string name="add_to_a_track">הוספה למסלול</string>
@@ -3834,15 +3834,15 @@
     <string name="next_segment">המקטע הבא</string>
     <string name="threshold_distance">סף מרחק</string>
     <string name="navigation_profile">פרופיל ניווט</string>
-    <string name="rourte_between_points_add_track_desc">נא לבחור קובץ מסלול שבו יתווסף המקטע החדש.</string>
-    <string name="rourte_between_points_whole_track_button_desc">כל המסלול יחושב מחדש באמצעות הפרופיל הנבחר.</string>
-    <string name="rourte_between_points_next_segment_button_desc">רק המקטע הבא יחושב מחודש באמצעות הפרופיל הנבחר.</string>
-    <string name="rourte_between_points_desc">נא לבחור כיצד לחבר נקודות, בקו ישר, או לחבר מסלול ביניהן עם הפרופיל הנבחר.</string>
-    <string name="rourte_between_points_warning_desc">כדי להשתמש באפשרות זו על OsmAnd להצמיד את המסלול שלך לדרכים שעל המפה.
+    <string name="route_between_points_add_track_desc">נא לבחור קובץ מסלול שבו יתווסף המקטע החדש.</string>
+    <string name="route_between_points_whole_track_button_desc">כל המסלול יחושב מחדש באמצעות הפרופיל הנבחר.</string>
+    <string name="route_between_points_next_segment_button_desc">רק המקטע הבא יחושב מחודש באמצעות הפרופיל הנבחר.</string>
+    <string name="route_between_points_desc">נא לבחור כיצד לחבר נקודות, בקו ישר, או לחבר מסלול ביניהן עם הפרופיל הנבחר.</string>
+    <string name="route_between_points_warning_desc">כדי להשתמש באפשרות זו על OsmAnd להצמיד את המסלול שלך לדרכים שעל המפה.
 \n
 \n בשלב הבא יהיה עליך לבחור בפרופיל ניווט כדי לזהות את הדרכים המורשות ואת סף המרחק כדי להעריך את המסלול שלך ביחס לדרכים.</string>
     <string name="street_level_imagery">תמונות ברמת רחוב</string>
-    <string name="plan_route_exit_dialog_descr">לסגור את תכנון המסלול בלי לשמור\? כל השינויים שלך יאבדו.</string>
+    <string name="plan_route_exit_dialog_descr">להתעלם מהשינויים במסלול המתוכנן על ידי סגירתו\?</string>
     <string name="in_case_of_reverse_direction">במקרה של כיוון הפוך</string>
     <string name="shared_string_save_as_gpx">שמירה כקובץ מסלול חדש</string>
     <string name="add_segment_to_the_track">הוספה לקובץ מסלול</string>
@@ -3860,7 +3860,7 @@
     <string name="marker_save_as_track">שמירה כקובץ מסלול</string>
     <string name="follow_track">מעקב אחר מסלול</string>
     <string name="follow_track_descr">בחירת קובץ מסלול למעקב</string>
-    <string name="import_track_descr">נא לבחור בקובץ מסלול לעקוב אחריו או לייבא אחד כזה.</string>
+    <string name="import_track_descr">נא לבחור בקובץ מסלול לעקוב אחריו או לייבא אותו מהמכשיר שלך.</string>
     <string name="select_another_track">בחירת מסלול אחר</string>
     <string name="navigate_to_track_descr">לנווט מהמיקום שלי אל המסלול</string>
     <string name="pass_whole_track_descr">נקודה במסלול לניווט</string>

OsmAnd/res/values-ja/strings.xml

@@ -472,7 +472,7 @@ POIの更新は利用できません</string>
     <string name="poi_dialog_comment_default">POI 変更</string>
     <string name="poi_dialog_other_tags_message">他のタグは全て保存されました</string>
     <string name="default_buttons_commit">コミット</string>
-    <string name="shared_string_clear">削除する</string>
+    <string name="shared_string_clear">削除</string>
     <string name="filter_current_poiButton">フィルタ</string>
     <string name="edit_filter_save_as_menu_item">名前をつけて保存</string>
     <string name="edit_filter_delete_dialog_title">選択したフィルタを削除しますか?</string>
@@ -2703,7 +2703,7 @@ POIの更新は利用できません</string>
     <string name="wikivoyage_travel_guide_descr">インターネットへ接続せずにOsmAnd上で地球上のあらゆる興味深いスポットのガイドを利用することができます。</string>
     <string name="in_app_purchase">アプリ内課金</string>
     <string name="in_app_purchase_desc">1回払い</string>
-    <string name="in_app_purchase_desc_ex">買いきり購入の場合、期限を気にせず利用できるようになります。</string>
+    <string name="in_app_purchase_desc_ex">買いきりの場合、期限を問わず利用可能です。</string>
     <string name="purchase_unlim_title">購入 - %1$s</string>
     <string name="wikivoyage_offline">Wikivoyageオフライン</string>
     <string name="contour_lines_hillshade_maps">等高線と陰影起伏図</string>
@@ -3733,17 +3733,17 @@ POIの更新は利用できません</string>
     <string name="overwrite_track">経路を上書き</string>
     <string name="save_as_new_track">新しい経路として保存</string>
     <string name="reverse_route">ルート反転</string>
-    <string name="rourte_between_points_next_segment_button_desc">選択したプロファイルを使用して、次のセグメントのみ再計算します。</string>
-    <string name="rourte_between_points_whole_track_button_desc">選択したプロファイルを使用して、経路全体が再計算されます。</string>
-    <string name="rourte_between_points_desc">直線で地点間をつなげる方法をとるか、選択したプロファイルで地点間のルートを計算します。</string>
+    <string name="route_between_points_next_segment_button_desc">選択したプロファイルを使用して、次のセグメントのみ再計算します。</string>
+    <string name="route_between_points_whole_track_button_desc">選択したプロファイルを使用して、経路全体が再計算されます。</string>
+    <string name="route_between_points_desc">直線で地点間をつなげる方法をとるか、選択したプロファイルで地点間のルートを計算します。</string>
     <string name="whole_track">全経路</string>
     <string name="next_segment">次のセグメント</string>
-    <string name="rourte_between_points_warning_desc">このオプションを使用するには、OsmAndで経路をマップ上の道路にスナップする必要があります。
+    <string name="route_between_points_warning_desc">このオプションを使用するには、OsmAndで経路をマップ上の道路にスナップする必要があります。
 \n
 \n次にナビゲーションプロファイルを選択して、利用予定の道路(一般道、高速道路)と、道路を追跡するおおよその距離を検出する必要があります。</string>
     <string name="threshold_distance">限界距離</string>
     <string name="navigation_profile">ナビゲーションプロファイル</string>
-    <string name="rourte_between_points_add_track_desc">新しいセグメントを追加するための経路ファイルを選択します。</string>
+    <string name="route_between_points_add_track_desc">新しいセグメントを追加するための経路ファイルを選択します。</string>
     <string name="street_level_imagery">ストリート画像</string>
     <string name="plan_route_exit_dialog_descr">保存せずにルート計画を終了した場合すべての変更が失われます。よろしいですか？</string>
     <string name="app_mode_enduro_motorcycle">エンデューロバイク</string>
@@ -3797,7 +3797,7 @@ POIの更新は利用できません</string>
 \n%1$sを選択すると、スピードカメラに関するアラートと警告が表示されます。
 \n
 \n%2$sを選択すると、スピードカメラに関するすべてのデータ(警告、通知、POI)が、OsmAndの再インストールを行うまで削除されます。</string>
-    <string name="keep_active">アクティブを維持</string>
+    <string name="keep_active">機能を維持</string>
     <string name="shared_string_uninstall">アンインストール</string>
     <string name="speed_cameras_alert">一部の国では、スピードカメラの事前警告は法律で禁止されています。</string>
     <string name="screen_timeout_descr">\"%1$s\"がオンの場合、設定された動作時間はそちらに依存します。</string>
@@ -3820,7 +3820,7 @@ POIの更新は利用できません</string>
     <string name="routing_attr_length_name">長さ制限</string>
     <string name="shared_string_bearing">ベアリング</string>
     <string name="item_deleted">%1$sを削除しました</string>
-    <string name="speed_cameras_restart_descr">スピードカメラのデータを完全に削除するには、再起動が必要です。</string>
+    <string name="speed_cameras_restart_descr">アプリを再起動し、すべてのスピードカメラデータを削除します。</string>
     <string name="shared_string_uninstall_and_restart">アンインストールして再起動</string>
     <string name="speed_cameras_removed_descr">このアプリには、スピードカメラに関する情報はありません。</string>
     <string name="app_mode_inline_skates">インラインスケート</string>
@@ -3835,7 +3835,7 @@ POIの更新は利用できません</string>
     <string name="shared_string_gpx_files">経路</string>
     <string name="layer_gpx_layer">経路</string>
     <string name="show_gpx">経路</string>
-    <string name="monitoring_control_start">GPX</string>
+    <string name="monitoring_control_start">REC</string>
     <string name="save_track_to_gpx_globally">GPXファイルへの経路ログ</string>
     <string name="shared_string_gpx_route">ルート経路</string>
     <string name="empty_state_my_tracks">経路ファイルを追加</string>
@@ -3860,4 +3860,40 @@ POIの更新は利用できません</string>
     <string name="plan_route_trim_after">後でトリミング</string>
     <string name="plan_route_change_route_type_before">先にルートタイプを変更</string>
     <string name="plan_route_change_route_type_after">後でルートタイプを変更</string>
+    <string name="get_discount_second_part">次年度以降 %1$s</string>
+    <string name="get_discount_first_few_part">初%2$s度 %1$s</string>
+    <string name="get_discount_first_part">初%2$s度 %1$s</string>
+    <string name="gpx_monitoring_stop">ルート記録を一時停止</string>
+    <string name="gpx_monitoring_start">ルート記録を続行</string>
+    <string name="system_default_theme">システムのデフォルト</string>
+    <string name="all_next_segments_will_be_recalc">以後のすべてのセグメントは、選択したプロファイルを使用して再計算されます。</string>
+    <string name="all_next_segments">以後のすべてのセグメント</string>
+    <string name="previous_segment">前のセグメント</string>
+    <string name="all_previous_segments">以前のすべてのセグメント</string>
+    <string name="only_selected_segment_recalc">選択したセグメントのみ、選択したプロファイルを使用して再計算されます。</string>
+    <string name="all_previous_segments_will_be_recalc">以前のセグメントは、選択したプロファイルを使用して再計算されます。</string>
+    <string name="open_saved_track">保存した経路を開く</string>
+    <string name="one_point_error">少なくとも2つの地点を追加してください。</string>
+    <string name="shared_string_redo">繰り返し</string>
+    <string name="release_3_8">• ルート計画機能を更新 : セグメントごとに異なるナビゲーションタイプを使用し、経路として反映することが可能に
+\n
+\n• 経路の新しい外観オプション : 色、太さ、表示方向矢印、開始/終了アイコン選択
+\n
+\n• 自転車ノードの視認性を向上
+\n
+\n• 経路のタップで、基本情報を含むコンテキストメニューの表示
+\n
+\n• 検索アルゴリズムの改善
+\n
+\n• ナビゲーションの追跡オプションの改善
+\n
+\n• プロファイル設定のインポート/エクスポートに関する問題を修正
+\n
+\n</string>
+    <string name="simplified_track">簡略化された経路</string>
+    <string name="simplified_track_description">ルートライン(経路)のみが保存され、経由地点は削除されます。</string>
+    <string name="number_of_gpx_files_selected_pattern">%s個の経路ファイルが選択されました</string>
+    <string name="shared_string_file_name">ファイル名</string>
+    <string name="disable_recording_once_app_killed_descrp">(最近使用したアプリを介して) OsmAndを終了すると、GPXの記録が一時停止されます(バックグラウンドサービスインジケーターがAndroid通知バーから消えます。)</string>
+    <string name="save_global_track_interval_descr">一般的な経路記録の記録間隔を定義します(マップ画面の\'GPX\'ボタンを使用)</string>
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -3705,18 +3705,45 @@
     <string name="plan_route_select_track_file_for_open">Velg en sporfil for åpning.</string>
     <string name="reverse_route">Snu rute</string>
     <string name="overwrite_track">Overskriv spor</string>
-    <string name="rourte_between_points_whole_track_button_desc">Hele sporet vil bli omregnet ved bruk av valgt profil.</string>
-    <string name="rourte_between_points_desc">Velg hvordan punkter skal knyttes sammen, i rett linje, eller utregnet rute mellom dem med valgt profil.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Kun neste segment vil bli omregnet ved bruk av valgt profil.</string>
+    <string name="route_between_points_whole_track_button_desc">Hele sporet vil bli omregnet ved bruk av valgt profil.</string>
+    <string name="route_between_points_desc">Velg hvordan punkter skal knyttes sammen, i rett linje, eller utregnet rute mellom dem med valgt profil.</string>
+    <string name="route_between_points_next_segment_button_desc">Kun neste segment vil bli omregnet ved bruk av valgt profil.</string>
     <string name="whole_track">Hele sporet</string>
     <string name="next_segment">Neste segment</string>
-    <string name="rourte_between_points_warning_desc">For å bruke dette valget må OsmAnd rute sporet ditt til kartveiene.
+    <string name="route_between_points_warning_desc">For å bruke dette valget må OsmAnd rute sporet ditt til kartveiene.
 \n
 \n På neste steg vil du måtte velge navigasjonsprofil for oppdagelse av tillatte veier, og terskeldistanse for å anslå sporet ditt til veier.</string>
-    <string name="rourte_between_points_add_track_desc">Velg en sporfil å legge til det nye segmentet i.</string>
+    <string name="route_between_points_add_track_desc">Velg en sporfil å legge til det nye segmentet i.</string>
     <string name="save_as_new_track">Lagre som nytt spor</string>
     <string name="plan_route_create_new_route">Opprett ny rute</string>
     <string name="shared_string_done">Ferdig</string>
     <string name="threshold_distance">Terskeldistanse</string>
     <string name="navigation_profile">Navigeringsprofil</string>
+    <string name="osm_edit_closed_note">Lukket OSM-notat</string>
+    <string name="empty_state_my_tracks">Legg til sporfiler</string>
+    <string name="empty_state_my_tracks_desc">Importer eller ta opp sporfiler</string>
+    <string name="follow_track">Følg spor</string>
+    <string name="follow_track_descr">Velg sporfil å følge</string>
+    <string name="import_track_descr">Velg sporfil å følge, eller importer en.</string>
+    <string name="select_another_track">Velg et annet spor</string>
+    <string name="start_of_the_track">Starten av sporet</string>
+    <string name="nearest_point">Nærmeste punkt</string>
+    <string name="delete_address">Slett adresse</string>
+    <string name="add_address">Legg til adresse</string>
+    <string name="access_hint_enter_address">Skriv inn adresse</string>
+    <string name="plan_route_change_route_type_before">Endre rutetype før</string>
+    <string name="plan_route_change_route_type_after">Endre rutetype etter</string>
+    <string name="simplified_track">Forenklet spor</string>
+    <string name="shared_string_file_name">Filnavn</string>
+    <string name="system_default_theme">Systemforvalg</string>
+    <string name="all_next_segments">Alle påfølgende segmenter</string>
+    <string name="all_previous_segments">Alle foregående segmenter</string>
+    <string name="previous_segment">Forrige segment</string>
+    <string name="only_selected_segment_recalc">Kun valgt segment vil bli utregnet på ny i valgt profil.</string>
+    <string name="all_next_segments_will_be_recalc">Alle påfølgende segmenter vil bli utregnet på ny i valgt profil.</string>
+    <string name="all_previous_segments_will_be_recalc">Alle tidligere segmenter vil bli utregnet på ny i valgt profil.</string>
+    <string name="open_saved_track">Åpne lagret spor</string>
+    <string name="shared_string_is_saved">har blitt lagret</string>
+    <string name="one_point_error">Legg til minst to punkter.</string>
+    <string name="shared_string_redo">Gjenta</string>
 </resources>

OsmAnd/res/values-night/colors.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="splash_screen_background_color">@color/map_background_color_dark</color>
+    <color name="splash_screen_background_color">@color/list_background_color_dark</color>
 </resources>

OsmAnd/res/values-pl/strings.xml

@@ -3833,11 +3833,11 @@
     <string name="next_segment">Nowy segment</string>
     <string name="threshold_distance">Odległość graniczna</string>
     <string name="navigation_profile">Profil nawigacji</string>
-    <string name="rourte_between_points_add_track_desc">Wybierz plik śladu do którego zostanie dodany nowy segment.</string>
-    <string name="rourte_between_points_whole_track_button_desc">Cała trasa zostanie ponownie wyznaczona przy użyciu wybranego profilu.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Tylko następny segment zostanie ponownie obliczony przy użyciu wybranego profilu.</string>
-    <string name="rourte_between_points_desc">Wybierz sposób łączenia punktów linią prostą lub obliczania trasy między nimi z wybranym profilem.</string>
-    <string name="rourte_between_points_warning_desc">Aby skorzystać z tej opcji, OsmAnd musi przyciągnąć ślad do dróg mapy.
+    <string name="route_between_points_add_track_desc">Wybierz plik śladu do którego zostanie dodany nowy segment.</string>
+    <string name="route_between_points_whole_track_button_desc">Cała trasa zostanie ponownie wyznaczona przy użyciu wybranego profilu.</string>
+    <string name="route_between_points_next_segment_button_desc">Tylko następny segment zostanie ponownie obliczony przy użyciu wybranego profilu.</string>
+    <string name="route_between_points_desc">Wybierz sposób łączenia punktów linią prostą lub obliczania trasy między nimi z wybranym profilem.</string>
+    <string name="route_between_points_warning_desc">Aby skorzystać z tej opcji, OsmAnd musi przyciągnąć ślad do dróg mapy.
 \n
 \nW następnym kroku należy wybrać profil nawigacji w celu wykrycia dozwolonych dróg i odległości progowej w celu przybliżenia śledzenia drogi.</string>
     <string name="street_level_imagery">Zdjęcia z poziomu ulicy</string>

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

@@ -3815,7 +3815,7 @@
     <string name="poi_seamark_water_level_above_mwl">Nível de água: acima do nível médio da água</string>
     <string name="poi_seamark_water_level_below_mwl">Nível de água: abaixo do nível médio da água</string>
     <string name="poi_seamark_obstruction">Obstrução</string>
-    <string name="poi_drinking_water_refill_yes">Recarga de água potável: sim</string>
+    <string name="poi_drinking_water_refill_yes">Sim</string>
     <string name="poi_drinking_water_refill_no">Recarga de água potável: não</string>
     <string name="poi_drinking_water_refill_network">Rede de recarga de água potável</string>
     <string name="poi_osmand_fire_hydrant_pressure_suction">Sucção</string>
@@ -3834,4 +3834,13 @@
     <string name="poi_borough">Burgo</string>
     <string name="poi_traffic_signals_arrow_no">Flecha: não</string>
     <string name="poi_elevator">Elevador</string>
+    <string name="poi_departures_board_timetable">Calendário</string>
+    <string name="poi_departures_board_delay">Demora</string>
+    <string name="poi_departures_board_realtime">Tempo real</string>
+    <string name="poi_departures_board_yes">Sim</string>
+    <string name="poi_departures_board_no">Quadro de partidas: não</string>
+    <string name="poi_departures_board">Quadro de partidas</string>
+    <string name="poi_drinking_water_refill">Recarga de água potável</string>
+    <string name="poi_recycling_small_electrical_appliances">Pequenos aparelhos elétricos</string>
+    <string name="poi_beehive">Colmeia</string>
 </resources>

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

@@ -3776,20 +3776,20 @@
     <string name="speed_cameras_alert">Os alertas de radares de velocidade em alguns países são proibidos por lei.</string>
     <string name="shared_string_bearing">Rolamento</string>
     <string name="item_deleted">%1$s excluído</string>
-    <string name="speed_cameras_restart_descr">É necessário reiniciar para excluir completamente os dados da câmera de velocidade.</string>
+    <string name="speed_cameras_restart_descr">Reinicie o aplicativo para excluir todos os dados da câmera de velocidade.</string>
     <string name="shared_string_uninstall_and_restart">Desinstalar e reiniciar</string>
     <string name="routing_attr_length_description">Especifique o comprimento do veículo a ser permitido nas rotas.</string>
     <string name="routing_attr_length_name">Limite de comprimento</string>
     <string name="speed_cameras_removed_descr">Este dispositivo não possui câmeras de velocidade.</string>
     <string name="app_mode_inline_skates">Patins em linha</string>
-    <string name="use_volume_buttons_as_zoom_descr">Ativar para controlar o nível de zoom do mapa com os botões de volume do dispositivo.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Controle o nível de zoom do mapa usando os botões de volume do dispositivo.</string>
     <string name="use_volume_buttons_as_zoom">Botões de volume como zoom</string>
     <string name="lenght_limit_description">Forneça o comprimento do seu veículo. Algumas restrições de rotas podem ser aplicadas a veículos longos.</string>
-    <string name="quick_action_remove_next_destination">Excluir próximo ponto de destino</string>
+    <string name="quick_action_remove_next_destination">Apagar o ponto de destino mais próximo</string>
     <string name="please_provide_point_name_error">Forneça um nome para o ponto</string>
     <string name="quick_action_remove_next_destination_descr">O ponto de destino atual na rota será excluído. Se for o destino, a navegação será interrompida.</string>
     <string name="search_download_wikipedia_maps">Baixar mapas da Wikipédia</string>
-    <string name="plugin_wikipedia_description">Obter informações sobre pontos de interesse da Wikipédia. É o seu guia de bolso off-line - só ativar o complemento Wikipédia e desfrutar de artigos sobre os elementos ao seu redor.</string>
+    <string name="plugin_wikipedia_description">Obtenha informações sobre pontos de interesse na Wikipédia. É o seu guia offline de bolso - basta ativar o plug-in da Wikipédia e desfrutar dos artigos sobre os objetos ao seu redor.</string>
     <string name="app_mode_enduro_motorcycle">Motocicleta enduro</string>
     <string name="app_mode_motor_scooter">Motoneta</string>
     <string name="app_mode_wheelchair">Cadeira de rodas</string>
@@ -3797,11 +3797,11 @@
     <string name="app_mode_go_cart">Carrinho de compras</string>
     <string name="osm_edit_closed_note">Nota OSM fechada</string>
     <string name="add_to_a_track">Adicionar a uma trilha</string>
-    <string name="set_working_days_to_continue">Você precisa definir dias úteis para continuar</string>
+    <string name="set_working_days_to_continue">Defina dias úteis para continuar</string>
     <string name="route_between_points">Rota entre pontos</string>
     <string name="plan_a_route">Planejar uma rota</string>
     <string name="add_hidden_group_info">O ponto adicionado não será visível no mapa, já que o grupo selecionado está oculto, você pode encontrá-lo em \"%s\".</string>
-    <string name="track_show_start_finish_icons">Mostrar ícones de início e término</string>
+    <string name="track_show_start_finish_icons">Mostrar ícones de início e fim</string>
     <string name="select_track_width">Selecionar largura</string>
     <string name="gpx_split_interval_descr">Selecione o intervalo no qual as marcas com distância ou tempo na pista serão exibidas.</string>
     <string name="gpx_split_interval_none_descr">Selecione a opção de divisão desejada: por tempo ou por distância.</string>
@@ -3812,24 +3812,24 @@
     <string name="plan_route_import_track">Importar trilha</string>
     <string name="plan_route_open_existing_track">Abrir trilha existente</string>
     <string name="plan_route_create_new_route">Criar nova rota</string>
-    <string name="plan_route_select_track_file_for_open">Selecione um arquivo de faixa para abrir.</string>
+    <string name="plan_route_select_track_file_for_open">Selecione um arquivo de trilha para abrir.</string>
     <string name="shared_string_done">Concluído</string>
     <string name="overwrite_track">Substituir trilha</string>
     <string name="save_as_new_track">Salvar como nova trilha</string>
     <string name="reverse_route">Rota reversa</string>
-    <string name="rourte_between_points_whole_track_button_desc">A trilha inteira será recalculada usando o perfil selecionado.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Apenas o próximo segmento será recalculado usando o perfil selecionado.</string>
-    <string name="rourte_between_points_desc">Selecione como conectar pontos, com uma linha reta, ou calcular uma rota entre eles com o perfil selecionado.</string>
+    <string name="route_between_points_whole_track_button_desc">A trilha inteira será recalculada usando o perfil selecionado.</string>
+    <string name="route_between_points_next_segment_button_desc">Apenas o próximo segmento será recalculado usando o perfil selecionado.</string>
+    <string name="route_between_points_desc">Selecione como conectar pontos, por uma linha reta, ou calcular uma rota entre eles conforme especificado abaixo.</string>
     <string name="whole_track">Trilha inteira</string>
     <string name="next_segment">Próximo segmento</string>
-    <string name="rourte_between_points_warning_desc">Para usar esta opção, OsmAnd precisa ajustar sua trilha para as estradas do mapa.
+    <string name="route_between_points_warning_desc">Para usar esta opção, OsmAnd precisa ajustar sua trilha para as estradas do mapa.
 \n
 \n Na próxima etapa, você precisará selecionar o perfil de navegação para detectar as estradas permitidas e a distância limite para aproximar o rastreamento das estradas.</string>
     <string name="threshold_distance">Distância limite</string>
     <string name="navigation_profile">Perfil de navegação</string>
-    <string name="rourte_between_points_add_track_desc">Selecione um arquivo de trilha para o qual um novo segmento será adicionado.</string>
+    <string name="route_between_points_add_track_desc">Selecione um arquivo de trilha para o qual um novo segmento será adicionado.</string>
     <string name="street_level_imagery">Imagens de rua</string>
-    <string name="plan_route_exit_dialog_descr">Tem certeza de que deseja fechar plano de rota sem salvar\? Você perderá todas as alterações.</string>
+    <string name="plan_route_exit_dialog_descr">Tem certeza de que deseja descartar todas as alterações no percurso planejado, fechando-o\?</string>
     <string name="in_case_of_reverse_direction">Em caso de direção reversa</string>
     <string name="shared_string_save_as_gpx">Salvar como novo arquivo de trilha</string>
     <string name="shared_string_gpx_files">Trilhas</string>
@@ -3847,9 +3847,9 @@
     <string name="marker_save_as_track">Salvar como arquivo de trilha</string>
     <string name="follow_track">Seguir a trilha</string>
     <string name="follow_track_descr">Escolha o arquivo de trilha a seguir</string>
-    <string name="import_track_descr">Escolha o arquivo de trilha a seguir ou importe um.</string>
+    <string name="import_track_descr">Escolha o arquivo de trilha a seguir ou importe-o de seu dispositivo.</string>
     <string name="select_another_track">Selecionar outra trilha</string>
-    <string name="navigate_to_track_descr">Navegue de minha localização até a trilha</string>
+    <string name="navigate_to_track_descr">Navegue da minha posição até a trilha</string>
     <string name="pass_whole_track_descr">Ponto da trilha para navegar</string>
     <string name="start_of_the_track">Início da pista</string>
     <string name="nearest_point">Ponto próximo</string>
@@ -3881,4 +3881,19 @@
     <string name="shared_string_is_saved">está salvo</string>
     <string name="one_point_error">Adicione pelo menos dois pontos.</string>
     <string name="shared_string_redo">Refazer</string>
+    <string name="release_3_8">"• Função de planejamento de rota atualizada: permite o uso de diferentes tipos de navegação por segmento e a inclusão de trilhas
+\n
+\n  • Novo menu de aparência para trilhas: selecione cor, espessura, setas de direção de exibição, ícones de início / término
+\n
+\n  • Melhor visibilidade dos nós da bicicleta.
+\n
+\n  • As trilhas agora podem ser tocadas, têm menu de contexto com informações básicas.
+\n
+\n  • Algoritmos de pesquisa aprimorados
+\n
+\n  • Opções de acompanhamento de trilha aprimoradas na navegação
+\n
+\n  • Problemas corrigidos com importação/exportação de configurações de perfil
+\n
+\n"</string>
 </resources>

OsmAnd/res/values-pt/phrases.xml

@@ -3771,7 +3771,7 @@
     <string name="poi_volcano_number_of_eruptions">Quantidade de erupções</string>
     <string name="poi_drinking_water_refill_network">Rede de reabastecimento de água potável</string>
     <string name="poi_drinking_water_refill_no">Reabastecimento de água potável: não</string>
-    <string name="poi_drinking_water_refill_yes">Reabastecimento de água potável: sim</string>
+    <string name="poi_drinking_water_refill_yes">Sim</string>
     <string name="poi_seamark_obstruction">Obstrução</string>
     <string name="poi_seamark_water_level_below_mwl">Nível da água: abaixo do nível médio da água</string>
     <string name="poi_seamark_water_level_above_mwl">Nível da água: acima do nível médio da água</string>
@@ -3819,4 +3819,13 @@
     <string name="poi_give_box">Give-box</string>
     <string name="poi_traffic_signals_arrow_no">Seta: não</string>
     <string name="poi_elevator">Elevador</string>
+    <string name="poi_departures_board_timetable">Calendário</string>
+    <string name="poi_departures_board_realtime">Tempo real</string>
+    <string name="poi_departures_board_delay">Atraso</string>
+    <string name="poi_departures_board_yes">Sim</string>
+    <string name="poi_departures_board_no">Quadro de partidas: não</string>
+    <string name="poi_departures_board">Quadro de partidas</string>
+    <string name="poi_drinking_water_refill">Reabastecimento de água potável</string>
+    <string name="poi_recycling_small_electrical_appliances">Pequenos aparelhos elétricos</string>
+    <string name="poi_beehive">Colmeia</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -650,7 +650,7 @@
     <string name="preferred_locale">Linguagem</string>
     <string name="shared_string_next">Próximo</string>
     <string name="shared_string_previous">Anterior</string>
-    <string name="unit_of_length_descr">Alterar unidade de medida de distância.</string>
+    <string name="unit_of_length_descr">Alterar a unidade de medida de distância.</string>
     <string name="unit_of_length">Unidades de comprimento</string>
     <string name="si_mi_feet">Milhas/pés</string>
     <string name="si_mi_yard">Milhas/jardas</string>
@@ -1908,7 +1908,7 @@
     <string name="mapillary_widget">Widget Mapillary</string>
     <string name="mapillary_widget_descr">Permite contribuir rapidamente para Mapillary.</string>
     <string name="mapillary_descr">Fotos on-line ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
-    <string name="mapillary">Imagens de nível de rua</string>
+    <string name="mapillary">Mapillary</string>
     <string name="plugin_mapillary_descr">Fotos ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
     <string name="private_access_routing_req">O seu destino está localizado numa área de acesso privado. Permitir uso de estradas privadas para esta viagem\?</string>
     <string name="restart_search">Reiniciar pesquisa</string>
@@ -2042,8 +2042,8 @@
     <string name="route_roundabout_short">Use a saída %1$d e continue</string>
     <string name="upload_poi">Enviar Pontos de Interesse (POI)</string>
     <string name="route_calculation">Cálculo da rota</string>
-    <string name="gpx_no_tracks_title">Ainda não tem nenhum percurso</string>
-    <string name="gpx_no_tracks_title_folder">Também pode adicionar ficheiros GPX ao diretório</string>
+    <string name="gpx_no_tracks_title">Ainda não tem nenhuns ficheiros de trilhos</string>
+    <string name="gpx_no_tracks_title_folder">Também pode adicionar ficheiros ao diretório</string>
     <string name="gpx_add_track">Adicionar mais…</string>
     <string name="shared_string_appearance">Aparência</string>
     <string name="trip_rec_notification_settings">Ativar gravação rápida</string>
@@ -2100,7 +2100,7 @@
     <string name="no_inet_connection_desc_map">Necessário para descarregar mapas.</string>
     <string name="search_location">À procura de localização…</string>
     <string name="storage_free_space">Espaço livre</string>
-    <string name="storage_place_description">Armazenamento de dados de OsmAnd (para mapas, ficheiros GPX, etc.): %1$s.</string>
+    <string name="storage_place_description">Armazenamento de dados de OsmAnd (para mapas, ficheiros de trilhos, etc.): %1$s.</string>
     <string name="give_permission">Conceder permissão</string>
     <string name="allow_access_location">Permitir acesso à localização</string>
     <string name="search_my_location">Encontrar a minha posição</string>
@@ -2961,9 +2961,9 @@
     <string name="shared_string_swap">Trocar</string>
     <string name="show_more">Mostrar mais</string>
     <string name="tracks_on_map">Trilhos mostrados</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trajetos GPX</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar trajetos GPX selecionados no mapa.</string>
-    <string name="quick_action_gpx_tracks_hide">Ocultar trajetos GPX</string>
+    <string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trilhos</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar trilhos selecionados no mapa.</string>
+    <string name="quick_action_gpx_tracks_hide">Ocultar trilhos</string>
     <string name="routing_attr_avoid_tram_name">Sem elétricos</string>
     <string name="routing_attr_avoid_tram_description">Evita elétricos</string>
     <string name="routing_attr_avoid_bus_name">Sem autocarros</string>
@@ -2989,7 +2989,7 @@
     <string name="rendering_attr_surface_sett_name">Paralelos</string>
     <string name="rendering_attr_surface_pebblestone_name">Seixos</string>
     <string name="rendering_attr_highway_class_bridleway_name">Caminho para cavaleiros</string>
-    <string name="quick_action_gpx_tracks_show">Mostrar trajetos GPX</string>
+    <string name="quick_action_gpx_tracks_show">Mostrar trilhos</string>
     <string name="add_destination_query">Por favor defina primeiro o destino</string>
     <string name="previous_route">Rota anterior</string>
     <string name="add_home">Adicionar casa</string>
@@ -3239,7 +3239,7 @@
     <string name="screen_alerts_descr">Alertas mostrados no canto inferior esquerdo durante a navegação.</string>
     <string name="switch_profile">Mudar de perfil</string>
     <string name="language_and_output">Idioma e saída</string>
-    <string name="reset_to_default">Redefinir para o padrão</string>
+    <string name="reset_to_default">Redefinir para a predefinição</string>
     <string name="manage_profiles_descr">Criar, importar, editar perfis</string>
     <string name="manage_profiles">Gerir perfis de app…</string>
     <string name="osmand_settings_descr">Afeta toda a app</string>
@@ -3754,15 +3754,15 @@
 \nSelecione %1$s e receberá alertas e avisos sobre radares de velocidade. 
 \n 
 \nSelecione %2$s. Todos os dados relacionados a radares de velocidade: alertas, notificações, POIs serão apagados até que o OsmAnd seja completamente reinstalado.</string>
-    <string name="plugin_wikipedia_description">Obter informações sobre pontos de interesse da Wikipédia. É o seu guia de bolso off-line - falta só ativar o suplemento Wikipédia e desfrutar de artigos sobre os elementos ao seu redor.</string>
+    <string name="plugin_wikipedia_description">Obter informações sobre pontos de interesse da Wikipédia. É o seu guia de bolso off-line - falta só ativar o suplemento de Wikipédia e desfrutar de artigos sobre os elementos ao seu redor.</string>
     <string name="app_mode_motor_scooter">Motoneta</string>
-    <string name="quick_action_remove_next_destination">Apagar próximo ponto de destino</string>
+    <string name="quick_action_remove_next_destination">Apagar o ponto de destino mais próximo</string>
     <string name="search_download_wikipedia_maps">Descarregar mapas da Wikipédia</string>
     <string name="additional_actions_descr">Pode acessar essas ações tocando no botão “%1$s”.</string>
     <string name="shared_string_uninstall">Desinstalar</string>
     <string name="lenght_limit_description">Forneça o comprimento do seu veículo. Algumas restrições de rotas podem ser aplicadas a veículos longos.</string>
     <string name="use_volume_buttons_as_zoom">Botões de volume como zoom</string>
-    <string name="speed_cameras_restart_descr">É necessário reiniciar para excluir completamente os dados da câmera de velocidade.</string>
+    <string name="speed_cameras_restart_descr">Reinicie a app para apagar os dados da câmara de velocidade.</string>
     <string name="item_deleted">%1$s apagado</string>
     <string name="quick_action_showhide_mapillary_descr">Uma alternância para mostrar ou ocultar a camada Mapillary no mapa.</string>
     <string name="vessel_height_warning_link">Definir altura da embarcação</string>
@@ -3796,7 +3796,7 @@
     <string name="shared_string_legal">Legal</string>
     <string name="vessel_height_warning">Pode definir a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="app_mode_wheelchair_forward">Cadeira de rodas para a frente</string>
-    <string name="use_volume_buttons_as_zoom_descr">Ativar para controlar o nível de zoom do mapa com os botões de volume do aparelho.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Controlar o nível de ampliação do mapa pelos botões de volume do aparelho.</string>
     <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
     <string name="uninstall_speed_cameras">Desinstalar radares de velocidade</string>
     <string name="osm_edit_closed_note">Anotaçaõ OSM fechada</string>
@@ -3806,7 +3806,7 @@
     <string name="speed_camera_pois">POIs de radares de velocidade</string>
     <string name="shared_string_resume">Retomar</string>
     <string name="shared_string_bearing">Rolamento</string>
-    <string name="set_working_days_to_continue">Precisa de definir dias úteis para continuar</string>
+    <string name="set_working_days_to_continue">Defina dias úteis para continuar</string>
     <string name="route_between_points">Rota entre pontos</string>
     <string name="plan_a_route">Planejar uma rota</string>
     <string name="add_to_a_track">Adicionar ao trilho</string>
@@ -3827,22 +3827,20 @@
     <string name="overwrite_track">Sobrescrever trilho</string>
     <string name="save_as_new_track">Gravar como novo trilho</string>
     <string name="reverse_route">Rota inversa</string>
-    <string name="rourte_between_points_whole_track_button_desc">O trilho inteiro será recalculado a usar o perfil selecionado.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Somente o próximo segmento será recalculado a usar o perfil selecionado.</string>
-    <string name="rourte_between_points_desc">Selecione como ligar pontos, com uma linha reta ou calcule uma rota entre eles com o perfil selecionado.</string>
+    <string name="route_between_points_whole_track_button_desc">O trilho inteiro será recalculado a usar o perfil selecionado.</string>
+    <string name="route_between_points_next_segment_button_desc">Somente o próximo segmento será recalculado a usar o perfil selecionado.</string>
+    <string name="route_between_points_desc">Selecione como ligar pontos, por uma linha reta ou a calcular uma rota entre eles como especificado abaixo.</string>
     <string name="whole_track">Trilho inteiro</string>
     <string name="next_segment">Próximo segmento</string>
-    <string name="rourte_between_points_warning_desc">Para usar esta opção o OsmAnd precisa de encaixar o seu trilho nas estradas do mapa.
-\n
-\n No passo seguinte, terá de selecionar o perfil de navegação para detetar estradas permitidas e a distância limiar para se aproximar do seu trilho com as estradas.</string>
+    <string name="route_between_points_warning_desc">Em seguida, encaixe a sua pista na estrada mais próxima permitida com um dos seus perfis de navegação para usar esta opção.</string>
     <string name="threshold_distance">Distância limiar</string>
     <string name="navigation_profile">Perfil de navegação</string>
-    <string name="rourte_between_points_add_track_desc">Selecione um ficheiro de faixa para o qual um novo segmento será adicionado.</string>
+    <string name="route_between_points_add_track_desc">Selecione um ficheiro de faixa para o qual um novo segmento será adicionado.</string>
     <string name="follow_track">Seguir a trilha</string>
     <string name="follow_track_descr">Escolha o ficheiro de trilha a seguir</string>
-    <string name="import_track_descr">Escolha o ficheiro de trilha a seguir ou importe-o do aparelho.</string>
+    <string name="import_track_descr">Escolha o ficheiro de trilho a seguir ou importe um do seu aparelho.</string>
     <string name="select_another_track">Selecionar outra trilha</string>
-    <string name="navigate_to_track_descr">Navegue de minha localização até a trilha</string>
+    <string name="navigate_to_track_descr">Navegue de minha posição até ao trilho</string>
     <string name="pass_whole_track_descr">Ponto da trilha para navegar</string>
     <string name="start_of_the_track">Início da pista</string>
     <string name="nearest_point">Ponto próximo</string>
@@ -3855,7 +3853,7 @@
     <string name="plan_route_change_route_type_before">Alterar o tipo de rota antes</string>
     <string name="plan_route_change_route_type_after">Alterar o tipo de rota após</string>
     <string name="street_level_imagery">Imagens de rua</string>
-    <string name="plan_route_exit_dialog_descr">Tem certeza de que deseja fechar plano de rota sem gravar\? Perderá todas as alterações.</string>
+    <string name="plan_route_exit_dialog_descr">Tem certeza que quer descartar todas as mudanças na rota planeada a fecha-la\?</string>
     <string name="in_case_of_reverse_direction">Em caso de direção reversa</string>
     <string name="shared_string_gpx_route">Rota de trilha</string>
     <string name="shared_string_gpx_files">Trilhas</string>
@@ -3870,7 +3868,7 @@
     <string name="layer_gpx_layer">Trilhas</string>
     <string name="context_menu_item_add_waypoint">Adicionar ponto de passagem de trilha</string>
     <string name="map_widget_monitoring">Gravação de viagem</string>
-    <string name="monitoring_control_start">GPX</string>
+    <string name="monitoring_control_start">REC</string>
     <string name="save_global_track_interval_descr">Especifique o intervalo de registo para a gravação geral da faixa (ativado através do widget de gravação Trip no mapa).</string>
     <string name="gpx_monitoring_stop">Pausar a gravação da viagem</string>
     <string name="gpx_monitoring_start">Retomar a gravação da viagem</string>
@@ -3885,4 +3883,24 @@
     <string name="shared_string_is_saved">está gravado</string>
     <string name="one_point_error">Adicione pelo menos dois pontos.</string>
     <string name="shared_string_redo">Refazer</string>
+    <string name="simplified_track">Trilho simplificado</string>
+    <string name="simplified_track_description">Apenas a linha da rota será gravada, os pontos de passagem serão apagados.</string>
+    <string name="shared_string_file_name">Nome do ficheiro</string>
+    <string name="number_of_gpx_files_selected_pattern">%s ficheiros de faixa selecionados</string>
+    <string name="disable_recording_once_app_killed_descrp">Vai pausar o registo de faixas quando a aplicação for morta (através de aplicações recentes). (indicação de fundo de OsmAnd desaparece da barra de notificação do Android.)</string>
+    <string name="release_3_8">- Função atualizada de Planear uma rota: permite utilizar diferentes tipos de navegação por segmento e a inclusão de faixas
+\n
+\n - Novo menu Aparência para trilhos: selecionar cor, espessura, setas de direção de visualização, ícones de início/fim
+\n
+\n - Melhoria da visibilidade dos nós da bicicleta.
+\n
+\n - Os trilhos agora podem ser tocados, ter menu de contexto com informações básicas.
+\n
+\n - Algoritmos de pesquisa melhorados
+\n
+\n - Opções de seguir faixas melhoradas na navegação
+\n
+\n - Problemas com as configurações de importação/exportação de perfis resolvidos
+\n
+\n</string>
 </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -3730,7 +3730,7 @@
     <string name="poi_traffic_signals_sound_locate">Только если разрешена ходьба</string>
     <string name="poi_drinking_water_refill_network">Сеть заправки питьевой воды</string>
     <string name="poi_drinking_water_refill_no">Заправка питьевой водой: нет</string>
-    <string name="poi_drinking_water_refill_yes">Заправка питьевой водой: да</string>
+    <string name="poi_drinking_water_refill_yes">Да</string>
     <string name="poi_socket_type3_yes">Тип 3</string>
     <string name="poi_socket_type2_combo_yes">Тип 2 комбинированный</string>
     <string name="poi_socket_type2_yes">Тип 2</string>
@@ -3822,4 +3822,12 @@
     <string name="poi_give_box">Подарочная коробка</string>
     <string name="poi_traffic_signals_arrow_no">Стрелка: нет</string>
     <string name="poi_elevator">Лифт</string>
+    <string name="poi_departures_board_yes">Да</string>
+    <string name="poi_departures_board_no">Расписание отправлений: нет</string>
+    <string name="poi_departures_board">Расписание отправлений</string>
+    <string name="poi_drinking_water_refill">Заправка питьевой воды</string>
+    <string name="poi_departures_board_realtime">Реальное время</string>
+    <string name="poi_departures_board_delay">Задержка</string>
+    <string name="poi_departures_board_timetable">Расписание</string>
+    <string name="poi_recycling_small_electrical_appliances">Малые электроприборы</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -3783,27 +3783,27 @@
     <string name="shared_string_uninstall">Disinstalla</string>
     <string name="shared_string_bearing">Orientamentu</string>
     <string name="item_deleted">%1$s iscantzelladu</string>
-    <string name="speed_cameras_restart_descr">Depes torrare a allùghere pro iscantzellare de su totu sos datos de sos autovelox.</string>
+    <string name="speed_cameras_restart_descr">Torra a allùghere s\'aplicatzione pro iscantzellare totu sos datos de sos autovelox.</string>
     <string name="shared_string_uninstall_and_restart">Disinstalla e torra a allùghere</string>
     <string name="routing_attr_length_description">Dillinda sa longària de su veìculu permìtida in sas àndalas.</string>
     <string name="routing_attr_length_name">Lìmite de longària</string>
     <string name="speed_cameras_removed_descr">Custu dispositivu non tenet autovelox.</string>
     <string name="app_mode_inline_skates">Pàtinos in lìnia</string>
-    <string name="use_volume_buttons_as_zoom_descr">Abìlita pro controllare su livellu de ismanniamentu cun sos butones de su volume de su dispositivu.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Controlla su livellu de ismanniamentu de sa mapa cun sos butones de su volume de su dispositivu.</string>
     <string name="use_volume_buttons_as_zoom">Butones de su volume pro s\'ismanniamentu</string>
     <string name="lenght_limit_description">Inserta sa longària de su veìculu tuo. Bi diant pòdere èssere unas cantas restritziones de sas àndalas pro sos veìculos longos.</string>
-    <string name="quick_action_remove_next_destination">Iscantzella su puntu de destinatzione imbeniente</string>
+    <string name="quick_action_remove_next_destination">Iscantzella su puntu de destinatzione prus a curtzu</string>
     <string name="please_provide_point_name_error">Fruni unu nùmene pro su puntu</string>
     <string name="quick_action_remove_next_destination_descr">Su puntu de destinatzione atuale in s\'àndala at a èssere iscantzelladu. Si at a èssere sa destinatzione, sa navigatzione s\'at a firmare.</string>
     <string name="search_download_wikipedia_maps">Iscàrriga sas mapas de Wikipedia</string>
-    <string name="plugin_wikipedia_description">Otene informatziones a pitzu de puntos de interesse dae Wikipedia. Est sa ghia non in lìnia tua de mantènnere in butzaca - abìlita s\'estensione Wikipedia e ispassia·ti cun sos artìculos a pitzu de sos ogetos a fùrriu de tie.</string>
+    <string name="plugin_wikipedia_description">Otene informatziones a pitzu de puntos de interesse dae Wikipedia. Est sa ghia non in lìnia tua de mantènnere in butzaca - allughe s\'estensione Wikipedia e ispassia·ti cun sos artìculos a pitzu de sos ogetos a fùrriu de tie.</string>
     <string name="app_mode_enduro_motorcycle">Moto enduro</string>
     <string name="app_mode_motor_scooter">Motorinu</string>
     <string name="app_mode_wheelchair_forward">Cadira a rodas cara a in antis</string>
     <string name="app_mode_wheelchair">Cadira a rodas</string>
     <string name="app_mode_go_cart">Go-kart</string>
     <string name="osm_edit_closed_note">Nota de OSM serrada</string>
-    <string name="set_working_days_to_continue">Depes impostare sas dies de traballu pro sighire</string>
+    <string name="set_working_days_to_continue">Imposta sas dies de traballu pro sighire</string>
     <string name="route_between_points">Àndala intre puntos</string>
     <string name="plan_a_route">Pranìfica un\'àndala</string>
     <string name="add_to_a_track">Annanghe a una rasta</string>
@@ -3824,19 +3824,19 @@
     <string name="overwrite_track">Subraiscrie sa rasta</string>
     <string name="save_as_new_track">Sarva comente una rasta noa</string>
     <string name="reverse_route">Fùrria s\'àndala</string>
-    <string name="rourte_between_points_whole_track_button_desc">Sa rasta intrea at a èssere torrada a calculare impreende su profilu ischertadu.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Petzi su segmentu imbeniente at a èssere torradu a calculare impreende su profilu ischertadu.</string>
-    <string name="rourte_between_points_desc">Ischerta comente connètere sos puntos: cun una lìnia reta o calculende un\'àndala intre issos cun su profilu ischertadu.</string>
+    <string name="route_between_points_whole_track_button_desc">Sa rasta intrea at a èssere torrada a calculare impreende su profilu ischertadu.</string>
+    <string name="route_between_points_next_segment_button_desc">Petzi su segmentu imbeniente at a èssere torradu a calculare impreende su profilu ischertadu.</string>
+    <string name="route_between_points_desc">Ischerta comente connètere sos puntos: cun una lìnia reta o calculende un\'àndala intre issos comente dislindadu inoghe in suta.</string>
     <string name="whole_track">Rasta intrea</string>
     <string name="next_segment">Segmentu imbeniente</string>
-    <string name="rourte_between_points_warning_desc">Pro impreare custa optzione OsmAnd tenet bisòngiu de alliniare sa rasta tua a sos caminos de sa mapa.
+    <string name="route_between_points_warning_desc">Pro impreare custa optzione OsmAnd tenet bisòngiu de alliniare sa rasta tua a sos caminos de sa mapa.
 \n
 \n In su passu chi benit as a dèpere ischertare su profilu de navigatzione pro rilevare sos caminos permìtidos e su lìmite de distàntzia pro aprossimare sa rasta tua cun sos caminos.</string>
     <string name="threshold_distance">Lìmite de distàntzia</string>
     <string name="navigation_profile">Profilu de navigatzione</string>
-    <string name="rourte_between_points_add_track_desc">Ischerta unu documentu de rasta in ue annànghere su segmentu nou.</string>
+    <string name="route_between_points_add_track_desc">Ischerta unu documentu de rasta in ue annànghere su segmentu nou.</string>
     <string name="street_level_imagery">Fotografias a livellu de sas carreras</string>
-    <string name="plan_route_exit_dialog_descr">Ses seguru de chèrrere serrare sa pianificatzione de s\'àndala chene sarvare\? As a pèrdere totu sas modìficas.</string>
+    <string name="plan_route_exit_dialog_descr">Ses seguru de chèrrere serrare sa pianificatzione de s\'àndala e pèrdere totu sas modìficas\?</string>
     <string name="in_case_of_reverse_direction">In casu de diretzione furriada</string>
     <string name="layer_gpx_layer">Rastas</string>
     <string name="save_track_to_gpx_globally">Càrriga sa rasta in unu documentu GPX</string>
@@ -3859,7 +3859,7 @@
     <string name="shared_string_gpx_route">Àndala de una rasta</string>
     <string name="follow_track">Sighi sa rasta</string>
     <string name="follow_track_descr">Issèbera su documentu de sa rasta de sighire</string>
-    <string name="import_track_descr">Issèbera su documentu de sa rasta de sighire, o importa·nde unu.</string>
+    <string name="import_track_descr">Issèbera su documentu de sa rasta de sighire o importa·lu dae su dispositivu tuo.</string>
     <string name="select_another_track">Ischerta un\'àtera rasta</string>
     <string name="navigate_to_track_descr">Nàviga dae sa positzione mea a sa rasta</string>
     <string name="pass_whole_track_descr">Puntu de sa rasta de navigare</string>

OsmAnd/res/values-sk/strings.xml

@@ -3780,17 +3780,17 @@
     <string name="quick_action_showhide_mapillary_descr">Prepínač pre zobrazenie alebo skrytie vrstvy Mapillary na mape.</string>
     <string name="shared_string_bearing">Smerovanie</string>
     <string name="item_deleted">%1$s vymazané</string>
-    <string name="speed_cameras_restart_descr">Pre úplné odstránenie údajov o rýchlostných radaroch je potrebný reštart.</string>
+    <string name="speed_cameras_restart_descr">Reštartovať aplikáciu pre úplné odstránenie údajov o rýchlostných radaroch.</string>
     <string name="shared_string_uninstall_and_restart">Odinštalovať a reštartovať</string>
     <string name="shared_string_uninstall">Odinštalovať</string>
     <string name="routing_attr_length_description">Zadajte aká dĺžka vozidla musí byť povolená na trase.</string>
     <string name="routing_attr_length_name">Limit dĺžky</string>
     <string name="speed_cameras_removed_descr">Toto zariadenie neobsahuje rýchlostné radary.</string>
     <string name="app_mode_inline_skates">Kolieskové korčule</string>
-    <string name="use_volume_buttons_as_zoom_descr">Umožní ovládať priblíženie mapy tlačidlami hlasitosti zariadenia.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Ovládať priblíženie mapy tlačidlami hlasitosti zariadenia.</string>
     <string name="use_volume_buttons_as_zoom">Tlačidlá hlasitosti na približovanie</string>
     <string name="lenght_limit_description">Zadajte dĺžku vášho vozidla, pretože na trase môžu byť obmedzenia pre dlhé vozidlá.</string>
-    <string name="quick_action_remove_next_destination">Vymazať ďalší cieľový bod</string>
+    <string name="quick_action_remove_next_destination">Vymazať najbližší cieľový bod</string>
     <string name="please_provide_point_name_error">Prosím zadajte názov pre bod</string>
     <string name="quick_action_remove_next_destination_descr">Aktuálny cieľový bod na trase bude vymazaný. Ak je to posledný cieľ, navigácia sa zastaví.</string>
     <string name="search_download_wikipedia_maps">Stiahnuť mapy Wikipédia</string>
@@ -3800,8 +3800,8 @@
     <string name="app_mode_wheelchair">Invalidný vozík</string>
     <string name="app_mode_wheelchair_forward">Invalidný vozík dopredu</string>
     <string name="app_mode_go_cart">Motokára</string>
-    <string name="osm_edit_closed_note">Zatvorená OSM poznámka</string>
-    <string name="set_working_days_to_continue">Pre pokračovanie musíte zadať pracovné dni</string>
+    <string name="osm_edit_closed_note">OSM poznámka zatvorená</string>
+    <string name="set_working_days_to_continue">Zadať pracovné dni pre pokračovanie</string>
     <string name="route_between_points">Trasa medzi bodmi</string>
     <string name="plan_a_route">Naplánovať trasu</string>
     <string name="add_to_a_track">Pridať do stopy</string>
@@ -3822,25 +3822,23 @@
     <string name="overwrite_track">Prepísať stopu</string>
     <string name="save_as_new_track">Uložiť ako novú stopu</string>
     <string name="reverse_route">Otočiť trasu</string>
-    <string name="rourte_between_points_whole_track_button_desc">Celá stopa bude prepočítaná pomocou zvoleného profilu.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Len nasledujúci úsek bude prepočítaný pomocou zvoleného profilu.</string>
-    <string name="rourte_between_points_desc">Zvoľte ako spojiť body, priamou čiarou alebo vypočítať trasu medzi nimi pomocou zvoleného profilu.</string>
+    <string name="route_between_points_whole_track_button_desc">Celá stopa bude prepočítaná pomocou zvoleného profilu.</string>
+    <string name="route_between_points_next_segment_button_desc">Len nasledujúci úsek bude prepočítaný pomocou zvoleného profilu.</string>
+    <string name="route_between_points_desc">Zvoľte ako spojiť body, priamou čiarou alebo vypočítať trasu medzi nimi ako je určené ďalej.</string>
     <string name="whole_track">Celá stopa</string>
     <string name="next_segment">Ďalší úsek</string>
-    <string name="rourte_between_points_warning_desc">Pre použitie tejto možnosti musí OsmAnd prichytiť vašu stopu na cesty v mape.
-\n
-\n V ďalšom kroku budete musieť zvoliť navigačný profil pre detekciu povolených ciest a hraničnú vzdialenosť pre aproximovanie vašej stopy cestami.</string>
+    <string name="route_between_points_warning_desc">Ďalej, pre použitie tejto možnosti pripojte vašu stopu k najbližšej povolenej ceste s niektorým vaším navigačným profilom.</string>
     <string name="threshold_distance">Hraničná vzdialenosť</string>
     <string name="navigation_profile">Navigačný profil</string>
-    <string name="rourte_between_points_add_track_desc">Zvoľte súbor stopy, pre ktorú bude pridaný nový úsek.</string>
+    <string name="route_between_points_add_track_desc">Zvoľte súbor stopy, pre ktorú bude pridaný nový úsek.</string>
     <string name="street_level_imagery">Snímky z úrovne ulice</string>
-    <string name="plan_route_exit_dialog_descr">Naozaj chcete zatvoriť plánovanie trasy bez uloženia\? Všetky zmeny sa stratia.</string>
+    <string name="plan_route_exit_dialog_descr">Naozaj chcete zahodiť všetky zmeny v plánovanej trasy jej zatvorením\?</string>
     <string name="in_case_of_reverse_direction">V prípade opačného smeru</string>
     <string name="shared_string_gpx_route">Trasa zo stopy</string>
     <string name="context_menu_item_add_waypoint">Pridať prechodný bod stopy</string>
     <string name="follow_track">Nasledovať stopu</string>
     <string name="follow_track_descr">Zvoľte súbor stopy pre nasledovanie</string>
-    <string name="import_track_descr">Zvoľte súbor stopy pre nasledovanie, alebo nejaký importujte.</string>
+    <string name="import_track_descr">Zvoľte súbor stopy pre nasledovanie alebo nejaký importujte z vášho zariadenia.</string>
     <string name="select_another_track">Zvoliť inú stopu</string>
     <string name="navigate_to_track_descr">Navigovať z mojej polohy k stope</string>
     <string name="pass_whole_track_descr">Bod stopy pre navigovanie</string>
@@ -3886,4 +3884,19 @@
     <string name="gpx_monitoring_start">Pokračovať v nahrávaní výletu</string>
     <string name="one_point_error">Prosím pridajte aspoň dva body.</string>
     <string name="shared_string_redo">Vykonať znova</string>
+    <string name="release_3_8">• Vylepšená funkcia plánovania trasy: umožňuje použiť rôzne typy navigácie pre úseky trasy a začlenenie stôp
+\n
+\n • Nové menu pre vzhľad stôp: zvoľte farbu, hrúbku, smerové šípky, ikony štartu a cieľa
+\n
+\n • Zlepšená viditeľnosť bodov pre bicykle.
+\n
+\n • Stopy je teraz možné aktivovať, pre kontextové menu sú základnými údajmi.
+\n
+\n • Zlepšený algoritmus vyhľadávania
+\n
+\n • Zlepšené možnosti nasledovania stopy v navigácii
+\n
+\n • Opravené problému s importom a exportom nastavení profilov
+\n
+\n</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -3819,17 +3819,17 @@
     <string name="overwrite_track">Замени стазу</string>
     <string name="save_as_new_track">Сачувај као нову стазу</string>
     <string name="reverse_route">Обрнута рута</string>
-    <string name="rourte_between_points_whole_track_button_desc">Читава стаза ће се прерачунати користећи одабрани профил.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Само ће се следећи сегмент прерачунати користећи одабрани профил.</string>
-    <string name="rourte_between_points_desc">Изаберите како повезати тачке, са правом линијом, или израчунајте руту између њих са одабраним профилом.</string>
+    <string name="route_between_points_whole_track_button_desc">Читава стаза ће се прерачунати користећи одабрани профил.</string>
+    <string name="route_between_points_next_segment_button_desc">Само ће се следећи сегмент прерачунати користећи одабрани профил.</string>
+    <string name="route_between_points_desc">Изаберите како повезати тачке, са правом линијом, или израчунајте руту између њих са одабраним профилом.</string>
     <string name="whole_track">Цела стаза</string>
     <string name="next_segment">Следећи сегмент</string>
-    <string name="rourte_between_points_warning_desc">Да бисте користили ову опцију, ОсмАнд мора да прилагоди вашу стазу путевима на мапи.
+    <string name="route_between_points_warning_desc">Да бисте користили ову опцију, ОсмАнд мора да прилагоди вашу стазу путевима на мапи.
 \n
 \n На следећем кораку мора ћете одабрати навигацијски профил како бисте открили дозвољене путеве и праг удаљености и тиме приближили вашу стазу путевима.</string>
     <string name="threshold_distance">Праг удаљености</string>
     <string name="navigation_profile">Навигацијски профил</string>
-    <string name="rourte_between_points_add_track_desc">Изаберите датотеку записа којој ће се додати нови сегмент.</string>
+    <string name="route_between_points_add_track_desc">Изаберите датотеку записа којој ће се додати нови сегмент.</string>
     <string name="street_level_imagery">Слике на нивоу улице</string>
     <string name="plan_route_exit_dialog_descr">Јесте ли сигурни да желите затворити План руте без чувања\? Изгуби ћете све промене.</string>
     <string name="in_case_of_reverse_direction">У случају обрнутог правца</string>

OsmAnd/res/values-tr/strings.xml

@@ -154,7 +154,7 @@
     <string name="rendering_attr_showRoadMaps_name">Yollar-sadece haritalar</string>
     <string name="show_warnings_descr">Trafik uyarıları (hız sınırları, zorunlu duruşlar, hız tümsekleri, tüneller), hız kamerası uyarıları ve şerit bilgilerini ayarlayın.</string>
     <string name="use_compass_navigation_descr">Başka bir başlık algılanmadığında pusulayı kullan.</string>
-    <string name="snap_to_road_descr">Navigasyon sırasında konumu yola uydur.</string>
+    <string name="snap_to_road_descr">Navigasyon sırasında konumu yola tuttur.</string>
     <string name="snap_to_road">Yola tuttur</string>
     <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions) 
 \n 
@@ -1238,8 +1238,8 @@
     <string name="shared_string_deselect">Seçimini kaldırın</string>
     <string name="shared_string_deselect_all">Tüm Seçimleri Kaldır</string>
     <string name="shared_string_collapse">Daralt</string>
-    <string name="shared_string_tracks">Benim İzlerim</string>
-    <string name="shared_string_currently_recording_track">Mevcut kaydedilen izim</string>
+    <string name="shared_string_tracks">İzlenen yollar</string>
+    <string name="shared_string_currently_recording_track">Şu anda kaydedilen yol</string>
     <string name="route_points">Rota noktaları</string>
     <string name="track_segments">İz bölümü</string>
     <string name="track_points">İz noktası</string>
@@ -1658,7 +1658,7 @@
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
-    <string name="shared_string_trip_recording">Seyahat kayıt</string>
+    <string name="shared_string_trip_recording">Seyahat kaydetme</string>
     <string name="shared_string_navigation">Navigasyon</string>
     <string name="osmand_running_in_background">Arka planda çalıştır</string>
     <string name="gps_wake_up_timer">GPS uyanma aralığı</string>
@@ -1960,7 +1960,7 @@
     <string name="search_location">Konum aranıyor…</string>
     <string name="first_usage_wizard_desc">OsmAnd\'ın konumunuzu bulmasına ve o bölge için harita indirmeyi önermesine izin verin.</string>
     <string name="search_another_country">Başka bölge seç</string>
-    <string name="storage_place_description">OsmAnd\'ın veri deposu (haritalar, GPX dosyaları vb. için): %1$s.</string>
+    <string name="storage_place_description">OsmAnd\'ın veri deposu (haritalar, yol dosyaları vb. için): %1$s.</string>
     <string name="shared_string_change">Değiştir</string>
     <string name="get_it">Al</string>
     <string name="si_mi_meters">Mil/metre</string>
@@ -2317,8 +2317,8 @@
     <string name="routing_attr_height_obstacles_description">Arazi kotunda faktör (SRTM, ASTER ve EU-DEM verileri aracılığıyla).</string>
     <string name="search_map_hint">Şehir veya bölge</string>
     <string name="route_roundabout_short">%1$d çıkışa gir ve ilerle</string>
-    <string name="gpx_no_tracks_title">Henüz GPX dosyanız yok</string>
-    <string name="gpx_no_tracks_title_folder">Ayrıca klasöre GPX dosyaları ekleyebilirsiniz</string>
+    <string name="gpx_no_tracks_title">Henüz yol dosyanız yok</string>
+    <string name="gpx_no_tracks_title_folder">Ayrıca klasöre yol dosyaları ekleyebilirsiniz</string>
     <string name="gpx_add_track">Daha fazla ekle…</string>
     <string name="shared_string_appearance">Görünüm</string>
     <string name="trip_rec_notification_settings">Hızlı kaydı aç</string>
@@ -2450,9 +2450,9 @@
     <string name="routeInfo_road_types_name">Yol türleri</string>
     <string name="shared_string_swap">Takas</string>
     <string name="show_more">Daha fazla görüntüle</string>
-    <string name="quick_action_show_hide_gpx_tracks">GPX yollarını göster/gizle</string>
-    <string name="quick_action_gpx_tracks_hide">GPX Yollarını Gizle</string>
-    <string name="quick_action_gpx_tracks_show">GPX Yollarını Göster</string>
+    <string name="quick_action_show_hide_gpx_tracks">Yolları göster/gizle</string>
+    <string name="quick_action_gpx_tracks_hide">Yolları Gizle</string>
+    <string name="quick_action_gpx_tracks_show">Yolları Göster</string>
     <string name="add_home">Ev ekle</string>
     <string name="add_work">Iş ekle</string>
     <string name="work_button">İş</string>
@@ -2920,7 +2920,7 @@
     <string name="step_by_step">Adım adım</string>
     <string name="exit_at">Burada çık</string>
     <string name="sit_on_the_stop">Durakta bin</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Seçilen GPX yollarını haritada göstermek veya gizlemek için bir düğme.</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Seçilen yolları haritada göstermek veya gizlemek için bir düğme.</string>
     <string name="add_destination_query">Lütfen önce hedefi ayarlayın</string>
     <string name="release_3_3">• Yeni \'Yol Tarifleri\' ekranı: Ev ve İş hedefi düğmelerini, \'önceki rota\' kısayolunu, etkin GPX yol-izlerinin ve işaretleyicilerin listesini, arama geçmişini görüntüler
 \n
@@ -3739,7 +3739,7 @@
     <string name="shared_string_uninstall">Kaldır</string>
     <string name="shared_string_bearing">Kerteriz</string>
     <string name="item_deleted">%1$s silindi</string>
-    <string name="speed_cameras_restart_descr">Hız kamerası verilerini tamamen silmek için yeniden başlatma gerekmektedir.</string>
+    <string name="speed_cameras_restart_descr">Tüm hız kamerası verilerini silmek için uygulamayı yeniden başlatın.</string>
     <string name="shared_string_uninstall_and_restart">Kaldır ve Yeniden Başlat</string>
     <string name="speed_cameras_removed_descr">Bu aygıtta hız kameraları yok.</string>
     <string name="app_mode_inline_skates">Paten</string>
@@ -3748,8 +3748,8 @@
     <string name="quick_action_remove_next_destination_descr">Güzergahdaki geçerli hedef noktası silinecektir. Eğer bu varış noktası olacaksa, navigasyon duracaktır.</string>
     <string name="please_provide_point_name_error">Lütfen nokta için bir ad belirtin</string>
     <string name="lenght_limit_description">Aracınızın uzunluğunu belirtin, uzun araçlar için bazı güzergah kısıtlamaları geçerli olabilir.</string>
-    <string name="quick_action_remove_next_destination">Sonraki varış noktasını sil</string>
-    <string name="use_volume_buttons_as_zoom_descr">Harita yakınlaştırma seviyesini cihaz ses seviyesi düğmeleriyle denetlemeyi etkinleştirin.</string>
+    <string name="quick_action_remove_next_destination">En yakın varış noktasını sil</string>
+    <string name="use_volume_buttons_as_zoom_descr">Harita yakınlaştırma seviyesini cihaz ses seviyesi düğmelerini kullanarak denetleyin.</string>
     <string name="use_volume_buttons_as_zoom">Yakınlaştırma için ses seviyesi düğmeleri</string>
     <string name="search_download_wikipedia_maps">Wikipedia haritalarını indir</string>
     <string name="plugin_wikipedia_description">Wikipedia\'dan ilgi çekici yerler hakkında bilgi alın. Bu sizin çevrim dışı cep rehberinizdir - sadece Wikipedia eklentisini etkinleştirin ve etrafınızdaki nesneler hakkında makalelerin tadını çıkarın.</string>
@@ -3758,13 +3758,13 @@
     <string name="app_mode_wheelchair">Tekerlekli sandalye</string>
     <string name="app_mode_wheelchair_forward">İleri tekerlekli sandalye</string>
     <string name="app_mode_go_cart">Go-kart</string>
-    <string name="osm_edit_closed_note">Kapatılmış OSM Notu</string>
+    <string name="osm_edit_closed_note">Kapatılmış OSM notu</string>
     <string name="add_to_a_track">İzlemeye ekle</string>
-    <string name="set_working_days_to_continue">Devam etmek için çalışma günlerini ayarlamalısınız</string>
+    <string name="set_working_days_to_continue">Devam etmek için çalışma günlerini ayarla</string>
     <string name="route_between_points">Noktalar arasındaki güzergah</string>
     <string name="plan_a_route">Güzergah planla</string>
     <string name="add_hidden_group_info">Seçilen grup gizli olduğu için eklenen nokta haritada görünmeyecek, \"%s\" içinde bulabilirsiniz.</string>
-    <string name="track_show_start_finish_icons">Başlangıç bitiş simgelerini göster</string>
+    <string name="track_show_start_finish_icons">Başlangıç ve bitiş simgelerini göster</string>
     <string name="select_track_width">Genişlik seç</string>
     <string name="gpx_split_interval_descr">Yol üzerinde mesafe veya zaman işaretlerinin görüntüleneceği aralığı seçin.</string>
     <string name="gpx_split_interval_none_descr">İstediğiniz bölme seçeneğini seçin: zamana veya mesafeye göre.</string>
@@ -3778,21 +3778,53 @@
     <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>
     <string name="overwrite_track">Yolun üzerine yaz</string>
-    <string name="rourte_between_points_warning_desc">Bu seçeneği kullanmak için OsmAnd\'ın izlediğiniz yolu harita yollarına eşleştirmesi gereklidir.
-\n
-\n Sonraki adımda, izin verilen yolları tespit etmek için navigasyon profilini ve izlediğiniz yolu yaklaşık olarak belirlemek için eşik mesafesini seçmeniz gerekecektir.</string>
-    <string name="save_as_new_track">Yeni bir Yol olarak kaydet</string>
+    <string name="route_between_points_warning_desc">Ardından, bu seçeneği kullanmak için navigasyon profillerinizden biriyle izlenen yolunuzu izin verilen en yakın yola tutturun.</string>
+    <string name="save_as_new_track">Yeni bir yol olarak kaydet</string>
     <string name="reverse_route">Ters güzergah</string>
-    <string name="rourte_between_points_whole_track_button_desc">Tüm yol, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Sadece sonraki bölüm, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
-    <string name="rourte_between_points_desc">Düz bir çizgi ile noktaları nasıl birleştireceğinizi veya seçili profille aralarında nasıl güzergah hesaplayacağınızı seçin.</string>
+    <string name="route_between_points_whole_track_button_desc">Tüm yol, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
+    <string name="route_between_points_next_segment_button_desc">Sadece sonraki bölüm, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
+    <string name="route_between_points_desc">Düz bir çizgi ile noktaları nasıl birleştireceğinizi veya aşağıda belirtildiği gibi aralarında nasıl güzergah hesaplayacağınızı seçin.</string>
     <string name="whole_track">Tüm yol</string>
     <string name="next_segment">Sonraki bölüm</string>
     <string name="threshold_distance">Eşik mesafesi</string>
     <string name="navigation_profile">Navigasyon profili</string>
-    <string name="rourte_between_points_add_track_desc">Kendisine yeni bir bölümün ekleneceği bir yol dosyası seçin.</string>
+    <string name="route_between_points_add_track_desc">Kendisine yeni bir bölümün ekleneceği bir yol dosyası seçin.</string>
     <string name="street_level_imagery">Sokak seviyesi görüntüleri</string>
-    <string name="plan_route_exit_dialog_descr">Kaydetmeden güzergah planlamayı kapatmak istediğinize emin misiniz\? Tüm değişiklikleri kaybedeceksiniz.</string>
+    <string name="plan_route_exit_dialog_descr">Planlanan güzergahtaki tüm değişiklikleri kapatarak atmak istediğinizden emin misiniz\?</string>
     <string name="in_case_of_reverse_direction">Ters yön durumunda</string>
     <string name="monitoring_control_start">REC</string>
+    <string name="open_saved_track">Kaydedilen yolu aç</string>
+    <string name="shared_string_is_saved">kaydedildi</string>
+    <string name="one_point_error">Lütfen en az iki nokta ekleyin.</string>
+    <string name="shared_string_redo">Yeniden yap</string>
+    <string name="layer_gpx_layer">İzlenen yollar</string>
+    <string name="save_track_to_gpx_globally">Yolu GPX dosyasına kaydet</string>
+    <string name="empty_state_my_tracks_desc">Yol dosyalarını içe aktarın veya kaydedin</string>
+    <string name="shared_string_save_as_gpx">Yeni yol dosyası olarak kaydet</string>
+    <string name="add_segment_to_the_track">Bir yol dosyasına ekle</string>
+    <string name="shared_string_gpx_files">İzlenen yollar</string>
+    <string name="show_gpx">İzlenen yollar</string>
+    <string name="empty_state_my_tracks">Yol dosyaları ekle</string>
+    <string name="context_menu_item_add_waypoint">Yol ara noktası ekle</string>
+    <string name="quick_action_add_gpx">Yol ara noktası ekle</string>
+    <string name="map_widget_monitoring">Seyahat kaydetme</string>
+    <string name="marker_save_as_track">Yol dosyası olarak kaydet</string>
+    <string name="number_of_gpx_files_selected_pattern">%s yol dosyası seçildi</string>
+    <string name="disable_recording_once_app_killed_descrp">(Son uygulamalar aracılığıyla) uygulama kapatıldığında yol kaydını duraklatacaktır. (OsmAnd arka plan göstergesi Android bildirim çubuğundan kaybolur.)</string>
+    <string name="save_global_track_interval_descr">Genel yol kaydı için kayıt aralığını seçin (haritadaki seyahat kayıt widget\'ı aracılığıyla etkin).</string>
+    <string name="gpx_monitoring_stop">Seyahat kaydetmeyi duraklat</string>
+    <string name="gpx_monitoring_start">Seyahat kaydetmeyi devam ettir</string>
+    <string name="nearest_point">En yakın nokta</string>
+    <string name="delete_address">Adres sil</string>
+    <string name="add_address">Adres ekle</string>
+    <string name="access_hint_enter_address">Adres girin</string>
+    <string name="simplified_track_description">Sadece güzergah hattı kaydedilecek, ara noktalar silinecektir.</string>
+    <string name="shared_string_file_name">Dosya adı</string>
+    <string name="system_default_theme">Sistem öntanımlı değeri</string>
+    <string name="all_next_segments">Sonraki tüm bölümler</string>
+    <string name="previous_segment">Önceki bölüm</string>
+    <string name="all_previous_segments">Önceki tüm bölümler</string>
+    <string name="only_selected_segment_recalc">Sadece seçili bölüm, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
+    <string name="all_next_segments_will_be_recalc">Sonraki tüm bölümler, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
+    <string name="all_previous_segments_will_be_recalc">Önceki tüm bölümler, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
 </resources>

OsmAnd/res/values-uk/phrases.xml

@@ -3803,7 +3803,7 @@
     <string name="poi_seamark_water_level_above_mwl">Рівень води: вище середнього</string>
     <string name="poi_seamark_water_level_below_mwl">Рівень води: нижче середнього</string>
     <string name="poi_seamark_obstruction">Завада</string>
-    <string name="poi_drinking_water_refill_yes">Поповнення питної води: так</string>
+    <string name="poi_drinking_water_refill_yes">Так</string>
     <string name="poi_drinking_water_refill_no">Поповнення питної води: ні</string>
     <string name="poi_drinking_water_refill_network">Мережа поповнення питної води</string>
     <string name="poi_osmand_fire_hydrant_pressure_pressurized">Під тиском</string>
@@ -3822,4 +3822,13 @@
     <string name="poi_give_box">Подарункова коробка</string>
     <string name="poi_elevator">Ліфт</string>
     <string name="poi_traffic_signals_arrow_no">Стрілка: ні</string>
+    <string name="poi_departures_board_timetable">Розклад</string>
+    <string name="poi_departures_board_realtime">Реальний час</string>
+    <string name="poi_departures_board_delay">Затримка</string>
+    <string name="poi_departures_board_yes">Так</string>
+    <string name="poi_departures_board_no">Дошка відправлень: немає</string>
+    <string name="poi_departures_board">Дошка відправлень</string>
+    <string name="poi_drinking_water_refill">Поповнення питної води</string>
+    <string name="poi_recycling_small_electrical_appliances">Невеликі електроприлади</string>
+    <string name="poi_beehive">Вулик</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -1072,7 +1072,7 @@
     <string name="gpx_file_is_empty">Порожній GPX-файл</string>
     <string name="shared_string_tracks">Треки</string>
     <string name="shared_string_my_favorites">Закладки</string>
-    <string name="shared_string_my_places">Місця та треки</string>
+    <string name="shared_string_my_places">Мої місця</string>
     <string name="rendering_value_pink_name">рожевий</string>
     <string name="rendering_value_brown_name">Коричневий</string>
     <string name="osmo_edit_color">Колір</string>
@@ -3779,33 +3779,33 @@
     <string name="speed_cameras_alert">Попередження про камери контролю швидкості в деяких країнах заборонено законом.</string>
     <string name="shared_string_bearing">Орієнтація</string>
     <string name="item_deleted">%1$s видалено</string>
-    <string name="speed_cameras_restart_descr">Для вилучення даних про камери контролю швидкості потрібен перезапуск.</string>
+    <string name="speed_cameras_restart_descr">Перезапустіть застосунок для видалення даних про камери контролю швидкості.</string>
     <string name="shared_string_uninstall_and_restart">Видалити та перезапустити</string>
     <string name="routing_attr_length_description">Вкажіть довжину транспортного засобу для розрахунку маршрутів.</string>
     <string name="routing_attr_length_name">Обмеження довжини</string>
     <string name="speed_cameras_removed_descr">На цьому пристрої немає камер контролю швидкості.</string>
     <string name="app_mode_inline_skates">Роликові ковзани</string>
-    <string name="use_volume_buttons_as_zoom_descr">Увімкнути для зміни масштабу мапи кнопками гучності пристрою.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Зміна масштабу мапи кнопками гучності пристрою.</string>
     <string name="use_volume_buttons_as_zoom">Масштабування кнопками гучності</string>
     <string name="lenght_limit_description">Вкажіть довжину вашого автомобіля, для довгих транспортних засобів можуть застосовуватися деякі обмеження на маршрутах.</string>
-    <string name="quick_action_remove_next_destination">Видалити наступну точку призначення</string>
+    <string name="quick_action_remove_next_destination">Видалити найближчу точку призначення</string>
     <string name="please_provide_point_name_error">Вкажіть назву пункту</string>
     <string name="quick_action_remove_next_destination_descr">Поточну точку призначення на маршруті буде видалено. Якщо це буде місце призначення, навігація припиниться.</string>
     <string name="search_download_wikipedia_maps">Завантажити мапи Вікіпедії</string>
-    <string name="plugin_wikipedia_description">Отримайте відомості про визначні місця у Вікіпедії. Це ваш автономний кишеньковий посібник - просто ввімкніть втулок \"Вікіпедія\" і насолоджуйтеся статтями про об\'єкти навколо вас.</string>
+    <string name="plugin_wikipedia_description">Отримайте відомості про визначні місця у Вікіпедії. Це ваш автономний кишеньковий посібник - просто ввімкніть втулок \"Вікіпедія\" і насолоджуйтеся статтями про об\'єкти довкола вас.</string>
     <string name="app_mode_motor_scooter">Моторолер</string>
     <string name="app_mode_enduro_motorcycle">Спортивний мотоцикл</string>
     <string name="app_mode_wheelchair">Інвалідне крісло</string>
     <string name="app_mode_wheelchair_forward">Інвалідне крісло попереду</string>
     <string name="app_mode_go_cart">Картинг</string>
-    <string name="osm_edit_closed_note">Закрита нотатка OSM</string>
+    <string name="osm_edit_closed_note">Закрита примітка OSM</string>
     <string name="shared_string_custom">Власне</string>
     <string name="add_hidden_group_info">Додану точку не буде показано на мапі, вся вибрана група є прихованою, ви можете побачити її в \"%s\".</string>
     <string name="set_working_days_to_continue">Зазначте робочі дні, щоб продовжити</string>
     <string name="route_between_points">Маршрут між точками</string>
     <string name="plan_a_route">Планування маршруту</string>
     <string name="add_to_a_track">Додати до треку</string>
-    <string name="track_show_start_finish_icons">Показувати старт та фініш</string>
+    <string name="track_show_start_finish_icons">Показувати піктограми старт та фініш</string>
     <string name="select_track_width">Встановити ширину</string>
     <string name="gpx_split_interval_descr">Виберіть інтервал показу міток часу або відстані для показу поверх треку.</string>
     <string name="gpx_split_interval_none_descr">Виберіть власний варіант поділу: за часом чи відстанню.</string>
@@ -3815,24 +3815,22 @@
     <string name="plan_route_import_track">Імпортувати трек</string>
     <string name="plan_route_open_existing_track">Переглянути наявний трек</string>
     <string name="plan_route_create_new_route">Створити новий маршрут</string>
-    <string name="plan_route_select_track_file_for_open">Оберіть файл з треком для перегляду.</string>
+    <string name="plan_route_select_track_file_for_open">Виберіть який файл з треком відкрити.</string>
     <string name="shared_string_done">Готово</string>
     <string name="overwrite_track">Перезаписати трек</string>
-    <string name="rourte_between_points_warning_desc">Для користування цією функцією, OsmAnd необхідно прив\'язати цей трек до мапи доріг.
-\n
-\nДалі вам потрібно вибрати профіль навігації для виявлення дозволених доріг та обмеження відстані наближення вашого треку до доріг.</string>
+    <string name="route_between_points_warning_desc">Далі, пов\'яжіть трек до найближчої дозволеної дороги з одним із профілів навігації, щоб скористатися цим параметром.</string>
     <string name="reverse_route">Зворотний маршрут</string>
     <string name="whole_track">Весь трек</string>
     <string name="next_segment">Наступний сегмент</string>
     <string name="threshold_distance">Обмеження відстані</string>
     <string name="navigation_profile">Профіль навігації</string>
-    <string name="rourte_between_points_add_track_desc">Виберіть файл треку, до якого буде додано новий сегмент.</string>
+    <string name="route_between_points_add_track_desc">Виберіть файл треку, до якого буде додано новий сегмент.</string>
     <string name="save_as_new_track">Зберегти як новий трек</string>
-    <string name="rourte_between_points_whole_track_button_desc">Весь трек буде перераховано за допомогою вибраного профілю.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Лише наступний сегмент буде перераховано за допомогою обраного профілю.</string>
-    <string name="rourte_between_points_desc">Виберіть спосіб з\'єднання точок: прямою лінією чи розраховувати маршрут між ними за допомогою вибраного профілю.</string>
+    <string name="route_between_points_whole_track_button_desc">Весь трек буде перераховано за допомогою вибраного профілю.</string>
+    <string name="route_between_points_next_segment_button_desc">Лише наступний сегмент буде перераховано за допомогою обраного профілю.</string>
+    <string name="route_between_points_desc">Виберіть спосіб з\'єднання точок: прямою лінією чи обчислити маршрут між ними за, як зазначено далі.</string>
     <string name="street_level_imagery">Зображення вулиць</string>
-    <string name="plan_route_exit_dialog_descr">Ви дійсно бажаєте закрити планування маршруту без збереження\? Внесені зміни буде втрачено.</string>
+    <string name="plan_route_exit_dialog_descr">Ви дійсно бажаєте відхилити всі зміни у запланованому маршруті, закривши його\?</string>
     <string name="in_case_of_reverse_direction">Для зворотного напрямку</string>
     <string name="shared_string_save_as_gpx">Зберегти як новий файл треку</string>
     <string name="add_segment_to_the_track">Додати у файл треку</string>
@@ -3850,7 +3848,7 @@
     <string name="marker_save_as_track">Зберегти як файл треку</string>
     <string name="follow_track">Стежити за треком</string>
     <string name="follow_track_descr">Виберіть файл треку для перегляду</string>
-    <string name="import_track_descr">Виберіть файл треку для його перегляду або імпортуйте його.</string>
+    <string name="import_track_descr">Виберіть файл треку для перегляду або імпортуйте його з пристрою.</string>
     <string name="select_another_track">Обрати інший трек</string>
     <string name="navigate_to_track_descr">Перехід від мого розташування до треку</string>
     <string name="pass_whole_track_descr">Точка треку для навігації</string>
@@ -3883,4 +3881,19 @@
     <string name="simplified_track_description">Буде збережено лише лінію маршруту, а проміжні точки буде видалено.</string>
     <string name="shared_string_file_name">Назва файлу</string>
     <string name="shared_string_redo">Повторити</string>
+    <string name="release_3_8">• Оновлено функції планування маршруту: дозволено застосувати різні типи переходів для кожного сегмента і прив\'язати будь-який трек до доріг
+\n
+\n• Нове меню вигляду треків: вибір кольору, товщина, вигляд стрілки напрямку, піктограми початку/завершення
+\n
+\n• Покращено оглядовість велосипедних вузлів
+\n
+\n• На треки тепер можна натискати, є контекстне меню з основною інформацією.
+\n
+\n• Вдосконалено алгоритми пошуку
+\n
+\n• Вдосконалено параметри стеження за треками в навігації
+\n
+\n• Виправлено вади перенесення налаштувань профілю
+\n
+\n</string>
 </resources>

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

@@ -3121,7 +3121,7 @@
     <string name="add_hidden_group_info">添加的点在地图上不可见，因为选定的组是隐藏的，您可以在\"%s\"中找到它。</string>
     <string name="gpx_split_interval_descr">选择显示轨迹上带有距离或时间标记的间隔。</string>
     <string name="gpx_split_interval_none_descr">选择所需的拆分选项：“按时间”或“按距离”。</string>
-    <string name="rourte_between_points_next_segment_button_desc">新的配置文件将在下一段路线计算时生效。</string>
+    <string name="route_between_points_next_segment_button_desc">新的配置文件将在下一段路线计算时生效。</string>
     <string name="whole_track">整个轨迹</string>
     <string name="plan_route_last_edited">最后更改</string>
     <string name="plan_route_import_track">导入轨迹</string>
@@ -3133,15 +3133,15 @@
     <string name="save_as_new_track">保存为新的轨迹</string>
     <string name="plan_route_exit_dialog_descr">你确定在不保存的情况下退出计划路线吗？所有的更改均会丢失。</string>
     <string name="reverse_route">反转路线</string>
-    <string name="rourte_between_points_whole_track_button_desc">全部路线会以选择的配置文件进行重新计算。</string>
-    <string name="rourte_between_points_desc">选择以直线或以选择的导航文件来计算路线的方式去连接导航点。</string>
+    <string name="route_between_points_whole_track_button_desc">全部路线会以选择的配置文件进行重新计算。</string>
+    <string name="route_between_points_desc">选择以直线或以选择的导航文件来计算路线的方式去连接导航点。</string>
     <string name="next_segment">下一段</string>
-    <string name="rourte_between_points_warning_desc">要使用这个选项，OsmAnd 会跟踪你在地图道路上的轨迹。
+    <string name="route_between_points_warning_desc">要使用这个选项，OsmAnd 会跟踪你在地图道路上的轨迹。
 \n
 \n在进行下一步时，你需要选择导航文件来检测与你的起始点相近的道路。</string>
     <string name="threshold_distance">起始距离</string>
     <string name="navigation_profile">导航文件</string>
-    <string name="rourte_between_points_add_track_desc">选择一个要添加新片段的跟踪文件。</string>
+    <string name="route_between_points_add_track_desc">选择一个要添加新片段的跟踪文件。</string>
     <string name="street_level_imagery">街道等级图像</string>
     <string name="in_case_of_reverse_direction">防止相反的方向</string>
     <string name="delete_address">删除地址</string>

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

@@ -3814,7 +3814,7 @@
     <string name="poi_seamark_water_level_above_mwl">水位：高於平均水位</string>
     <string name="poi_seamark_water_level_below_mwl">水位：低於平均水位</string>
     <string name="poi_seamark_obstruction">堵塞</string>
-    <string name="poi_drinking_water_refill_yes">飲用水填充：是</string>
+    <string name="poi_drinking_water_refill_yes">是</string>
     <string name="poi_drinking_water_refill_no">飲用水填充：否</string>
     <string name="poi_drinking_water_refill_network">飲用水填充網路</string>
     <string name="poi_osmand_fire_hydrant_pressure_suction">吸力</string>
@@ -3833,4 +3833,13 @@
     <string name="poi_borough">自治市鎮</string>
     <string name="poi_traffic_signals_arrow_no">箭頭：否</string>
     <string name="poi_elevator">電梯</string>
+    <string name="poi_departures_board_timetable">時刻表</string>
+    <string name="poi_departures_board_realtime">即時</string>
+    <string name="poi_departures_board_delay">間隔時間</string>
+    <string name="poi_departures_board_yes">是</string>
+    <string name="poi_departures_board_no">時刻表：否</string>
+    <string name="poi_departures_board">時刻表</string>
+    <string name="poi_drinking_water_refill">飲用水補充</string>
+    <string name="poi_recycling_small_electrical_appliances">小電器</string>
+    <string name="poi_beehive">蜂箱</string>
 </resources>

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

@@ -3778,27 +3778,27 @@
     <string name="speed_cameras_alert">某些國家禁止使用測速照相的警報裝置。</string>
     <string name="shared_string_bearing">方向</string>
     <string name="item_deleted">%1$s 已刪除</string>
-    <string name="speed_cameras_restart_descr">必須重新啟動才能完全刪除測速照相的資料。</string>
+    <string name="speed_cameras_restart_descr">重新啟動應用程式以刪除所有測速照相的資料。</string>
     <string name="shared_string_uninstall_and_restart">解除安裝並重新啟動</string>
     <string name="routing_attr_length_description">指定路線上允許的車輛長度。</string>
     <string name="routing_attr_length_name">長度限制</string>
     <string name="speed_cameras_removed_descr">此裝置沒有測速照相機。</string>
     <string name="app_mode_inline_skates">直排輪鞋</string>
-    <string name="use_volume_buttons_as_zoom_descr">啟用裝置音量按鈕控制地圖縮放等級。</string>
+    <string name="use_volume_buttons_as_zoom_descr">使用裝置音量按鈕控制地圖縮放等級。</string>
     <string name="use_volume_buttons_as_zoom">音量按鈕以縮放</string>
     <string name="lenght_limit_description">提供您的車輛長度，某些路徑限制可能適用於較長的車輛。</string>
-    <string name="quick_action_remove_next_destination">刪除下一個目的地點</string>
+    <string name="quick_action_remove_next_destination">刪除最近的目的地點</string>
     <string name="please_provide_point_name_error">請提供點的名稱</string>
     <string name="quick_action_remove_next_destination_descr">目前路徑上的目的地點將會被刪除。如果其將為目的地，導航就會停止。</string>
     <string name="search_download_wikipedia_maps">下載維基百科地圖</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="app_mode_wheelchair">輪椅</string>
     <string name="app_mode_wheelchair_forward">輪椅向前</string>
     <string name="app_mode_go_cart">卡丁車</string>
     <string name="osm_edit_closed_note">已關閉的 OSM 註記</string>
-    <string name="set_working_days_to_continue">您必須設定工作天以繼續</string>
+    <string name="set_working_days_to_continue">設定工作天以繼續</string>
     <string name="route_between_points">點與點之間的路線</string>
     <string name="plan_a_route">規劃路線</string>
     <string name="add_to_a_track">新增到軌跡</string>
@@ -3819,19 +3819,17 @@
     <string name="overwrite_track">覆寫軌跡</string>
     <string name="save_as_new_track">儲存為新軌跡</string>
     <string name="reverse_route">反向路線</string>
-    <string name="rourte_between_points_whole_track_button_desc">整個軌跡都會使用選定的設定檔重新計算。</string>
-    <string name="rourte_between_points_next_segment_button_desc">僅下一個片段會使用選定的設定檔重新計算。</string>
-    <string name="rourte_between_points_desc">選取如何連接點，用直線或以選定的設定檔計算其間的路徑。</string>
+    <string name="route_between_points_whole_track_button_desc">整個軌跡都會使用選定的設定檔重新計算。</string>
+    <string name="route_between_points_next_segment_button_desc">僅下一個片段會使用選定的設定檔重新計算。</string>
+    <string name="route_between_points_desc">選取如何連接點，透過直線或以下面選定的方法計算其間的路徑。</string>
     <string name="whole_track">整個軌道</string>
     <string name="next_segment">下一段</string>
-    <string name="rourte_between_points_warning_desc">要使用此選項，OsmAnd 必須將您的軌跡捕捉到地圖道路上。
-\n
-\n在下一步，您只需要選取設定檔以偵測允許的道路與距離門檻以追蹤道路。</string>
+    <string name="route_between_points_warning_desc">接下來，使用您其中一個導航設定檔來將路線貼齊到最近可用的道路上以使用此選項。</string>
     <string name="threshold_distance">門檻距離</string>
     <string name="navigation_profile">導航設定檔</string>
-    <string name="rourte_between_points_add_track_desc">選取要加入新片段的軌道檔案。</string>
+    <string name="route_between_points_add_track_desc">選取要加入新片段的軌道檔案。</string>
     <string name="street_level_imagery">街道級照片</string>
-    <string name="plan_route_exit_dialog_descr">您確定要不儲存就關閉計劃錄線嗎？您將會失去所有變更。</string>
+    <string name="plan_route_exit_dialog_descr">您確定要關閉計畫路線來放棄所有變更嗎？</string>
     <string name="in_case_of_reverse_direction">反向時</string>
     <string name="shared_string_save_as_gpx">儲存為新的軌跡檔案</string>
     <string name="add_segment_to_the_track">新增到軌跡檔案</string>
@@ -3849,7 +3847,7 @@
     <string name="marker_save_as_track">儲存為軌跡檔案</string>
     <string name="follow_track">跟隨軌跡</string>
     <string name="follow_track_descr">選擇要跟隨的軌跡檔案</string>
-    <string name="import_track_descr">選擇要跟隨的軌跡檔案，或是匯入一個。</string>
+    <string name="import_track_descr">選擇要跟隨的軌跡檔案，或是從您的裝置匯入。</string>
     <string name="select_another_track">選取其他軌跡</string>
     <string name="navigate_to_track_descr">從我的位置導航到軌跡</string>
     <string name="pass_whole_track_descr">要導航的軌跡點</string>
@@ -3883,4 +3881,19 @@
     <string name="shared_string_is_saved">已儲存</string>
     <string name="one_point_error">請至少新增兩個點。</string>
     <string name="shared_string_redo">重做</string>
+    <string name="release_3_8">• 更新「規劃路線」功能：允許每個路段使用不同的導航類型並包含軌跡
+\n
+\n • 新的軌跡外觀選項：選取顏色、厚度、開啟方向箭頭與開始／結束圖示
+\n
+\n • 改善自行車節點的能見度
+\n
+\n • 軌跡現在是可點擊的，且有包含基本資訊的內容選單
+\n
+\n • 改進了搜尋演算法
+\n
+\n • 改進了導航中的「跟隨軌跡」選項
+\n
+\n • 修復設定檔的匯入／匯出問題
+\n
+\n</string>
 </resources>

OsmAnd/res/values/phrases.xml

@@ -136,6 +136,8 @@
 	<string name="poi_fire_hydrant_pressure_filter">Pressure</string>
 	<string name="poi_traffic_signals_vibration">Vibration</string>
 	<string name="poi_traffic_signals_arrow">Arrow</string>
+	<string name="poi_drinking_water_refill">Drinking water refill</string>
+	<string name="poi_departures_board">Departures board</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -496,6 +498,7 @@
 	<string name="poi_recycling_magazines">Magazines</string>
 	<string name="poi_recycling_paper_packaging">Paper packaging</string>
 	<string name="poi_recycling_small_appliances">Small appliances</string>
+	<string name="poi_recycling_small_electrical_appliances">Small electrical appliances</string>
 	<string name="poi_recycling_wood">Wood</string>
 	<string name="poi_recycling_books">Books</string>
 	<string name="poi_recycling_shoes">Shoes</string>
@@ -4220,7 +4223,7 @@
 	<string name="poi_seamark_water_level_below_mwl">Water level: below mean water level</string>
 	<string name="poi_seamark_obstruction">Obstruction</string>
 
-	<string name="poi_drinking_water_refill_yes">Drinking water refill: yes</string>
+	<string name="poi_drinking_water_refill_yes">Yes</string>
 	<string name="poi_drinking_water_refill_no">Drinking water refill: no</string>
 	<string name="poi_drinking_water_refill_network">Drinking water refill network</string>
 
@@ -4243,5 +4246,16 @@
 
 	<string name="poi_elevator">Elevator</string>
 
+	<string name="poi_departures_board_no">Departures board: no</string>
+
+	<string name="poi_departures_board_yes">Yes</string>
+	<string name="poi_departures_board_delay">Delay</string>
+	<string name="poi_departures_board_realtime">Realtime</string>
+	<string name="poi_departures_board_timetable">Timetable</string>
+
+	<string name="poi_beehive">Beehive</string>
+
+	<string name="poi_nuts">Nut store</string>
+
 
 </resources>

OsmAnd/res/values/strings.xml

@@ -11,6 +11,15 @@
 	Thx - Hardy
 
 -->
+    <string name="release_3_8">
+    • Updated "Plan a route" function: allows using different navigation types per segment and the inclusion of tracks\n\n
+    • New "Appearance" menu for tracks: select color, thickness, display direction arrows, start/finish icons\n\n
+    • Improved visibility of bicycle nodes.\n\n
+    • Tracks are now tappable, have context menu with basic info.\n\n
+    • Improved "Search" algorithms\n\n
+    • Improved "Follow track" options in Navigation\n\n
+    • Fixed issues with import/export of profile settings\n\n
+    </string>
     <string name="shared_string_redo">Redo</string>
     <string name="one_point_error">Please add at least two points.</string>
     <string name="shared_string_is_saved">is saved</string>
@@ -42,9 +51,9 @@
     <string name="nearest_point">Nearest point</string>
     <string name="start_of_the_track">Start of the track</string>
     <string name="pass_whole_track_descr">Point of the track to navigate</string>
-    <string name="navigate_to_track_descr">Navigate from my location to the track</string>
+    <string name="navigate_to_track_descr">Navigate from my position to the track</string>
     <string name="select_another_track">Select another track</string>
-    <string name="import_track_descr">Choose track file to follow, or import one.</string>
+    <string name="import_track_descr">Choose track file to follow or import it from your device.</string>
     <string name="follow_track_descr">Choose track file to follow</string>
     <string name="follow_track">Follow track</string>
     <string name="marker_save_as_track">Save as track file</string>
@@ -61,22 +70,22 @@
     <string name="add_segment_to_the_track">Add to a track file</string>
     <string name="shared_string_save_as_gpx">Save as new track file</string>
     <string name="in_case_of_reverse_direction">In case of reverse direction</string>
-    <string name="plan_route_exit_dialog_descr">Are you sure you want to close Plan route without saving? You will lose all changes.</string>
+    <string name="plan_route_exit_dialog_descr">Are you sure you want discard all changes in the planned route by closing it?</string>
     <string name="street_level_imagery">Street-level imagery</string>
-    <string name="rourte_between_points_add_track_desc">Select a track file for which a new segment will be added.</string>
+    <string name="route_between_points_add_track_desc">Select a track file to add the new segment to.</string>
     <string name="navigation_profile">Navigation profile</string>
     <string name="threshold_distance">Threshold distance</string>
-    <string name="rourte_between_points_warning_desc">To use this option OsmAnd need to snap your track to the map roads. \n\n On the next step you will need to select navigation profile to detect allowed roads and threshold distance to approximate you track with roads.</string>
+    <string name="route_between_points_warning_desc">Next, snap your track to the nearest allowed road with one of your navigation profiles to use this option.</string>
     <string name="next_segment">Next segment</string>
     <string name="whole_track">Whole track</string>
-    <string name="rourte_between_points_desc">Select how to connect points, with a straight line, or calculate a route between them with selected profile.</string>
-    <string name="rourte_between_points_next_segment_button_desc">Only next segment will be recalculated using selected profile.</string>
-    <string name="rourte_between_points_whole_track_button_desc">Whole track will be recalculated using selected profile.</string>
+    <string name="route_between_points_desc">Select how to connect points, by a straight line, or calculate a route between them as specified below.</string>
+    <string name="route_between_points_next_segment_button_desc">Only the next segment will be recalculated using the selected profile.</string>
+    <string name="route_between_points_whole_track_button_desc">The whole track will be recalculated using the selected profile.</string>
     <string name="reverse_route">Reverse route</string>
-    <string name="save_as_new_track">Save as new Track</string>
+    <string name="save_as_new_track">Save as new track</string>
     <string name="overwrite_track">Overwrite track</string>
     <string name="shared_string_done">Done</string>
-    <string name="plan_route_select_track_file_for_open">Select a track file for open.</string>
+    <string name="plan_route_select_track_file_for_open">Select a track file to open.</string>
     <string name="plan_route_create_new_route">Create new route</string>
     <string name="plan_route_open_existing_track">Open existing track</string>
     <string name="plan_route_import_track">Import track</string>
@@ -87,29 +96,29 @@
     <string name="gpx_split_interval_none_descr">Select the desired splitting option: by time or by distance.</string>
     <string name="gpx_split_interval_descr">Select the interval at which marks with distance or time on the track will be displayed.</string>
     <string name="select_track_width">Select width</string>
-    <string name="track_show_start_finish_icons">Show start finish icons</string>
-    <string name="add_to_a_track">Add to a Track</string>
+    <string name="track_show_start_finish_icons">Show start and finish icons</string>
+    <string name="add_to_a_track">Add to a track</string>
     <string name="plan_a_route">Plan a route</string>
     <string name="route_between_points">Route between points</string>
-    <string name="set_working_days_to_continue">You need to set working days to continue</string>
-    <string name="osm_edit_closed_note">Closed OSM Note</string>
+    <string name="set_working_days_to_continue">Set working days to continue</string>
+    <string name="osm_edit_closed_note">Closed OSM note</string>
     <string name="app_mode_go_cart">Go-cart</string>
     <string name="app_mode_wheelchair_forward">Wheelchair forward</string>
     <string name="app_mode_wheelchair">Wheelchair</string>
     <string name="app_mode_motor_scooter">Motor scooter</string>
     <string name="app_mode_enduro_motorcycle">Enduro motorcycle</string>
     <string name="add_hidden_group_info">The added point will not be visible on the map, since the selected group is hidden, you can find it in \"%s\".</string>
-    <string name="plugin_wikipedia_description">Get information about points of interest from Wikipedia. It is your pocket offline guide - just enable Wikipedia plugin and enjoy articles about objects around you.</string>
+    <string name="plugin_wikipedia_description">Get info about points of interest from Wikipedia. It is your pocket offline guide - just turn on the Wikipedia plugin and enjoy articles about objects around you.</string>
     <string name="search_download_wikipedia_maps">Download Wikipedia maps</string>
     <string name="quick_action_remove_next_destination_descr">The current destination point on the route will be deleted. If it will be the Destination, navigation will stop.</string>
     <string name="please_provide_point_name_error">Please provide a name for the point</string>
     <string name="use_volume_buttons_as_zoom">Volume buttons as zoom</string>
-    <string name="use_volume_buttons_as_zoom_descr">Enable to control the map zoom level with device volume buttons.</string>
-    <string name="quick_action_remove_next_destination">Delete next destination point</string>
+    <string name="use_volume_buttons_as_zoom_descr">Control the map-zoom level using the volume buttons on the device.</string>
+    <string name="quick_action_remove_next_destination">Delete nearest destination point</string>
     <string name="app_mode_inline_skates">Inline skates</string>
     <string name="speed_cameras_removed_descr">This device doesn\'t have speed cameras.</string>
     <string name="shared_string_uninstall_and_restart">Uninstall and Restart</string>
-    <string name="speed_cameras_restart_descr">Restart is needed to completely delete speed camera data.</string>
+    <string name="speed_cameras_restart_descr">Restart the app to delete all speed camera data.</string>
     <string name="item_deleted">%1$s deleted</string>
     <string name="shared_string_bearing">Bearing</string>
     <string name="routing_attr_length_name">Length limit</string>

OsmAnd/src/net/osmand/FileUtils.java

@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import net.osmand.plus.GpxSelectionHelper;
@@ -165,6 +166,18 @@ public class FileUtils {
 		return dest;
 	}
 
+	public static String createUniqueFileName(@NonNull OsmandApplication app, String name, String dirName, String extension) {
+		String uniqueFileName = name;
+		File dir = app.getAppPath(dirName);
+		File fout = new File(dir, name + extension);
+		int ind = 0;
+		while (fout.exists()) {
+			uniqueFileName = name + "_" + (++ind);
+			fout = new File(dir, uniqueFileName + extension);
+		}
+		return uniqueFileName;
+	}
+
 	public interface RenameCallback {
 		void renamedTo(File file);
 	}

OsmAnd/src/net/osmand/SecondSplashScreenFragment.java

@@ -34,6 +34,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 	public static boolean SHOW = true;
 	public static boolean VISIBLE = false;
 
+	private boolean systemDefaultNightMode;
+
 	public MapActivity getMapActivity() {
 		return (MapActivity) getActivity();
 	}
@@ -77,14 +79,14 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 		OsmandApplication app = requireMyApplication();
 		FragmentActivity activity = requireActivity();
 		UiUtilities iconsCache = app.getUIUtilities();
-		boolean systemDefaultNightMode = app.getSettings().isSupportSystemDefaultTheme() &&
+		systemDefaultNightMode = app.getSettings().isSupportSystemDefaultTheme() &&
 				!app.getSettings().isLightSystemDefaultTheme();
 
 		RelativeLayout view = new RelativeLayout(activity);
 		view.setOnClickListener(null);
 
 		int backgroundColorId = systemDefaultNightMode ?
-				R.color.map_background_color_dark :
+				R.color.list_background_color_dark :
 				R.color.map_background_color_light;
 		view.setBackgroundColor(getResources().getColor(backgroundColorId));
 
@@ -184,6 +186,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 
 	@Override
 	public int getStatusBarColorId() {
-		return R.color.status_bar_transparent_light;
+		return systemDefaultNightMode ?
+				R.color.status_bar_color_dark :
+				R.color.status_bar_transparent_light;
 	}
 }

OsmAnd/src/net/osmand/data/FavouritePoint.java

@@ -7,6 +7,7 @@ import android.graphics.BitmapFactory;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
 import net.osmand.GPXUtilities.WptPt;
@@ -89,6 +90,7 @@ public class FavouritePoint implements Serializable, LocationPoint {
 			return color;
 	}
 
+	@Nullable
 	public String getAddress() {
 		return address;
 	}

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

@@ -103,7 +103,7 @@ public class AppInitializer implements IProgress {
 	private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
 	private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
 
-	public static final String LATEST_CHANGES_URL = "https://osmand.net/blog/osmand-3-7-released";
+	public static final String LATEST_CHANGES_URL = "https://osmand.net/blog/osmand-3-8-released";
 //	public static final String LATEST_CHANGES_URL = null; // not enough to read
 	public static final int APP_EXIT_CODE = 4;
 	public static final String APP_EXIT_KEY = "APP_EXIT_KEY";

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

@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
+import net.osmand.CallbackWithObject;
 import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.GPXTrackAnalysis;
@@ -19,6 +20,7 @@ import net.osmand.GPXUtilities.WptPt;
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
+import net.osmand.StateChangedListener;
 import net.osmand.data.LatLon;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.MapMarkersHelper.MapMarkersGroup;
@@ -26,6 +28,7 @@ import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
+import net.osmand.plus.routing.RouteProvider;
 import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
 import net.osmand.plus.track.GpxSplitType;
 import net.osmand.plus.track.GradientScaleType;
@@ -40,6 +43,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +52,8 @@ import java.util.Set;
 
 public class GpxSelectionHelper {
 
+	private final static Log LOG = PlatformUtil.getLog(GpxSelectionHelper.class);
+
 	public static final String CURRENT_TRACK = "currentTrack";
 	private static final String FILE = "file";
 	private static final String BACKUP = "backup";
@@ -61,15 +67,18 @@ public class GpxSelectionHelper {
 
 	private OsmandApplication app;
 	@NonNull
-	private List<SelectedGpxFile> selectedGPXFiles = new java.util.ArrayList<>();
-	private Map<GPXFile, Long> selectedGpxFilesBackUp = new java.util.HashMap<>();
+	private List<SelectedGpxFile> selectedGPXFiles = new ArrayList<>();
+	private Map<GPXFile, Long> selectedGpxFilesBackUp = new HashMap<>();
 	private SavingTrackHelper savingTrackHelper;
-	private final static Log LOG = PlatformUtil.getLog(GpxSelectionHelper.class);
 	private SelectGpxTask selectGpxTask;
+	private SelectedGpxFile trackToFollow;
+	private StateChangedListener<String> followTrackListener;
+	private boolean shouldHideTrackToFollow;
 
-	public GpxSelectionHelper(OsmandApplication osmandApplication, SavingTrackHelper trackHelper) {
-		this.app = osmandApplication;
+	public GpxSelectionHelper(OsmandApplication app, SavingTrackHelper trackHelper) {
+		this.app = app;
 		savingTrackHelper = trackHelper;
+		app.getSettings().FOLLOW_THE_GPX_ROUTE.addListener(getFollowTrackListener());
 	}
 
 	public void clearAllGpxFilesToShow(boolean backupSelection) {
@@ -86,10 +95,18 @@ public class GpxSelectionHelper {
 	public void restoreSelectedGpxFiles() {
 		for (Entry<GPXFile, Long> gpxEntry : selectedGpxFilesBackUp.entrySet()) {
 			if (!Algorithms.isEmpty(gpxEntry.getKey().path)) {
-				final File file = new File(gpxEntry.getKey().path);
+				File file = new File(gpxEntry.getKey().path);
 				if (file.exists() && !file.isDirectory()) {
 					if (file.lastModified() > gpxEntry.getValue()) {
-						new GpxFileLoaderTask(file, app).execute();
+						new GpxFileLoaderTask(file, new CallbackWithObject<GPXFile>() {
+							@Override
+							public boolean processResult(GPXFile result) {
+								if (result != null) {
+									selectGpxFile(result, true, false);
+								}
+								return true;
+							}
+						}).execute();
 					} else {
 						selectGpxFile(gpxEntry.getKey(), true, false);
 					}
@@ -99,14 +116,52 @@ public class GpxSelectionHelper {
 		}
 	}
 
+	public boolean shouldHideTrackToFollow() {
+		return shouldHideTrackToFollow;
+	}
+
+	private StateChangedListener<String> getFollowTrackListener() {
+		if (followTrackListener == null) {
+			followTrackListener = new StateChangedListener<String>() {
+				@Override
+				public void stateChanged(String gpxRoutePath) {
+					if (trackToFollow != null) {
+						if (shouldHideTrackToFollow) {
+							selectGpxFile(trackToFollow.getGpxFile(), false, false);
+							shouldHideTrackToFollow = false;
+						}
+						trackToFollow = null;
+					}
+					if (!Algorithms.isEmpty(gpxRoutePath)) {
+						trackToFollow = getSelectedFileByPath(gpxRoutePath);
+						if (trackToFollow == null) {
+							shouldHideTrackToFollow = true;
+							File file = new File(gpxRoutePath);
+							if (file.exists() && !file.isDirectory()) {
+								new GpxFileLoaderTask(file, new CallbackWithObject<GPXFile>() {
+									@Override
+									public boolean processResult(GPXFile result) {
+										trackToFollow = selectGpxFile(result, true, false);
+										return true;
+									}
+								}).execute();
+							}
+						}
+					}
+				}
+			};
+		}
+		return followTrackListener;
+	}
+
 	private static class GpxFileLoaderTask extends AsyncTask<Void, Void, GPXFile> {
 
-		File fileToLoad;
-		GpxSelectionHelper helper;
+		private File fileToLoad;
+		private CallbackWithObject<GPXFile> callback;
 
-		GpxFileLoaderTask(File fileToLoad, OsmandApplication app) {
+		GpxFileLoaderTask(File fileToLoad, CallbackWithObject<GPXFile> callback) {
 			this.fileToLoad = fileToLoad;
-			this.helper = app.getSelectedGpxHelper();
+			this.callback = callback;
 		}
 
 		@Override
@@ -116,8 +171,8 @@ public class GpxSelectionHelper {
 
 		@Override
 		protected void onPostExecute(GPXFile gpxFile) {
-			if (gpxFile != null) {
-				helper.selectGpxFile(gpxFile, true, false);
+			if (callback != null) {
+				callback.processResult(gpxFile);
 			}
 		}
 	}
@@ -875,7 +930,13 @@ public class GpxSelectionHelper {
 			this.displayGroups = displayGroups;
 		}
 
-
+		public boolean isFollowTrack(OsmandApplication app) {
+			RouteProvider.GPXRouteParamsBuilder routeParams = app.getRoutingHelper().getCurrentGPXRoute();
+			if (routeParams != null) {
+				return gpxFile.path.equals(routeParams.getFile().path);
+			}
+			return false;
+		}
 	}
 
 	public enum GpxDisplayItemType {

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

@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.AndroidUtils;
+import net.osmand.FileUtils;
 import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.WptPt;
@@ -1005,15 +1006,14 @@ public class MapMarkersHelper {
 	}
 
 	public String generateGpx(String fileName) {
-		final File dir = ctx.getAppPath(IndexConstants.GPX_INDEX_DIR + IndexConstants.MAP_MARKERS_INDEX_DIR);
+		String dirName = IndexConstants.GPX_INDEX_DIR + IndexConstants.MAP_MARKERS_INDEX_DIR;
+		File dir = ctx.getAppPath(dirName);
 		if (!dir.exists()) {
 			dir.mkdirs();
 		}
-		File fout = new File(dir, fileName + IndexConstants.GPX_FILE_EXT);
-		int ind = 1;
-		while (fout.exists()) {
-			fout = new File(dir, fileName + "_" + (++ind) + IndexConstants.GPX_FILE_EXT);
-		}
+		String uniqueFileName = FileUtils.createUniqueFileName(ctx, fileName, dirName, IndexConstants.GPX_FILE_EXT);
+		File fout = new File(dir, uniqueFileName + IndexConstants.GPX_FILE_EXT);
+
 		GPXFile file = new GPXFile(Version.getFullVersion(ctx));
 		for (MapMarker marker : mapMarkers) {
 			WptPt wpt = new WptPt();

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

@@ -230,8 +230,12 @@ public class UiUtilities {
 	}
 
 	@ColorInt
-	public static int mixTwoColors(@ColorInt int color1, @ColorInt int color2, float amount )
-	{
+	public static int removeAlpha(@ColorInt int color) {
+		return Color.rgb(Color.red(color), Color.green(color), Color.blue(color));
+	}
+
+	@ColorInt
+	public static int mixTwoColors(@ColorInt int color1, @ColorInt int color2, float amount) {
 		final byte ALPHA_CHANNEL = 24;
 		final byte RED_CHANNEL   = 16;
 		final byte GREEN_CHANNEL =  8;

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

@@ -128,6 +128,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 
 				@Override
 				public void onFavoriteDataUpdated(@NonNull FavouritePoint favouritePoint) {
+					favouritesAdapter.notifyDataSetChanged();
 				}
 			});
 		}

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

@@ -86,7 +86,6 @@ import net.osmand.plus.base.FailSafeFuntions;
 import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.chooseplan.OsmLiveCancelledDialog;
 import net.osmand.plus.dashboard.DashboardOnMap;
-import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
 import net.osmand.plus.dialogs.CrashBottomSheetDialogFragment;
 import net.osmand.plus.dialogs.ImportGpxBottomSheetDialogFragment;
 import net.osmand.plus.dialogs.RateUsBottomSheetDialogFragment;
@@ -109,21 +108,15 @@ import net.osmand.plus.helpers.ScrollHelper.OnScrollEventListener;
 import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.MenuController;
-import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
 import net.osmand.plus.mapcontextmenu.builders.cards.dialogs.ContextMenuCardDialogFragment;
-import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditor;
-import net.osmand.plus.mapcontextmenu.editors.PointEditorFragmentNew;
-import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
 import net.osmand.plus.mapcontextmenu.other.DestinationReachedMenu;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
-import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
 import net.osmand.plus.mapmarkers.PlanRouteFragment;
 import net.osmand.plus.measurementtool.GpxApproximationFragment;
 import net.osmand.plus.measurementtool.GpxData;
 import net.osmand.plus.measurementtool.MeasurementEditingContext;
 import net.osmand.plus.measurementtool.MeasurementToolFragment;
-import net.osmand.plus.measurementtool.SnapTrackWarningBottomSheet;
-import net.osmand.plus.quickaction.QuickActionListFragment;
+import net.osmand.plus.measurementtool.SnapTrackWarningFragment;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.resources.ResourceManager;
 import net.osmand.plus.routepreparationmenu.ChooseRouteFragment;
@@ -141,12 +134,8 @@ import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomiz
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
-import net.osmand.plus.settings.fragments.ConfigureMenuItemsFragment;
 import net.osmand.plus.settings.fragments.ConfigureProfileFragment;
 import net.osmand.plus.settings.fragments.DataStorageFragment;
-import net.osmand.plus.settings.fragments.ImportCompleteFragment;
-import net.osmand.plus.settings.fragments.ImportSettingsFragment;
-import net.osmand.plus.settings.fragments.ProfileAppearanceFragment;
 import net.osmand.plus.track.TrackAppearanceFragment;
 import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
 import net.osmand.plus.views.AnimateDraggingMapThread;
@@ -158,7 +147,6 @@ import net.osmand.plus.views.OsmandMapTileView.OnDrawMapListener;
 import net.osmand.plus.views.corenative.NativeCoreContext;
 import net.osmand.plus.views.layers.MapControlsLayer;
 import net.osmand.plus.views.layers.MapInfoLayer;
-import net.osmand.plus.views.layers.MapQuickActionLayer;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType;
 import net.osmand.render.RenderingRulesStorage;
@@ -669,85 +657,17 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			closeDrawer();
 			return;
 		}
-		if (getQuickSearchDialogFragment() != null) {
-			showQuickSearch(ShowQuickSearchMode.CURRENT, false);
-			return;
-		}
-		if (trackDetailsMenu.isVisible()) {
-			trackDetailsMenu.hide(true);
-			if (mapContextMenu.isActive() && mapContextMenu.getPointDescription() != null
-					&& mapContextMenu.getPointDescription().isGpxPoint()) {
-				mapContextMenu.show();
-				return;
-			}
-			if (prevActivityIntent == null) {
-				return;
-			}
-		}
-		PlanRouteFragment planRouteFragment = getPlanRouteFragment();
-		if (planRouteFragment != null) {
-			if (planRouteFragment.quit(true)) {
-				MapMarkersDialogFragment.showInstance(this);
-			}
-			return;
-		}
-
-		SnapTrackWarningBottomSheet snapTrackWarningBottomSheet = getSnapTrackWarningBottomSheet();
-		if (snapTrackWarningBottomSheet != null) {
-			snapTrackWarningBottomSheet.dismiss();
-			return;
-		}
-
-		GpxApproximationFragment gpxApproximationFragment = getGpxApproximationFragment();
-		if (gpxApproximationFragment != null) {
-			gpxApproximationFragment.dismissImmediate();
-			return;
-		}
-
-		MeasurementToolFragment measurementToolFragment = getMeasurementToolFragment();
-		if (measurementToolFragment != null) {
-			measurementToolFragment.quit(true);
-			return;
-		}
-		ChooseRouteFragment chooseRouteFragment = getChooseRouteFragment();
-		if (chooseRouteFragment != null) {
-			chooseRouteFragment.dismiss(true);
-			return;
-		}
-		ProfileAppearanceFragment profileAppearanceFragment = getProfileAppearanceFragment();
-		if (profileAppearanceFragment != null) {
-			if (profileAppearanceFragment.isProfileAppearanceChanged()) {
-				return;
-			}
-		}
-
-		PointEditorFragmentNew pointEditorFragmentNew = getPointEditorFragmentNew();
-		if (pointEditorFragmentNew != null) {
-			pointEditorFragmentNew.showExitDialog();
-			return;
-		}
-
-		TrackAppearanceFragment trackAppearanceFragment = getTrackAppearanceFragment();
-		if (trackAppearanceFragment != null) {
-			trackAppearanceFragment.dismissImmediate();
-			if (prevActivityIntent == null) {
-				return;
-			}
-		}
-
-
-		if (mapContextMenu.isVisible() && mapContextMenu.isClosable()) {
-			if (mapContextMenu.getCurrentMenuState() != MenuState.HEADER_ONLY && !isLandscapeLayout()) {
-				mapContextMenu.openMenuHeaderOnly();
-			} else {
-				mapContextMenu.close();
-			}
-			return;
-		}
 		if (getMapLayers().getContextMenuLayer().isInAddGpxPointMode()) {
 			quitAddGpxPointMode();
 		}
-		if (prevActivityIntent != null && getSupportFragmentManager().getBackStackEntryCount() == 0) {
+		if (getSupportFragmentManager().getBackStackEntryCount() == 0 && launchPrevActivityIntent()) {
+			return;
+		}
+		super.onBackPressed();
+	}
+
+	public boolean launchPrevActivityIntent() {
+		if (prevActivityIntent != null) {
 			prevActivityIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 			LatLon loc = getMapLocation();
 			prevActivityIntent.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude());
@@ -755,40 +675,13 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			if (mapViewTrackingUtilities.isMapLinkedToLocation()) {
 				prevActivityIntent.putExtra(SearchActivity.SEARCH_NEARBY, true);
 			}
-			this.startActivity(prevActivityIntent);
+			startActivity(prevActivityIntent);
 			prevActivityIntent = null;
-			return;
+			return true;
 		}
-		QuickActionListFragment quickActionListFragment = getQuickActionListFragment();
-		if (quickActionListFragment != null && quickActionListFragment.isVisible()) {
-			if (quickActionListFragment.fromDashboard()) {
-				this.getDashboard().setDashboardVisibility(true, DashboardType.CONFIGURE_SCREEN, null);
-			} else {
-				getMapView().getLayerByClass(MapQuickActionLayer.class).onBackPressed();
-			}
-		} else if (getMapView().getLayerByClass(MapQuickActionLayer.class).onBackPressed()) {
-			return;
-		}
-		ImportSettingsFragment importSettingsFragment = getImportSettingsFragment();
-		if (importSettingsFragment != null) {
-			importSettingsFragment.showExitDialog();
-			return;
-		}
-		ImportCompleteFragment importCompleteFragment = getImportCompleteFragment();
-		if (importCompleteFragment != null) {
-			importCompleteFragment.dismissFragment();
-			return;
-		}
-		ConfigureMenuItemsFragment configureMenuItemsFragment = getConfigureMenuItemsFragment();
-		if (configureMenuItemsFragment != null) {
-			configureMenuItemsFragment.exitFragment();
-			return;
-		}
-
-		super.onBackPressed();
+		return false;
 	}
 
-
 	private void quitAddGpxPointMode() {
 		getMapLayers().getContextMenuLayer().getAddGpxPointBottomSheetHelper().hide();
 		getMapLayers().getContextMenuLayer().quitAddGpxPoint();
@@ -930,7 +823,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 						DataStoragePlaceDialogFragment.showInstance(getSupportFragmentManager(), true);
 					} else {
 						ActivityCompat.requestPermissions(this,
-								new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+								new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE},
 								DownloadActivity.PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE);
 					}
 				}
@@ -2301,45 +2194,12 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		return getFragment(ChooseRouteFragment.TAG);
 	}
 
-	public ProfileAppearanceFragment getProfileAppearanceFragment() {
-		return getFragment(ProfileAppearanceFragment.TAG);
-	}
-
-	public QuickActionListFragment getQuickActionListFragment() {
-		return  getFragment(QuickActionListFragment.TAG);
-	}
-
-	public ImportSettingsFragment getImportSettingsFragment() {
-		return getFragment(ImportSettingsFragment.TAG);
-	}
-
-	public ImportCompleteFragment getImportCompleteFragment() {
-		return getFragment(ImportCompleteFragment.TAG);
-	}
-
-	public ConfigureMenuItemsFragment getConfigureMenuItemsFragment() {
-		return getFragment(ConfigureMenuItemsFragment.TAG);
-	}
-
-	public TrackAppearanceFragment getTrackAppearanceFragment() {
-		return getFragment(TrackAppearanceFragment.TAG);
-	}
-
 	public GpxApproximationFragment getGpxApproximationFragment() {
 		return getFragment(GpxApproximationFragment.TAG);
 	}
 
-	private SnapTrackWarningBottomSheet getSnapTrackWarningBottomSheet() {
-		return getFragment(SnapTrackWarningBottomSheet.TAG);
-	}
-
-	public PointEditorFragmentNew getPointEditorFragmentNew() {
-		PointEditorFragmentNew pointEditorFragmentNew;
-		pointEditorFragmentNew = getFragment(FavoritePointEditor.TAG);
-		if (pointEditorFragmentNew == null) {
-			pointEditorFragmentNew = getFragment(WptPtEditor.TAG);
-		}
-		return pointEditorFragmentNew;
+	public SnapTrackWarningFragment getSnapTrackWarningBottomSheet() {
+		return getFragment(SnapTrackWarningFragment.TAG);
 	}
 
 	public void backToConfigureProfileFragment() {
@@ -2353,7 +2213,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 	}
 
-	<T> T getFragment(String fragmentTag){
+	<T> T getFragment(String fragmentTag) {
 		Fragment fragment = getSupportFragmentManager().findFragmentByTag(fragmentTag);
 		return fragment != null && !fragment.isDetached() && !fragment.isRemoving() ? (T) fragment : null;
 	}

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

@@ -59,7 +59,9 @@ import net.osmand.plus.mapcontextmenu.AdditionalActionsBottomSheetDialogFragment
 import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
 import net.osmand.plus.mapmarkers.MarkersPlanRouteContext;
 import net.osmand.plus.measurementtool.MeasurementToolFragment;
+import net.osmand.plus.measurementtool.StartPlanRouteBottomSheet;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.profiles.RoutingProfileDataObject;
 import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routepreparationmenu.WaypointsFragment;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
@@ -85,6 +87,7 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import static net.osmand.IndexConstants.GPX_FILE_EXT;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_CONFIGURE_MAP_ID;
@@ -114,6 +117,7 @@ import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_S
 import static net.osmand.plus.ContextMenuAdapter.PROFILES_CHOSEN_PROFILE_TAG;
 import static net.osmand.plus.ContextMenuAdapter.PROFILES_CONTROL_BUTTON_TAG;
 import static net.osmand.plus.ContextMenuAdapter.PROFILES_NORMAL_PROFILE_TAG;
+import static net.osmand.plus.settings.fragments.NavigationFragment.getRoutingProfiles;
 
 
 public class MapActivityActions implements DialogProvider {
@@ -293,7 +297,7 @@ public class MapActivityActions implements DialogProvider {
 					dlg.findViewById(R.id.DuplicateFileName).setVisibility(View.VISIBLE);
 				} else {
 					dlg.dismiss();
-					new SaveDirectionsAsyncTask(app).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, toSave);
+					new SaveDirectionsAsyncTask(app, false).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, toSave);
 				}
 			}
 		});
@@ -309,33 +313,42 @@ public class MapActivityActions implements DialogProvider {
 		return dlg;
 	}
 
-	private static class SaveDirectionsAsyncTask extends AsyncTask<File, Void, String> {
+	public static class SaveDirectionsAsyncTask extends AsyncTask<File, Void, GPXFile> {
 
 		private final OsmandApplication app;
+		boolean showOnMap;
 
-		public SaveDirectionsAsyncTask(OsmandApplication app) {
+		public SaveDirectionsAsyncTask(OsmandApplication app, boolean showOnMap) {
 			this.app = app;
+			this.showOnMap = showOnMap;
 		}
 
 		@Override
-		protected String doInBackground(File... params) {
+		protected GPXFile doInBackground(File... params) {
 			if (params.length > 0) {
 				File file = params[0];
-				String fileName = file.getName();
-				GPXFile gpx = app.getRoutingHelper().generateGPXFileWithRoute(fileName.substring(0,fileName.length()-GPX_FILE_EXT.length()));
-				GPXUtilities.writeGpxFile(file, gpx);
-				return app.getString(R.string.route_successfully_saved_at, file.getName());
+				String fileName = Algorithms.getFileNameWithoutExtension(file);
+				GPXFile gpx = app.getRoutingHelper().generateGPXFileWithRoute(fileName);
+				gpx.error = GPXUtilities.writeGpxFile(file, gpx);
+				return gpx;
 			}
 			return null;
 		}
 
 		@Override
-		protected void onPostExecute(String result) {
-			if (result != null) {
+		protected void onPostExecute(GPXFile gpxFile) {
+			if (gpxFile.error == null) {
+				app.getSelectedGpxHelper().selectGpxFile(gpxFile, showOnMap, false);
+				String result = app.getString(R.string.route_successfully_saved_at, gpxFile.tracks.get(0).name);
 				Toast.makeText(app, result, Toast.LENGTH_LONG).show();
+			} else {
+				String errorMessage = gpxFile.error.getMessage();
+				if (errorMessage == null) {
+					errorMessage = app.getString(R.string.error_occurred_saving_gpx);
+				}
+				Toast.makeText(app, errorMessage, Toast.LENGTH_LONG).show();
 			}
 		}
-
 	}
 
 	public void addActionsToAdapter(final double latitude,
@@ -475,6 +488,7 @@ public class MapActivityActions implements DialogProvider {
 				} else if (standardId == R.string.avoid_road) {
 					getMyApplication().getAvoidSpecificRoads().addImpassableRoad(mapActivity, new LatLon(latitude, longitude), true, false, null);
 				} else if (standardId == R.string.shared_string_add || standardId == R.string.favourites_context_menu_edit) {
+					mapActivity.getContextMenu().hide();
 					mapActivity.getContextMenu().buttonFavoritePressed();
 				} else if (standardId == R.string.shared_string_marker || standardId == R.string.shared_string_edit) {
 					mapActivity.getContextMenu().buttonWaypointPressed();
@@ -720,11 +734,11 @@ public class MapActivityActions implements DialogProvider {
 		ApplicationMode currentMode = app.getSettings().APPLICATION_MODE.get();
 
 		String modeDescription;
-		
+
+		Map<String, RoutingProfileDataObject> profilesObjects = getRoutingProfiles(app);
 		for (final ApplicationMode appMode : activeModes) {
 			if (appMode.isCustomProfile()) {
-				modeDescription = String.format(app.getString(R.string.profile_type_descr_string),
-						Algorithms.capitalizeFirstLetterAndLowercase(appMode.getParent().toHumanString()));
+				modeDescription = getCustomProfileDescription(app, appMode, profilesObjects);
 			} else {
 				modeDescription = getString(R.string.profile_type_base_string);
 			}
@@ -929,7 +943,7 @@ public class MapActivityActions implements DialogProvider {
 				.setListener(new ItemClickListener() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int position, boolean isChecked, int[] viewCoordinates) {
-						MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager());
+						StartPlanRouteBottomSheet.showInstance(mapActivity.getSupportFragmentManager());
 						return true;
 					}
 				}).createItem());
@@ -1034,8 +1048,8 @@ public class MapActivityActions implements DialogProvider {
 		ApplicationMode currentMode = app.getSettings().APPLICATION_MODE.get();
 		String modeDescription;
 		if (currentMode.isCustomProfile()) {
-			modeDescription = String.format(app.getString(R.string.profile_type_descr_string),
-					Algorithms.capitalizeFirstLetterAndLowercase(currentMode.getParent().toHumanString()));
+			Map<String, RoutingProfileDataObject> profilesObjects = getRoutingProfiles(app);
+			modeDescription = getCustomProfileDescription(app, currentMode, profilesObjects);
 		} else {
 			modeDescription = getString(R.string.profile_type_base_string);
 		}
@@ -1070,6 +1084,21 @@ public class MapActivityActions implements DialogProvider {
 				.createItem());
 	}
 
+	private String getCustomProfileDescription(OsmandApplication app, ApplicationMode mode,
+	                                           Map<String, RoutingProfileDataObject> profilesObjects){
+		String	description = getString(R.string.profile_type_custom_string);
+
+		String routingProfileKey = mode.getRoutingProfile();
+		if (!Algorithms.isEmpty(routingProfileKey)) {
+			RoutingProfileDataObject profileDataObject = profilesObjects.get(routingProfileKey);
+			if (profileDataObject != null) {
+				description = String.format(app.getString(R.string.profile_type_descr_string),
+						Algorithms.capitalizeFirstLetterAndLowercase(profileDataObject.getName()));
+			}
+		}
+		return description;
+	}
+
 	public void openIntermediatePointsDialog() {
 		mapActivity.hideContextAndRouteInfoMenues();
 		WaypointsFragment.showInstance(mapActivity.getSupportFragmentManager());

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

@@ -0,0 +1,282 @@
+package net.osmand.plus.base;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentActivity;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.UiUtilities.DialogButtonType;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.helpers.AndroidUiHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class BottomSheetBehaviourDialogFragment extends BottomSheetDialogFragment {
+
+	private static final String USED_ON_MAP_KEY = "used_on_map";
+	private static final int DEFAULT_VALUE = -1;
+
+	protected List<BaseBottomSheetItem> items = new ArrayList<>();
+
+	protected boolean usedOnMap = true;
+	protected boolean nightMode;
+	protected boolean portrait;
+
+	protected View dismissButton;
+	protected View rightButton;
+
+	private LinearLayout itemsContainer;
+
+	public void setUsedOnMap(boolean usedOnMap) {
+		this.usedOnMap = usedOnMap;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if (savedInstanceState != null) {
+			usedOnMap = savedInstanceState.getBoolean(USED_ON_MAP_KEY);
+		}
+		nightMode = isNightMode(requiredMyApplication());
+		portrait = AndroidUiHelper.isOrientationPortrait(requireActivity());
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+		LayoutInflater themedInflater = UiUtilities.getInflater(requireContext(), nightMode);
+		View mainView = themedInflater.inflate(R.layout.bottom_sheet_behaviour_base, parent, false);
+		itemsContainer = (LinearLayout) mainView.findViewById(R.id.items_container);
+
+		View scrollView = mainView.findViewById(R.id.bottom_sheet_scroll_view);
+		final BottomSheetBehavior behavior = BottomSheetBehavior.from(scrollView);
+		behavior.setPeekHeight(getPeekHeight());
+
+		LinearLayout buttonsContainer = (LinearLayout) mainView.findViewById(R.id.buttons_container);
+		buttonsContainer.setBackgroundResource(getButtonsContainerBg());
+
+		if (!portrait) {
+			Dialog dialog = getDialog();
+			if (dialog != null) {
+				dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+					@Override
+					public void onShow(DialogInterface dialog) {
+						behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+					}
+				});
+			}
+		}
+
+		createMenuItems(savedInstanceState);
+		inflateMenuItems();
+
+		dismissButton = mainView.findViewById(R.id.dismiss_button);
+		UiUtilities.setupDialogButton(nightMode, dismissButton, getDismissButtonType(), getDismissButtonTextId());
+		dismissButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				onDismissButtonClickAction();
+				dismiss();
+			}
+		});
+		if (hideButtonsContainer()) {
+			mainView.findViewById(R.id.buttons_container).setVisibility(View.GONE);
+		} else {
+			int rightBottomButtonTextId = getRightBottomButtonTextId();
+			if (rightBottomButtonTextId != DEFAULT_VALUE) {
+				mainView.findViewById(R.id.buttons_divider).setVisibility(View.VISIBLE);
+				rightButton = mainView.findViewById(R.id.right_bottom_button);
+				UiUtilities.setupDialogButton(nightMode, rightButton, getRightBottomButtonType(), rightBottomButtonTextId);
+				rightButton.setVisibility(View.VISIBLE);
+				rightButton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						onRightBottomButtonClick();
+					}
+				});
+			}
+		}
+		updateBackground();
+		updateBottomButtons();
+		return mainView;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		FragmentActivity activity = requireActivity();
+		if (!AndroidUiHelper.isOrientationPortrait(activity)) {
+			Dialog dialog = getDialog();
+			Window window = dialog != null ? dialog.getWindow() : null;
+			if (window != null) {
+				WindowManager.LayoutParams params = window.getAttributes();
+				params.width = activity.getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
+				window.setAttributes(params);
+			}
+		}
+	}
+
+	@Override
+	public void onSaveInstanceState(@NonNull Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putBoolean(USED_ON_MAP_KEY, usedOnMap);
+	}
+
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		items.clear();
+		if (itemsContainer != null) {
+			itemsContainer.removeAllViews();
+		}
+	}
+
+	public abstract void createMenuItems(Bundle savedInstanceState);
+
+	protected void inflateMenuItems() {
+		Activity activity = requireActivity();
+		for (BaseBottomSheetItem item : items) {
+			item.inflate(activity, itemsContainer, nightMode);
+		}
+	}
+
+	@Override
+	protected Drawable getContentIcon(@DrawableRes int id) {
+		return getIcon(id, nightMode ? R.color.icon_color_default_dark : R.color.icon_color_default_light);
+	}
+
+	protected Drawable getActiveIcon(@DrawableRes int id) {
+		return getIcon(id, getActiveColorId());
+	}
+
+	@ColorRes
+	protected int getActiveColorId() {
+		return nightMode ? R.color.osmand_orange : R.color.color_myloc_distance;
+	}
+
+	@ColorInt
+	protected int getResolvedColor(@ColorRes int colorId) {
+		Context ctx = getContext();
+		return ctx != null ? ContextCompat.getColor(ctx, colorId) : 0;
+	}
+
+	private void updateBackground() {
+		if (portrait) {
+			itemsContainer.setBackgroundResource(getPortraitBgResId());
+		} else {
+			itemsContainer.setBackgroundResource(getLandscapeTopsidesBgResId());
+		}
+	}
+
+	protected int getPeekHeight() {
+		return DEFAULT_VALUE;
+	}
+
+	protected boolean hideButtonsContainer() {
+		return false;
+	}
+
+	@StringRes
+	protected int getDismissButtonTextId() {
+		return R.string.shared_string_cancel;
+	}
+
+	protected DialogButtonType getDismissButtonType() {
+		return DialogButtonType.SECONDARY;
+	}
+
+	protected void onDismissButtonClickAction() {
+
+	}
+
+	@StringRes
+	protected int getRightBottomButtonTextId() {
+		return DEFAULT_VALUE;
+	}
+
+	protected DialogButtonType getRightBottomButtonType() {
+		return DialogButtonType.PRIMARY;
+	}
+
+	protected void onRightBottomButtonClick() {
+
+	}
+
+	protected boolean isDismissButtonEnabled() {
+		return true;
+	}
+
+	protected boolean isRightBottomButtonEnabled() {
+		return true;
+	}
+
+	protected void updateBottomButtons() {
+		if (dismissButton != null) {
+			boolean enabled = isDismissButtonEnabled();
+			dismissButton.setEnabled(enabled);
+			dismissButton.findViewById(R.id.button_text).setEnabled(enabled);
+		}
+		if (rightButton != null) {
+			boolean enabled = isRightBottomButtonEnabled();
+			rightButton.setEnabled(enabled);
+			rightButton.findViewById(R.id.button_text).setEnabled(enabled);
+		}
+	}
+
+	@ColorRes
+	protected int getBgColorId() {
+		return nightMode ? R.color.list_background_color_dark : R.color.list_background_color_light;
+	}
+
+	@DrawableRes
+	protected int getPortraitBgResId() {
+		return nightMode ? R.drawable.bg_bottom_menu_dark : R.drawable.bg_bottom_menu_light;
+	}
+
+	@DrawableRes
+	protected int getLandscapeTopsidesBgResId() {
+		return nightMode ? R.drawable.bg_bottom_sheet_topsides_landscape_dark : R.drawable.bg_bottom_sheet_topsides_landscape_light;
+	}
+
+	@DrawableRes
+	protected int getLandscapeSidesBgResId() {
+		return nightMode ? R.drawable.bg_bottom_sheet_sides_landscape_dark : R.drawable.bg_bottom_sheet_sides_landscape_light;
+	}
+
+	private int getButtonsContainerBg() {
+		if (portrait) {
+			return getBgColorId();
+		}
+		return nightMode ? R.drawable.bottom_sheet_buttons_bg_dark : R.drawable.bottom_sheet_buttons_bg_light;
+	}
+
+	protected boolean isNightMode(@NonNull OsmandApplication app) {
+		if (usedOnMap) {
+			return app.getDaynightHelper().isNightModeForMapControls();
+		}
+		return !app.getSettings().isLightContent();
+	}
+}

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

@@ -46,6 +46,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.mapcontextmenu.InterceptorLinearLayout;
 import net.osmand.plus.views.controls.HorizontalSwipeConfirm;
+import net.osmand.plus.views.controls.SingleTapConfirm;
 
 import static net.osmand.plus.mapcontextmenu.MapContextMenuFragment.CURRENT_Y_UNDEFINED;
 
@@ -315,7 +316,8 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 		processScreenHeight(container);
 		minHalfY = getMinHalfY(mapActivity);
 
-		final GestureDetector swipeDetector = new GestureDetector(app, new HorizontalSwipeConfirm(true));
+		final GestureDetector singleTapDetector = new GestureDetector(view.getContext(), new SingleTapConfirm());
+		final GestureDetector swipeDetector = new GestureDetector(view.getContext(), new HorizontalSwipeConfirm(true));
 
 		final OnTouchListener slideTouchListener = new OnTouchListener() {
 			private float dy;
@@ -330,6 +332,8 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 			private boolean slidingUp;
 			private boolean slidingDown;
 
+			private boolean hasMoved;
+
 			{
 				OsmandApplication app = requireMyApplication();
 				scroller = new OverScroller(app);
@@ -340,7 +344,15 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 
 			@Override
 			public boolean onTouch(View v, MotionEvent event) {
+				if (!hasMoved && getHeaderViewHeight() > 0 && event.getY() <= getHeaderViewHeight()) {
+					if (singleTapDetector.onTouchEvent(event)) {
+						moving = false;
+						onHeaderClick();
 
+						recycleVelocityTracker();
+						return true;
+					}
+				}
 				if (!portrait) {
 					if (swipeDetector.onTouchEvent(event)) {
 						dismiss();
@@ -352,6 +364,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 
 				switch (event.getAction()) {
 					case MotionEvent.ACTION_DOWN:
+						hasMoved = false;
 						mDownY = event.getRawY();
 						dy = event.getY();
 						dyMain = getViewY();
@@ -365,6 +378,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 							moving = true;
 						}
 						if (moving) {
+							hasMoved = true;
 							float y = event.getY();
 							float newY = getViewY() + (y - dy);
 							if (!portrait && newY > topScreenPosY) {
@@ -390,6 +404,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 					case MotionEvent.ACTION_UP:
 						if (moving) {
 							moving = false;
+							hasMoved = false;
 							int currentY = getViewY();
 							int fullScreenTopPosY = getMenuStatePosY(MenuState.FULL_SCREEN);
 							final VelocityTracker velocityTracker = this.velocityTracker;
@@ -417,6 +432,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 						break;
 					case MotionEvent.ACTION_CANCEL:
 						moving = false;
+						hasMoved = false;
 						recycleVelocityTracker();
 						break;
 
@@ -612,6 +628,10 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 		}
 	}
 
+	protected boolean isHideable() {
+		return true;
+	}
+
 	private void processScreenHeight(ViewParent parent) {
 		View container = (View) parent;
 		MapActivity mapActivity = getMapActivity();
@@ -783,7 +803,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 
 
 	private int getPosY(final int currentY, boolean needCloseMenu, int previousState) {
-		if (needCloseMenu) {
+		if (needCloseMenu && isHideable()) {
 			return screenHeight;
 		}
 		MapActivity mapActivity = getMapActivity();
@@ -858,7 +878,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 							@Override
 							public void onAnimationEnd(Animator animation) {
 								if (!canceled) {
-									if (needCloseMenu) {
+									if (needCloseMenu && isHideable()) {
 										dismiss();
 									} else {
 										updateMainViewLayout(posY);
@@ -870,7 +890,7 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 							}
 						}).start();
 			} else {
-				if (needCloseMenu) {
+				if (needCloseMenu && isHideable()) {
 					dismiss();
 				} else {
 					mainView.setY(posY);
@@ -899,6 +919,10 @@ public abstract class ContextMenuFragment extends BaseOsmAndFragment {
 		runLayoutListener();
 	}
 
+	protected void onHeaderClick() {
+
+	}
+
 	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 	protected void runLayoutListener() {
 		if (view != null) {

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

@@ -14,13 +14,13 @@ import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.PlatformUtil;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.settings.backend.OsmandSettings;
 
 import org.apache.commons.logging.Log;
 
@@ -161,9 +161,8 @@ public class FailSafeFuntions {
 		OsmandApplication app = ma.getMyApplication();
 		ma.getMapViewTrackingUtilities().backToLocationImpl();
 		RoutingHelper routingHelper = app.getRoutingHelper();
-		if(gpxRoute == null) {
-			app.getSettings().FOLLOW_THE_GPX_ROUTE.set(null);
-		}
+		app.getSettings().FOLLOW_THE_GPX_ROUTE.set(gpxRoute != null ? gpxRoute.getFile().path : null);
+
 		routingHelper.setGpxParams(gpxRoute);
 		if (app.getTargetPointsHelper().getPointToStart() == null) {
 			app.getTargetPointsHelper().setStartPoint(null, false, null);

OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemWithDescription.java

@@ -53,6 +53,7 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
 	public void setDescription(CharSequence description) {
 		this.description = description;
 		descriptionTv.setText(description);
+		changeDescriptionVisibility();
 	}
 
 	public void setDescriptionMaxLines(int maxLines) {
@@ -76,11 +77,7 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
 		super.inflate(context, container, nightMode);
 		descriptionTv = view.findViewById(R.id.description);
 		if (descriptionTv != null) {
-			if (Algorithms.isEmpty(description)) {
-				descriptionTv.setVisibility(View.GONE);
-			} else {
-				descriptionTv.setVisibility(View.VISIBLE);
-			}
+			changeDescriptionVisibility();
 			descriptionTv.setText(description);
 			if (descriptionColorId != INVALID_ID) {
 				descriptionTv.setTextColor(ContextCompat.getColor(context, descriptionColorId));
@@ -94,6 +91,14 @@ public class BottomSheetItemWithDescription extends SimpleBottomSheetItem {
 		}
 	}
 
+	private void changeDescriptionVisibility() {
+		if (Algorithms.isEmpty(description)) {
+			descriptionTv.setVisibility(View.GONE);
+		} else {
+			descriptionTv.setVisibility(View.VISIBLE);
+		}
+	}
+
 	public static class Builder extends SimpleBottomSheetItem.Builder {
 
 		protected CharSequence description;

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

@@ -113,30 +113,27 @@ public class GpxAppearanceAdapter extends ArrayAdapter<GpxAppearanceAdapter.Appe
 		}
 
 		if (trackWidthProp != null) {
-			AppearanceListItem item = new AppearanceListItem(ConfigureMapMenu.CURRENT_TRACK_WIDTH_ATTR, "",
-					SettingsActivity.getStringPropertyValue(app, trackWidthProp.getDefaultValueDescription()));
-			items.add(item);
 			for (int j = 0; j < trackWidthProp.getPossibleValues().length; j++) {
-				item = new AppearanceListItem(ConfigureMapMenu.CURRENT_TRACK_WIDTH_ATTR,
+				AppearanceListItem item = new AppearanceListItem(ConfigureMapMenu.CURRENT_TRACK_WIDTH_ATTR,
 						trackWidthProp.getPossibleValues()[j],
 						SettingsActivity.getStringPropertyValue(app, trackWidthProp.getPossibleValues()[j]));
 				items.add(item);
+				if (j == trackWidthProp.getPossibleValues().length - 1) {
+					item.setLastItem(true);
+				}
 			}
-			item.setLastItem(true);
 		}
 		if (trackColorProp != null) {
-			AppearanceListItem item = new AppearanceListItem(ConfigureMapMenu.CURRENT_TRACK_COLOR_ATTR, "",
-					SettingsActivity.getStringPropertyValue(app, trackColorProp.getDefaultValueDescription()),
-					parseTrackColor(renderer, ""));
-			items.add(item);
 			for (int j = 0; j < trackColorProp.getPossibleValues().length; j++) {
-				item = new AppearanceListItem(ConfigureMapMenu.CURRENT_TRACK_COLOR_ATTR,
+				AppearanceListItem item = new AppearanceListItem(ConfigureMapMenu.CURRENT_TRACK_COLOR_ATTR,
 						trackColorProp.getPossibleValues()[j],
 						SettingsActivity.getStringPropertyValue(app, trackColorProp.getPossibleValues()[j]),
 						parseTrackColor(renderer, trackColorProp.getPossibleValues()[j]));
 				items.add(item);
+				if (j == trackColorProp.getPossibleValues().length - 1) {
+					item.setLastItem(true);
+				}
 			}
-			item.setLastItem(true);
 		}
 		return items;
 	}

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

@@ -30,7 +30,7 @@ public class WhatsNewDialogFragment extends DialogFragment {
 		final OsmandApplication osmandApplication = (OsmandApplication) getActivity().getApplication();
 		final String appVersion = Version.getAppVersion(osmandApplication);
 		builder.setTitle(getString(R.string.whats_new) + " " + appVersion)
-				.setMessage(getString(R.string.release_3_7))
+				.setMessage(getString(R.string.release_3_8))
 				.setNegativeButton(R.string.shared_string_close, null);
 		if (AppInitializer.LATEST_CHANGES_URL != null) {
 			builder.setPositiveButton(R.string.read_more, new DialogInterface.OnClickListener() {

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

@@ -74,10 +74,13 @@ import java.util.Locale;
 import java.util.zip.ZipInputStream;
 
 import static android.app.Activity.RESULT_OK;
+import static net.osmand.IndexConstants.WPT_CHART_FILE_EXT;
 import static net.osmand.IndexConstants.GPX_FILE_EXT;
 import static net.osmand.IndexConstants.OSMAND_SETTINGS_FILE_EXT;
 import static net.osmand.IndexConstants.RENDERER_INDEX_EXT;
 import static net.osmand.IndexConstants.ROUTING_FILE_EXT;
+import static net.osmand.IndexConstants.SQLITE_CHART_FILE_EXT;
+import static net.osmand.IndexConstants.SQLITE_EXT;
 import static net.osmand.data.FavouritePoint.DEFAULT_BACKGROUND_TYPE;
 import static net.osmand.plus.AppInitializer.loadRoutingFiles;
 import static net.osmand.plus.myplaces.FavoritesActivity.FAV_TAB;
@@ -181,7 +184,7 @@ public class ImportHelper {
 		} else if (isContentIntent) {
 			fileName = getNameFromContentUri(app, uri);
 		}
-		handleGpxOrFavouritesImport(uri, fileName, saveFile, false, true);
+		handleGpxOrFavouritesImport(uri, fileName, saveFile, false, true, false);
 	}
 
 	public void handleFileImport(Uri intentUri, String fileName, Bundle extras, boolean useImportDir) {
@@ -191,7 +194,7 @@ public class ImportHelper {
 		final boolean saveFile = !isFileIntent || !isOsmandSubdir;
 
 		if (fileName == null) {
-			handleGpxOrFavouritesImport(intentUri, fileName, saveFile, useImportDir, false);
+			handleGpxOrFavouritesImport(intentUri, fileName, saveFile, useImportDir, false, false);
 		} else  if (fileName.endsWith(KML_SUFFIX)) {
 			handleKmlImport(intentUri, fileName, saveFile, useImportDir);
 		} else if (fileName.endsWith(KMZ_SUFFIX)) {
@@ -204,8 +207,12 @@ public class ImportHelper {
 			handleOsmAndSettingsImport(intentUri, fileName, extras, null);
 		} else if (fileName.endsWith(ROUTING_FILE_EXT)) {
 			handleXmlFileImport(intentUri, fileName, null);
+		} else if (fileName.endsWith(WPT_CHART_FILE_EXT)) {
+			handleGpxOrFavouritesImport(intentUri, fileName.replace(WPT_CHART_FILE_EXT, GPX_FILE_EXT), saveFile, useImportDir, false, true);
+		} else if (fileName.endsWith(SQLITE_CHART_FILE_EXT)) {
+			handleSqliteTileImport(intentUri, fileName.replace(SQLITE_CHART_FILE_EXT, SQLITE_EXT));
 		} else {
-			handleGpxOrFavouritesImport(intentUri, fileName, saveFile, useImportDir, false);
+			handleGpxOrFavouritesImport(intentUri, fileName, saveFile, useImportDir, false, false);
 		}
 	}
 
@@ -277,7 +284,9 @@ public class ImportHelper {
 	}
 
 	@SuppressLint("StaticFieldLeak")
-	private void handleGpxOrFavouritesImport(final Uri fileUri, final String fileName, final boolean save, final boolean useImportDir, final boolean forceImportFavourites) {
+	private void handleGpxOrFavouritesImport(final Uri fileUri, final String fileName, final boolean save,
+											 final boolean useImportDir, final boolean forceImportFavourites,
+											 final boolean forceImportGpx) {
 		new AsyncTask<Void, Void, GPXFile>() {
 			ProgressDialog progress = null;
 
@@ -343,8 +352,7 @@ public class ImportHelper {
 				if (AndroidUtils.isActivityNotDestroyed(activity)) {
 					progress.dismiss();
 				}
-
-				importGpxOrFavourites(result, fileName, save, useImportDir, forceImportFavourites);
+				importGpxOrFavourites(result, fileName, save, useImportDir, forceImportFavourites, forceImportGpx);
 			}
 		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 	}
@@ -1108,11 +1116,7 @@ public class ImportHelper {
 		}
 
 		private void showPlanRouteFragment() {
-			MeasurementToolFragment fragment = (MeasurementToolFragment) activity.getSupportFragmentManager()
-					.findFragmentByTag(MeasurementToolFragment.TAG);
-			if (fragment != null && !fragment.isDetached() && !fragment.isRemoving()) {
-				fragment.addNewGpxData(result);
-			}
+			MeasurementToolFragment.showInstance(activity.getSupportFragmentManager(), result);
 		}
 	}
 
@@ -1148,7 +1152,8 @@ public class ImportHelper {
 	}
 
 	private void importGpxOrFavourites(final GPXFile gpxFile, final String fileName, final boolean save,
-									   final boolean useImportDir, final boolean forceImportFavourites) {
+									   final boolean useImportDir, final boolean forceImportFavourites,
+									   final boolean forceImportGpx) {
 		if (gpxFile == null || gpxFile.isPointsEmpty()) {
 			if (forceImportFavourites) {
 				final DialogInterface.OnClickListener importAsTrackListener = new DialogInterface.OnClickListener() {
@@ -1181,16 +1186,20 @@ public class ImportHelper {
 		if (forceImportFavourites) {
 			importFavoritesImpl(gpxFile, fileName, true);
 		} else if (fileName != null) {
-			ImportGpxBottomSheetDialogFragment fragment = new ImportGpxBottomSheetDialogFragment();
-			fragment.setUsedOnMap(true);
-			fragment.setImportHelper(this);
-			fragment.setGpxFile(gpxFile);
-			fragment.setFileName(fileName);
-			fragment.setSave(save);
-			fragment.setUseImportDir(useImportDir);
-			activity.getSupportFragmentManager().beginTransaction()
-					.add(fragment, ImportGpxBottomSheetDialogFragment.TAG)
-					.commitAllowingStateLoss();
+			if (forceImportGpx) {
+				handleResult(gpxFile, fileName, save, useImportDir, false);
+			} else {
+				ImportGpxBottomSheetDialogFragment fragment = new ImportGpxBottomSheetDialogFragment();
+				fragment.setUsedOnMap(true);
+				fragment.setImportHelper(this);
+				fragment.setGpxFile(gpxFile);
+				fragment.setFileName(fileName);
+				fragment.setSave(save);
+				fragment.setUseImportDir(useImportDir);
+				activity.getSupportFragmentManager().beginTransaction()
+						.add(fragment, ImportGpxBottomSheetDialogFragment.TAG)
+						.commitAllowingStateLoss();
+			}
 		}
 	}
 
@@ -1212,6 +1221,7 @@ public class ImportHelper {
 				if (p.desc != null) {
 					fp.setDescription(p.desc);
 				}
+				fp.setAddress(p.getExtensionsToRead().get("address"));
 				fp.setColor(p.getColor(0));
 				fp.setIconIdFromName(app, p.getIconName());
 				fp.setBackgroundType(BackgroundType.getByTypeName(p.getBackgroundType(), DEFAULT_BACKGROUND_TYPE));

OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java

@@ -63,6 +63,7 @@ public class InAppPurchaseHelper {
 
 	private InAppPurchases purchases;
 	private long lastValidationCheckTime;
+	private boolean inventoryRequested;
 
 	private static final long PURCHASE_VALIDATION_PERIOD_MSEC = 1000 * 60 * 60 * 24; // daily
 	// (arbitrary) request code for the purchase flow
@@ -333,8 +334,8 @@ public class InAppPurchaseHelper {
 	}
 
 	public boolean needRequestInventory() {
-		return (isSubscribedToLiveUpdates(ctx) && Algorithms.isEmpty(ctx.getSettings().BILLING_PURCHASE_TOKENS_SENT.get()))
-				|| System.currentTimeMillis() - lastValidationCheckTime > PURCHASE_VALIDATION_PERIOD_MSEC;
+		return !inventoryRequested && ((isSubscribedToLiveUpdates(ctx) && Algorithms.isEmpty(ctx.getSettings().BILLING_PURCHASE_TOKENS_SENT.get()))
+				|| System.currentTimeMillis() - lastValidationCheckTime > PURCHASE_VALIDATION_PERIOD_MSEC);
 	}
 
 	public void requestInventory() {
@@ -803,6 +804,7 @@ public class InAppPurchaseHelper {
 		protected void onPostExecute(String response) {
 			logDebug("Response=" + response);
 			if (response != null) {
+				inventoryRequested = true;
 				try {
 					JSONObject obj = new JSONObject(response);
 					JSONArray names = obj.names();

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java

@@ -37,6 +37,7 @@ import android.widget.OverScroller;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -108,11 +109,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	private InterceptorLinearLayout mainView;
 
 	private View toolbarContainer;
-	private View toolbarView;
-	private ImageView toolbarBackButton;
 	private TextView toolbarTextView;
 	private View topButtonContainer;
-	private LockableScrollView menuScrollView;
 
 	private LinearLayout mainRouteBadgeContainer;
 	private LinearLayout nearbyRoutesLayout;
@@ -123,8 +121,6 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	private TextView localRoutesMoreTv;
 
 	private View zoomButtonsView;
-	private ImageButton zoomInButtonView;
-	private ImageButton zoomOutButtonView;
 
 	private MapContextMenu menu;
 	private OnLayoutChangeListener containerLayoutListener;
@@ -149,7 +145,6 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	private int topScreenPosY;
 	private int bottomToolbarPosY;
 	private int minHalfY;
-	private int shadowHeight;
 	private int zoomPaddingTop;
 
 	private OsmandMapTileView map;
@@ -164,13 +159,32 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	private boolean wasDrawerDisabled;
 	private boolean zoomIn;
 
-	private int screenOrientation;
 	private boolean created;
 
 	private boolean transportBadgesCreated;
 
 	private UpdateLocationViewCache updateLocationViewCache;
 
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			boolean enabled = mapActivity.getQuickSearchDialogFragment() == null;
+			mapActivity.getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(enabled) {
+				public void handleOnBackPressed() {
+					if (menu.isVisible() && menu.isClosable()) {
+						if (menu.getCurrentMenuState() != MenuState.HEADER_ONLY && !menu.isLandscapeLayout()) {
+							menu.openMenuHeaderOnly();
+						} else {
+							menu.close();
+						}
+					}
+				}
+			});
+		}
+	}
+
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 	                         Bundle savedInstanceState) {
@@ -188,7 +202,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 
 		markerPaddingPx = dpToPx(MARKER_PADDING_DP);
 		markerPaddingXPx = dpToPx(MARKER_PADDING_X_DP);
-		shadowHeight = dpToPx(SHADOW_HEIGHT_TOP_DP);
+		int shadowHeight = dpToPx(SHADOW_HEIGHT_TOP_DP);
 		topScreenPosY = addStatusBarHeightIfNeeded(-shadowHeight);
 		bottomToolbarPosY = addStatusBarHeightIfNeeded(getResources().getDimensionPixelSize(R.dimen.dashboard_map_toolbar));
 		minHalfY = viewHeight - (int) (viewHeight * menu.getHalfScreenMaxHeightKoef());
@@ -204,8 +218,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		mainView = view.findViewById(R.id.context_menu_main);
 
 		toolbarContainer = view.findViewById(R.id.context_menu_toolbar_container);
-		toolbarView = view.findViewById(R.id.context_menu_toolbar);
-		toolbarBackButton = view.findViewById(R.id.context_menu_toolbar_back);
+		ImageView toolbarBackButton = view.findViewById(R.id.context_menu_toolbar_back);
 		toolbarTextView = (TextView) view.findViewById(R.id.context_menu_toolbar_text);
 		updateVisibility(toolbarContainer, 0);
 		toolbarBackButton.setOnClickListener(new View.OnClickListener() {
@@ -510,9 +523,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 
 		// Zoom buttons
 		zoomButtonsView = view.findViewById(R.id.context_menu_zoom_buttons);
-		zoomInButtonView = (ImageButton) view.findViewById(R.id.context_menu_zoom_in_button);
-		zoomOutButtonView = (ImageButton) view.findViewById(R.id.context_menu_zoom_out_button);
 		if (menu.zoomButtonsVisible()) {
+			ImageButton zoomInButtonView = view.findViewById(R.id.context_menu_zoom_in_button);
+			ImageButton zoomOutButtonView = view.findViewById(R.id.context_menu_zoom_out_button);
 			AndroidUtils.updateImageButton(app, zoomInButtonView, R.drawable.ic_zoom_in, R.drawable.ic_zoom_in,
 					R.drawable.btn_circle_trans, R.drawable.btn_circle_night, nightMode);
 			AndroidUtils.updateImageButton(app, zoomOutButtonView, R.drawable.ic_zoom_out, R.drawable.ic_zoom_out,
@@ -2302,5 +2315,4 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		updateAdditionalInfoVisibility();
 		runLayoutListener();
 	}
-}
-
+}

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

@@ -28,6 +28,7 @@ import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditorFragment;
 import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditorFragmentNew;
 import net.osmand.plus.transport.TransportStopRoute;
 import net.osmand.plus.widgets.style.CustomTypefaceSpan;
+import net.osmand.util.Algorithms;
 import net.osmand.util.OpeningHoursParser;
 import net.osmand.view.GravityDrawable;
 
@@ -160,9 +161,12 @@ public class FavouritePointMenuController extends MenuController {
 	@NonNull
 	@Override
 	public CharSequence getSubtypeStr() {
-		if (fav.getAddress() != null) {Typeface typeface = FontCache.getRobotoRegular(getMapActivity());
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null && !Algorithms.isEmpty(fav.getAddress())) {
+			Typeface typeface = FontCache.getRobotoRegular(mapActivity);
 			SpannableString addressSpannable = new SpannableString(fav.getAddress());
 			addressSpannable.setSpan(new CustomTypefaceSpan(typeface), 0, addressSpannable.length(), 0);
+
 			return addressSpannable;
 		} else {
 			return "";