Merge branches 'master' and 'speed_cameras' of https://github.com/osmandapp/Osmand into speed_cameras

 Conflicts:

	OsmAnd/res/values/strings.xml

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

	OsmAnd/src/net/osmand/plus/mapsource/InputZoomLevelsBottomSheet.java

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

@@ -354,6 +354,7 @@ public class NativeLibrary {
 				FileInputStream fis = new FileInputStream(f);
 				Algorithms.streamCopy(fis, ous);
 				fis.close();
+				System.out.println("FONT " + name);
 				initFontType(ous.toByteArray(), name.substring(0, name.length() - 4), name.toLowerCase().contains("bold"),
 						name.toLowerCase().contains("italic"));
 			} catch (IOException e) {

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

@@ -20,14 +20,18 @@ public class Reshaper {
 			return "";
 		}
 	}
+	
 	public static String reshape(String s) {
 		try {
-			ArabicShaping as = new ArabicShaping(ArabicShaping.LETTERS_SHAPE |ArabicShaping.LENGTH_GROW_SHRINK);
+			ArabicShaping as = new ArabicShaping(ArabicShaping.LETTERS_SHAPE |
+					ArabicShaping.LENGTH_GROW_SHRINK);
+			//printSplit("B", s);
 			try {
 				s = as.shape(s);
 			} catch (ArabicShapingException e) {
 				LOG.error(e.getMessage(), e);
 			}
+			//printSplit("A", s);
 			Bidi line = new Bidi(s.length(), s.length());
 			line.setPara(s,  Bidi.LEVEL_DEFAULT_LTR, null);
 //			line.setPara(s, Bidi.LEVEL_DEFAULT_LTR, null);
@@ -96,33 +100,27 @@ public class Reshaper {
 		return ch;
 	}
 	public static void main(String[] args) {
-//		char[] c = new char[] {'א', 'ד','ם', ' ', '1', '2'} ;
-//		String reshape = "אדם";
-//		char[] c = new char[] {'א', 'ד','ם'} ;
-//		String reshape = reshape(new String(c));
-//		for (int i = 0; i < reshape.length(); i++) {
-//			System.out.println(reshape.charAt(i));
-//		}
 		test2();
 		test3();
 		test4();
 		test5();
 	}
 	
-	private static void test3() {
+	public static void test3() {
 		String s = "מרכז מסחרי/השלום (40050)";
 		String reshape = reshape(s);
 		String expected = "(40050) םולשה/ירחסמ זכרמ";
 		check(s, reshape, expected);
 	}
 	
-	private static void test5() {
+	public static void test5() {
 		String s = "מרכז מסחרי/השלום (מרז)";
 		String reshape = reshape(s);
 		String expected = "(זרמ) םולשה/ירחסמ זכרמ";
 		check(s, reshape, expected);
 	}
-	private static void check(String source, String reshape, String expected) {
+	
+	public static void check(String source, String reshape, String expected) {
 		printSplit("Source  ", source);
 		printSplit("Expected", expected);
 		printSplit("Reshaped", reshape);
@@ -131,19 +129,28 @@ public class Reshaper {
 			throw new IllegalArgumentException(String.format("Bug: expected '%s', reshaped '%s'", expected, reshape));
 		}
 	}
-	private static void printSplit(String p, String source) {
+	
+	static void printSplit(String p, String source) {
+		printSplit(p, source, true);
+		printSplit(p, source, false);
+	}
+	static void printSplit(String p, String source, boolean f) {
 		System.out.print(p);
 		System.out.print(": \u2066");
-		for(int i = 0; i < source.length(); i++) {
+		for (int i = 0; i < source.length(); i++) {
-			System.out.print(source.charAt(i));
+			if (f) {
-			System.out.print(" \u200e");
+				System.out.print(source.charAt(i));
+				System.out.print(" \u200e");
+			} else {
+				System.out.print(String.format("%04x ", (int) source.charAt(i)));
+			}
 		}
 //		System.out.println(Arrays.toString(source.toCharArray()));
 		System.out.println();
 		System.out.flush();
 	}
 
-	private static void test2() {
+	public static void test2() {
 		String s = "گچ پژ نمکی باللغة العربي";
 		String reshape = reshape(s);
 		String expected1 = "ﻲﺑﺮﻌﻟﺍ ﺔﻐﻠﻟﺎﺑ ﯽﮑﻤﻧ ﮋﭘ ﭻﮔ";
@@ -151,7 +158,7 @@ public class Reshaper {
 		check(s, reshape, expected1);
 	}
 	
-	private static void test4() {
+	public static void test4() {
 		String s = "Abc (123)";
 		check(s, reshape(s), s);
 	}

OsmAnd-java/src/main/java/net/osmand/data/Amenity.java

@@ -93,33 +93,6 @@ public class Amenity extends MapObject {
 		return str;
 	}
 
-	public String unzipContent(String str) {
-		if (str != null) {
-			if (str.startsWith(" gz ")) {
-				try {
-					int ind = 4;
-					byte[] bytes = new byte[str.length() - ind];
-					for (int i = ind; i < str.length(); i++) {
-						char ch = str.charAt(i);
-						bytes[i - ind] = (byte) ((int) ch - 128 - 32);
-
-					}
-					GZIPInputStream gzn = new GZIPInputStream(new ByteArrayInputStream(bytes));
-					BufferedReader br = new BufferedReader(new InputStreamReader(gzn, "UTF-8"));
-					StringBuilder bld = new StringBuilder();
-					String s;
-					while ((s = br.readLine()) != null) {
-						bld.append(s);
-					}
-					br.close();
-					str = bld.toString();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return str;
-	}
 
 	public Map<String, String> getAdditionalInfo() {
 		if (additionalInfo == null) {

OsmAnd-java/src/main/java/net/osmand/data/MapObject.java

@@ -8,6 +8,10 @@ import net.osmand.util.TransliterationHelper;
 
 import org.json.JSONObject;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -18,6 +22,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.zip.GZIPInputStream;
 
 
 public abstract class MapObject implements Comparable<MapObject> {
@@ -55,7 +60,7 @@ public abstract class MapObject implements Comparable<MapObject> {
 
 	public String getName() {
 		if (name != null) {
-			return name;
+			return unzipContent(name);
 		}
 		return ""; //$NON-NLS-1$
 	}
@@ -73,7 +78,7 @@ public abstract class MapObject implements Comparable<MapObject> {
 			if (names == null) {
 				names = new HashMap<String, String>();
 			}
-			names.put(lang, name);
+			names.put(lang, unzipContent(name));
 		}
 	}
 
@@ -95,19 +100,25 @@ public abstract class MapObject implements Comparable<MapObject> {
 		}
 		Map<String, String> mp = new HashMap<String, String>();
 		if (names != null) {
-			mp.putAll(names);
+			Iterator<Entry<String, String>> it = mp.entrySet().iterator();
+			while(it.hasNext()) {
+				Entry<String, String> e = it.next();
+				mp.put(e.getKey(), unzipContent(e.getValue()));
+			}
 		}
-		mp.put("en", enName);
+		mp.put("en", unzipContent(enName));
 		return mp;
 	}
 
 	public List<String> getAllNames() {
 		List<String> l = new ArrayList<String>();
 		if (!Algorithms.isEmpty(enName)) {
-			l.add(enName);
+			l.add(unzipContent(enName));
 		}
 		if (names != null) {
-			l.addAll(names.values());
+			for(String nm : names.values()) { 
+				l.add(unzipContent(nm));
+			}
 		}
 		return l;
 	}
@@ -179,7 +190,7 @@ public abstract class MapObject implements Comparable<MapObject> {
 				if (names != null) {
 					String nm = names.get(lang);
 					if (!Algorithms.isEmpty(nm)) {
-						return nm;
+						return unzipContent(nm);
 					}
 					if (transliterate) {
 						return TransliterationHelper.transliterate(getName());
@@ -192,7 +203,7 @@ public abstract class MapObject implements Comparable<MapObject> {
 
 	public String getEnName(boolean transliterate) {
 		if (!Algorithms.isEmpty(enName)) {
-			return this.enName;
+			return unzipContent(this.enName);
 		} else if (!Algorithms.isEmpty(getName()) && transliterate) {
 			return TransliterationHelper.transliterate(getName());
 		}
@@ -322,12 +333,12 @@ public abstract class MapObject implements Comparable<MapObject> {
 
 	public JSONObject toJSON() {
 		JSONObject json = new JSONObject();
-		json.put("name", name);
+		json.put("name", unzipContent(name));
-		json.put("enName", enName);
+		json.put("enName", unzipContent(enName));
 		if (names != null && names.size() > 0) {
 			JSONObject namesObj = new JSONObject();
 			for (Entry<String, String> e : names.entrySet()) {
-				namesObj.put(e.getKey(), e.getValue());
+				namesObj.put(e.getKey(), unzipContent(e.getValue()));
 			}
 			json.put("names", namesObj);
 		}
@@ -340,6 +351,31 @@ public abstract class MapObject implements Comparable<MapObject> {
 		return json;
 	}
 	
+	public String unzipContent(String str) {
+		if (str != null && str.startsWith(" gz ")) {
+			try {
+				int ind = 4;
+				byte[] bytes = new byte[str.length() - ind];
+				for (int i = ind; i < str.length(); i++) {
+					char ch = str.charAt(i);
+					bytes[i - ind] = (byte) ((int) ch - 128 - 32);
+				}
+				GZIPInputStream gzn = new GZIPInputStream(new ByteArrayInputStream(bytes));
+				BufferedReader br = new BufferedReader(new InputStreamReader(gzn, "UTF-8"));
+				StringBuilder bld = new StringBuilder();
+				String s;
+				while ((s = br.readLine()) != null) {
+					bld.append(s);
+				}
+				br.close();
+				str = bld.toString();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return str;
+	}
+
 	protected static void parseJSON(JSONObject json, MapObject o) {
 		if (json.has("name")) {
 			o.name = json.getString("name");

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

@@ -11,6 +11,7 @@ import java.util.PriorityQueue;
 
 import net.osmand.PlatformUtil;
 import net.osmand.binary.RouteDataObject;
+import net.osmand.data.LatLon;
 import net.osmand.osm.MapRenderingTypes;
 import net.osmand.util.MapUtils;
 
@@ -810,14 +811,12 @@ public class BinaryRoutePlanner {
 					printRoad(">?", visitedSegments.get(calculateRoutePointId(next, next.isPositive())),
 							next.isPositive());
 				}
-				if (distFromStart < next.distanceFromStart) {
-					if (ctx.config.heuristicCoefficient <= 1) {
-						System.err.println("! Alert distance from start " + distFromStart + " < "
-								+ next.distanceFromStart + " id=" + next.road.id);
-					}
-				}
 				if (distFromStart < visIt.distanceFromStart && next.getParentRoute() == null) {
 					toAdd = true;
+					if (ctx.config.heuristicCoefficient <= 1) {
+						System.err.println("! Alert distance from start " + distFromStart + " < "
+								+ visIt.distanceFromStart + " id=" + next.road.id);
+					}
 				} else {
 					toAdd = false;
 				}
@@ -861,6 +860,12 @@ public class BinaryRoutePlanner {
 		public int preciseX;
 		public int preciseY;
 		public List<RouteSegmentPoint> others;
+		
+		public LatLon getPreciseLatLon() {
+			return new LatLon(MapUtils.get31LatitudeY(preciseY), MapUtils.get31LongitudeX(preciseX));
+			
+		}
+		
 	}
 
 	public static class RouteSegment {

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

@@ -243,9 +243,7 @@ public class RoutePlannerFrontEnd {
 			return null;
 		}
 		ctx.calculationProgress.nextIteration();
-		List<RouteSegmentResult> res = searchRoute(ctx, points, routeDirection);
+		List<RouteSegmentResult> res = searchRouteImpl(ctx, points, routeDirection);
-		// make start and end more precise
-		makeStartEndPointsPrecise(res, start, end, intermediates);
 		if (res != null) {
 			new RouteResultPreparation().printResults(ctx, start, end, res);
 		}
@@ -256,33 +254,6 @@ public class RoutePlannerFrontEnd {
 		if (res.size() > 0) {
 			updateResult(res.get(0), start, true);
 			updateResult(res.get(res.size() - 1), end, false);
-			if (intermediates != null) {
-				int k = 1;
-				for (int i = 0; i < intermediates.size(); i++) {
-					LatLon ll = intermediates.get(i);
-					int px = MapUtils.get31TileNumberX(ll.getLongitude());
-					int py = MapUtils.get31TileNumberY(ll.getLatitude());
-					for (; k < res.size(); k++) {
-						double currentsDist = projectDistance(res, k, px, py);
-						if (currentsDist < 500 * 500) {
-							for (int k1 = k + 1; k1 < res.size(); k1++) {
-								double c2 = projectDistance(res, k1, px, py);
-								if (c2 < currentsDist) {
-									k = k1;
-									currentsDist = c2;
-								} else if (k1 - k > 15) {
-									break;
-								}
-							}
-							updateResult(res.get(k), ll, false);
-							if (k < res.size() - 1) {
-								updateResult(res.get(k + 1), ll, true);
-							}
-							break;
-						}
-					}
-				}
-			}
 		}
 	}
 
@@ -474,13 +445,18 @@ public class RoutePlannerFrontEnd {
 	}
 
 
-	private List<RouteSegmentResult> searchRoute(final RoutingContext ctx, List<RouteSegmentPoint> points, PrecalculatedRouteDirection routeDirection)
+	private List<RouteSegmentResult> searchRouteImpl(final RoutingContext ctx, List<RouteSegmentPoint> points, PrecalculatedRouteDirection routeDirection)
 			throws IOException, InterruptedException {
 		if (points.size() <= 2) {
+			// simple case 2 points only
 			if (!useSmartRouteRecalculation) {
 				ctx.previouslyCalculatedRoute = null;
 			}
-			return searchRoute(ctx, points.get(0), points.get(1), routeDirection);
+			pringGC(ctx, true);
+			List<RouteSegmentResult> res = searchRouteInternalPrepare(ctx, points.get(0), points.get(1), routeDirection);
+			pringGC(ctx, false);
+			makeStartEndPointsPrecise(res, points.get(0).getPreciseLatLon(), points.get(1).getPreciseLatLon(), null);
+			return res;
 		}
 
 		ArrayList<RouteSegmentResult> firstPartRecalculatedRoute = null;
@@ -522,7 +498,7 @@ public class RoutePlannerFrontEnd {
 			local.visitor = ctx.visitor;
 			local.calculationProgress = ctx.calculationProgress;
 			List<RouteSegmentResult> res = searchRouteInternalPrepare(local, points.get(i), points.get(i + 1), routeDirection);
-
+			makeStartEndPointsPrecise(res, points.get(i).getPreciseLatLon(), points.get(i + 1).getPreciseLatLon(), null);
 			results.addAll(res);
 			ctx.distinctLoadedTiles += local.distinctLoadedTiles;
 			ctx.loadedTiles += local.loadedTiles;
@@ -545,27 +521,22 @@ public class RoutePlannerFrontEnd {
 
 	}
 
-	@SuppressWarnings("static-access")
+	private void pringGC(final RoutingContext ctx, boolean before) {
-	private List<RouteSegmentResult> searchRoute(final RoutingContext ctx, RouteSegmentPoint start, RouteSegmentPoint end,
+		if (RoutingContext.SHOW_GC_SIZE && before) {
-	                                             PrecalculatedRouteDirection routeDirection) throws IOException, InterruptedException {
+			long h1 = RoutingContext.runGCUsedMemory();
-		if (ctx.SHOW_GC_SIZE) {
-			long h1 = ctx.runGCUsedMemory();
 			float mb = (1 << 20);
 			log.warn("Used before routing " + h1 / mb + " actual");
-		}
+		} else if (RoutingContext.SHOW_GC_SIZE && !before) {
-		List<RouteSegmentResult> result = searchRouteInternalPrepare(ctx, start, end, routeDirection);
-		if (RoutingContext.SHOW_GC_SIZE) {
 			int sz = ctx.global.size;
 			log.warn("Subregion size " + ctx.subregionTiles.size() + " " + " tiles " + ctx.indexedSubregions.size());
-			ctx.runGCUsedMemory();
+			RoutingContext.runGCUsedMemory();
-			long h1 = ctx.runGCUsedMemory();
+			long h1 = RoutingContext.runGCUsedMemory();
 			ctx.unloadAllData();
-			ctx.runGCUsedMemory();
+			RoutingContext.runGCUsedMemory();
-			long h2 = ctx.runGCUsedMemory();
+			long h2 = RoutingContext.runGCUsedMemory();
 			float mb = (1 << 20);
 			log.warn("Unload context :  estimated " + sz / mb + " ?= " + (h1 - h2) / mb + " actual");
 		}
-		return result;
 	}
 
 

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

@@ -7,16 +7,18 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-import gnu.trove.iterator.TIntIterator;
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.set.hash.TIntHashSet;
 import net.osmand.PlatformUtil;
@@ -798,9 +800,9 @@ public class RouteResultPreparation {
 					if (dist < mergeDistance) {
 						mergeTurnLanes(leftside, currentSegment, nextSegment);
 						TurnType turnType = currentSegment.getTurnType();
-						TIntHashSet possibleTurn = getPossibleTurnsFromActiveLanes(turnType.getLanes(), true);
+						Integer[] possibleTurn = getPossibleTurnsFromActiveLanes(turnType.getLanes(), true);
-						if (possibleTurn.size() == 1) {
+						if (possibleTurn.length == 1) {
-							TurnType tt = TurnType.valueOf(possibleTurn.iterator().next(), currentSegment.getTurnType().isLeftSide());
+							TurnType tt = TurnType.valueOf(possibleTurn[0], currentSegment.getTurnType().isLeftSide());
 							tt.setLanes(turnType.getLanes());
 							tt.setSkipToSpeak(turnType.isSkipToSpeak());
 							currentSegment.setTurnType(tt);
@@ -1267,8 +1269,6 @@ public class RouteResultPreparation {
 			}
 		}
 		
-		t.setPossibleLeftTurn(possiblyLeftTurn);
-		t.setPossibleRightTurn(possiblyRightTurn);
 		if (rs.keepLeft || rs.keepRight) {
 			String[] splitLaneOptions = turnLanes.split("\\|", -1);
 			int activeBeginIndex = findActiveIndex(rawLanes, splitLaneOptions, rs.leftLanes, true, 
@@ -1284,7 +1284,19 @@ public class RouteResultPreparation {
 					rawLanes[k] |= 1;
 				}
 			}
-			int tp = inferSlightTurnFromLanes(rawLanes, rs);
+			int tp = inferSlightTurnFromActiveLanes(rawLanes, rs.keepLeft, rs.keepRight);
+			// Checking to see that there is only one unique turn
+			if (tp != 0) {
+				// add extra lanes with same turn
+				for(int i = 0; i < rawLanes.length; i++) {
+					if(TurnType.getSecondaryTurn(rawLanes[i]) == tp) {
+						TurnType.setSecondaryToPrimary(rawLanes, i);
+						rawLanes[i] |= 1;
+					} else if(TurnType.getPrimaryTurn(rawLanes[i]) == tp) {
+						rawLanes[i] |= 1;
+					}
+				}
+			}
 			if (tp != t.getValue() && tp != 0) {
 				t = TurnType.valueOf(tp, leftSide);
 			} else {
@@ -1295,31 +1307,42 @@ public class RouteResultPreparation {
 				}
 			}
 		} else {
+			// case for go straight and identify correct turn:lane to go straight
+			Integer[] possibleTurns = getPossibleTurns(rawLanes, false, false);
+			int tp = TurnType.C;
+			if (possibleTurns.length == 1) {
+				tp = possibleTurns[0];
+			} else if (possibleTurns.length == 3) {
+				if ((!possiblyLeftTurn || !possiblyRightTurn) && TurnType.isSlightTurn(possibleTurns[1])) {
+					tp = possibleTurns[1];
+					t = TurnType.valueOf(tp, leftSide);
+				}
+			}
 			for (int k = 0; k < rawLanes.length; k++) {
 				int turn = TurnType.getPrimaryTurn(rawLanes[k]);
 				int sturn = TurnType.getSecondaryTurn(rawLanes[k]);
 				int tturn = TurnType.getTertiaryTurn(rawLanes[k]);
 
 				boolean active = false;
+
 				// some turns go through many segments (to turn right or left)
 				// so on one first segment the lane could be available and may be only 1 possible
 				// all undesired lanes will be disabled through the 2nd pass
-				if((TurnType.isRightTurn(sturn) && possiblyRightTurn) ||
+				if ((TurnType.isRightTurn(sturn) && possiblyRightTurn)
-						(TurnType.isLeftTurn(sturn) && possiblyLeftTurn)) {
+						|| (TurnType.isLeftTurn(sturn) && possiblyLeftTurn)) {
 					// we can't predict here whether it will be a left turn or straight on,
 					// it could be done during 2nd pass
-					TurnType.setPrimaryTurn(rawLanes, k, sturn);
+					TurnType.setSecondaryToPrimary(rawLanes, k);
-					TurnType.setSecondaryTurn(rawLanes, k, turn);
 					active = true;
-				} else if((TurnType.isRightTurn(tturn) && possiblyRightTurn) ||
+				} else if ((TurnType.isRightTurn(tturn) && possiblyRightTurn)
-						(TurnType.isLeftTurn(tturn) && possiblyLeftTurn)) {
+						|| (TurnType.isLeftTurn(tturn) && possiblyLeftTurn)) {
-					TurnType.setPrimaryTurn(rawLanes, k, tturn);
+					TurnType.setTertiaryToPrimary(rawLanes, k);
-					TurnType.setTertiaryTurn(rawLanes, k, turn);
 					active = true;
-				} else if((TurnType.isRightTurn(turn) && possiblyRightTurn) ||
+				} else if ((TurnType.isRightTurn(turn) && possiblyRightTurn)
-						(TurnType.isLeftTurn(turn) && possiblyLeftTurn)) {
+						|| (TurnType.isLeftTurn(turn) && possiblyLeftTurn)) {
 					active = true;
-				} else if (turn == TurnType.C) {
+					// } else if (turn == TurnType.C) {
+				} else if (turn == tp) {
 					active = true;
 				}
 				if (active) {
@@ -1329,6 +1352,8 @@ public class RouteResultPreparation {
 		}
 		t.setSkipToSpeak(!rs.speak);
 		t.setLanes(rawLanes);
+		t.setPossibleLeftTurn(possiblyLeftTurn);
+		t.setPossibleRightTurn(possiblyRightTurn);
 		return t;
 	}
 
@@ -1571,10 +1596,8 @@ public class RouteResultPreparation {
 		int[] lanes = new int[splitLaneOptions.length];
 		for (int i = 0; i < splitLaneOptions.length; i++) {
 			String[] laneOptions = splitLaneOptions[i].split(";");
-			boolean isTertiaryTurn = false;
 			for (int j = 0; j < laneOptions.length; j++) {
 				int turn = TurnType.convertType(laneOptions[j]);
-
 				final int primary = TurnType.getPrimaryTurn(lanes[i]);
 				if (primary == 0) {
 					TurnType.setPrimaryTurnAndReset(lanes, i, turn);
@@ -1584,12 +1607,12 @@ public class RouteResultPreparation {
                     	(TurnType.isLeftTurn(calcTurnType) && TurnType.isLeftTurn(turn)) 
                     	) {
                     	TurnType.setPrimaryTurnShiftOthers(lanes, i, turn);
-                    } else if (!isTertiaryTurn) {
+                    } else if (TurnType.getSecondaryTurn(lanes[i]) == 0) {
-                    	TurnType.setSecondaryTurnShiftOthers(lanes, i, turn);
+                    	TurnType.setSecondaryTurn(lanes, i, turn);
-						isTertiaryTurn = true;
+                    } else if (TurnType.getTertiaryTurn(lanes[i]) == 0) {
-                    } else {
 						TurnType.setTertiaryTurn(lanes, i, turn);
-						break;
+                    } else {
+                    	// ignore
                     }
 				}
 			}
@@ -1597,95 +1620,90 @@ public class RouteResultPreparation {
 		return lanes;
 	}
 
-	private int inferSlightTurnFromLanes(int[] oLanes, RoadSplitStructure rs) {
+	
-		TIntHashSet possibleTurns = getPossibleTurnsFromActiveLanes(oLanes, false);
+	private int inferSlightTurnFromActiveLanes(int[] oLanes, boolean mostLeft, boolean mostRight) {
-		if (possibleTurns.isEmpty()) {
+		Integer[] possibleTurns = getPossibleTurns(oLanes, false, true);
+		if (possibleTurns.length == 0) {
 			// No common turns, so can't determine anything.
 			return 0;
 		}
 		int infer = 0;
-		if (possibleTurns.size() == 1) {
+		if (possibleTurns.length == 1) {
-			infer = possibleTurns.iterator().next();
+			infer = possibleTurns[0];
-		} else if (possibleTurns.size() > 1) {
+		} else {
-			if (rs.keepLeft && rs.keepRight && possibleTurns.contains(TurnType.C)) {
+			if (mostLeft && !mostRight) {
-				infer = TurnType.C;
+				infer = possibleTurns[0];
-			} else if (rs.keepLeft || rs.keepRight) {
+			} else if(mostRight && !mostLeft) {
-				TIntIterator it = possibleTurns.iterator();
+				infer = possibleTurns[possibleTurns.length - 1];
-				infer = it.next();
+			} else {
-				while(it.hasNext()) {
+				infer = possibleTurns[1];
-					int next = it.next();
+//				infer = TurnType.C;
-					int orderInfer = TurnType.orderFromLeftToRight(infer);
-					int orderNext = TurnType.orderFromLeftToRight(next) ;
-					if(rs.keepLeft && orderNext < orderInfer) {
-						infer = next;
-					} else if(rs.keepRight && orderNext > orderInfer) {
-						infer = next;
-					}
-				}
-			}
-		}
-
-		// Checking to see that there is only one unique turn
-		if (infer != 0) {
-			for(int i = 0; i < oLanes.length; i++) {
-				if(TurnType.getSecondaryTurn(oLanes[i]) == infer) {
-					int pt = TurnType.getPrimaryTurn(oLanes[i]);
-					int en = oLanes[i] & 1;
-					TurnType.setPrimaryTurnAndReset(oLanes, i, infer);
-					oLanes[i] |= en;
-					TurnType.setSecondaryTurn(oLanes, i, pt);
-				}
-				
 			}
 		}
 		return infer;
 	}
 
-	private TIntHashSet getPossibleTurnsFromActiveLanes(int[] oLanes, boolean onlyPrimary) {
+	private Integer[] getPossibleTurnsFromActiveLanes(int[] oLanes, boolean onlyPrimary) {
-		TIntHashSet possibleTurns = new TIntHashSet();
+		return getPossibleTurns(oLanes, onlyPrimary, true);
-		for (int i = 0; i < oLanes.length; i++) {
+	}
-			if ((oLanes[i] & 1) == 0) {
-				continue;
-			}
-			if (possibleTurns.isEmpty()) {
-				// Nothing is in the list to compare to, so add the first elements
-				possibleTurns.add(TurnType.getPrimaryTurn(oLanes[i]));
-				if (!onlyPrimary && TurnType.getSecondaryTurn(oLanes[i]) != 0) {
-					possibleTurns.add(TurnType.getSecondaryTurn(oLanes[i]));
-				}
-				if (!onlyPrimary && TurnType.getTertiaryTurn(oLanes[i]) != 0) {
-					possibleTurns.add(TurnType.getTertiaryTurn(oLanes[i]));
-				}
-			} else {
-				TIntArrayList laneTurns = new TIntArrayList();
-				laneTurns.add(TurnType.getPrimaryTurn(oLanes[i]));
-				if (!onlyPrimary && TurnType.getSecondaryTurn(oLanes[i]) != 0) {
-					laneTurns.add(TurnType.getSecondaryTurn(oLanes[i]));
-				}
-				if (!onlyPrimary && TurnType.getTertiaryTurn(oLanes[i]) != 0) {
-					laneTurns.add(TurnType.getTertiaryTurn(oLanes[i]));
-				}
-				possibleTurns.retainAll(laneTurns);
-				if (possibleTurns.isEmpty()) {
-					// No common turns, so can't determine anything.
-					return possibleTurns;
-				}
-			}
-		}
 	
-		// Remove all turns from lanes not selected...because those aren't it
+	private Integer[] getPossibleTurns(int[] oLanes, boolean onlyPrimary, boolean uniqueFromActive) {
+		Set<Integer> possibleTurns = new LinkedHashSet<>();
+		Set<Integer> upossibleTurns = new LinkedHashSet<>();
 		for (int i = 0; i < oLanes.length; i++) {
-			if ((oLanes[i] & 1) == 0 && !possibleTurns.isEmpty()) {
+			// Nothing is in the list to compare to, so add the first elements
-				possibleTurns.remove((Integer) TurnType.getPrimaryTurn(oLanes[i]));
+			upossibleTurns.clear();
-				if (TurnType.getSecondaryTurn(oLanes[i]) != 0) {
+			upossibleTurns.add(TurnType.getPrimaryTurn(oLanes[i]));
-					possibleTurns.remove((Integer) TurnType.getSecondaryTurn(oLanes[i]));
+			if (!onlyPrimary && TurnType.getSecondaryTurn(oLanes[i]) != 0) {
-				}
+				upossibleTurns.add(TurnType.getSecondaryTurn(oLanes[i]));
-				if (TurnType.getTertiaryTurn(oLanes[i]) != 0) {
+			}
-					possibleTurns.remove((Integer) TurnType.getTertiaryTurn(oLanes[i]));
+			if (!onlyPrimary && TurnType.getTertiaryTurn(oLanes[i]) != 0) {
+				upossibleTurns.add(TurnType.getTertiaryTurn(oLanes[i]));
+			}
+			if (!uniqueFromActive) {
+				possibleTurns.addAll(upossibleTurns);
+//				if (!possibleTurns.isEmpty()) {
+//					possibleTurns.retainAll(upossibleTurns);
+//					if(possibleTurns.isEmpty()) {
+//						break;
+//					}
+//				} else {
+//					possibleTurns.addAll(upossibleTurns);
+//				}
+			} else if ((oLanes[i] & 1) == 1) {
+				if (!possibleTurns.isEmpty()) {
+					possibleTurns.retainAll(upossibleTurns);
+					if(possibleTurns.isEmpty()) {
+						break;
+					}
+				} else {
+					possibleTurns.addAll(upossibleTurns);
 				}
 			}
 		}
-		return possibleTurns;
+		// Remove all turns from lanes not selected...because those aren't it
+		if (uniqueFromActive) {
+			for (int i = 0; i < oLanes.length; i++) {
+				if ((oLanes[i] & 1) == 0) {
+					possibleTurns.remove((Integer) TurnType.getPrimaryTurn(oLanes[i]));
+					if (TurnType.getSecondaryTurn(oLanes[i]) != 0) {
+						possibleTurns.remove((Integer) TurnType.getSecondaryTurn(oLanes[i]));
+					}
+					if (TurnType.getTertiaryTurn(oLanes[i]) != 0) {
+						possibleTurns.remove((Integer) TurnType.getTertiaryTurn(oLanes[i]));
+					}
+				}
+			}
+		}
+		Integer[] array = possibleTurns.toArray(new Integer[possibleTurns.size()]);
+		Arrays.sort(array, new Comparator<Integer>() {
+
+			@Override
+			public int compare(Integer o1, Integer o2) {
+				return Integer.compare(TurnType.orderFromLeftToRight(o1), TurnType.orderFromLeftToRight(o2));
+			}
+		});
+		return array;
 	}
 
 	private boolean isMotorway(RouteSegmentResult s){
@@ -1754,7 +1772,7 @@ public class RouteResultPreparation {
 			if (routeSegment.road.getId() != road.getId() && routeSegment.road.getId() != previousRoadId) {
 				RouteDataObject addRoad = routeSegment.road;
 				checkAndInitRouteRegion(ctx, addRoad);
-				// TODO restrictions can be considered as well
+				// Future: restrictions can be considered as well
 				int oneWay = ctx.getRouter().isOneWay(addRoad);
 				if (oneWay >= 0 && routeSegment.getSegmentStart() < addRoad.getPointsLength() - 1) {
 					long pointL = getPoint(addRoad, routeSegment.getSegmentStart() + 1);

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

@@ -36,7 +36,7 @@ import net.osmand.router.RoutePlannerFrontEnd.RouteCalculationMode;
 
 public class RoutingContext {
 
-	public static final boolean SHOW_GC_SIZE = false;
+	public static boolean SHOW_GC_SIZE = false;
 	 
 	
 	private final static Log log = PlatformUtil.getLog(RoutingContext.class);

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

@@ -210,16 +210,25 @@ public class TurnType {
 	public static void setPrimaryTurnShiftOthers(int[] lanes, int lane, int turnType) {
 		int pt = getPrimaryTurn(lanes[lane]);
 		int st = getSecondaryTurn(lanes[lane]);
-		//int tt = getTertiaryTurn(lanes[lane]);
+		//int tt = getTertiaryTurn(lanes[lane]); is lost here
 		setPrimaryTurnAndReset(lanes, lane, turnType);
 		setSecondaryTurn(lanes, lane, pt);
 		setTertiaryTurn(lanes, lane, st);
 	}
 	
-	public static void setSecondaryTurnShiftOthers(int[] lanes, int lane, int turnType) {
+	public static void setSecondaryToPrimary(int[] lanes, int lane) {
 		int st = getSecondaryTurn(lanes[lane]);
-		//int tt = getTertiaryTurn(lanes[lane]);
+		int pt = getPrimaryTurn(lanes[lane]);
-		setSecondaryTurn(lanes, lane, turnType);
+		setPrimaryTurn(lanes, lane, st);
+		setSecondaryTurn(lanes, lane, pt);
+	}
+	
+	public static void setTertiaryToPrimary(int[] lanes, int lane) {
+		int st = getSecondaryTurn(lanes[lane]);
+		int pt = getPrimaryTurn(lanes[lane]);
+		int tt = getTertiaryTurn(lanes[lane]);
+		setPrimaryTurn(lanes, lane, tt);
+		setSecondaryTurn(lanes, lane, pt);
 		setTertiaryTurn(lanes, lane, st);
 	}
 

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

@@ -140,10 +140,16 @@ public class SearchCoreFactory {
 
 		protected void subSearchApiOrPublish(SearchPhrase phrase, SearchResultMatcher resultMatcher, SearchResult res, SearchBaseAPI api) 
 				throws IOException {
+			subSearchApiOrPublish(phrase, resultMatcher, res, api, true);
+		}
+		
+		protected void subSearchApiOrPublish(SearchPhrase phrase, SearchResultMatcher resultMatcher, SearchResult res, SearchBaseAPI api,
+				boolean publish) 
+				throws IOException {
 			phrase.countUnknownWordsMatchMainResult(res);
 			boolean firstUnknownWordMatches = res.firstUnknownWordMatches;
 			List<String> leftUnknownSearchWords = new ArrayList<String>(phrase.getUnknownSearchWords());
-			if(res.otherWordsMatch != null) {
+			if (res.otherWordsMatch != null) {
 				leftUnknownSearchWords.removeAll(res.otherWordsMatch);
 			}
 			SearchResult newParentSearchResult = null;
@@ -187,19 +193,23 @@ public class SearchCoreFactory {
 				leftUnknownSearchWords.add(0, phrase.getFirstUnknownSearchWord());
 			}
 			// publish result to set parentSearchResult before search
-			if(newParentSearchResult != null) {
+			if (publish) {
-				SearchResult prev = resultMatcher.setParentSearchResult(newParentSearchResult);
+				if (newParentSearchResult != null) {
-				resultMatcher.publish(res);
+					SearchResult prev = resultMatcher.setParentSearchResult(newParentSearchResult);
-				resultMatcher.setParentSearchResult(prev);
+					resultMatcher.publish(res);
-			} else {
+					resultMatcher.setParentSearchResult(prev);
-				resultMatcher.publish(res);
+				} else {
+					resultMatcher.publish(res);
+				}
 			}
 			if (!leftUnknownSearchWords.isEmpty() && api != null && api.isSearchAvailable(phrase)) {
 				SearchPhrase nphrase = phrase.selectWord(res, leftUnknownSearchWords, phrase.isLastUnknownSearchWordComplete());
-				SearchResult prev = resultMatcher.setParentSearchResult(res);
+				SearchResult prev = resultMatcher.setParentSearchResult(publish ? res : 
+							resultMatcher.getParentSearchResult());
 				api.search(nphrase, resultMatcher);
 				resultMatcher.setParentSearchResult(prev);
 			}
+			
 		}
 
 		@Override
@@ -414,7 +424,8 @@ public class SearchCoreFactory {
 							if (object.getName().startsWith("<")) {
 								return false;
 							}
-							if (!phrase.getFirstUnknownNameStringMatcher().matches(stripBraces(sr.localeName))) {
+							
+							if (!phrase.getUnknownWordToSearchBuildingNameMatcher().matches(stripBraces(sr.localeName))) {
 								sr.priorityDistance = 5;
 							}
 							sr.objectType = ObjectType.STREET;
@@ -1102,11 +1113,11 @@ public class SearchCoreFactory {
 					
 					res.localeName = object.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
 					res.otherNames = object.getAllNames(true);
+					boolean pub = true;
 					if (object.getName().startsWith("<")) {
 						// streets related to city
-						continue;
+						pub = false;
-					}
+					} else if (phrase.isUnknownSearchWordPresent()
-					if (phrase.isUnknownSearchWordPresent()
 							&& !(nm.matches(res.localeName) || nm.matches(res.otherNames))) {
 						continue;
 					}
@@ -1118,7 +1129,7 @@ public class SearchCoreFactory {
 					res.priority = SEARCH_STREET_BY_CITY_PRIORITY;
 					//res.priorityDistance = 1;
 					res.objectType = ObjectType.STREET;
-					subSearchApiOrPublish(phrase, resultMatcher, res, streetsAPI);
+					subSearchApiOrPublish(phrase, resultMatcher, res, streetsAPI, pub);
 					if (limit++ > LIMIT) {
 						break;
 					}
@@ -1226,8 +1237,8 @@ public class SearchCoreFactory {
 					res.file = file;
 					res.priority = priority;
 					res.priorityDistance = 0;
-					// TOOO phrase.countUnknownWordsMatchMainResult(res);
 					res.firstUnknownWordMatches = startMatch.matches(res.localeName);
+					// phrase.countUnknownWordsMatchMainResult(res); // same as above
 					res.relatedObject = s;
 					res.localeRelatedObjectName = s.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
 					res.objectType = ObjectType.HOUSE;
@@ -1238,6 +1249,7 @@ public class SearchCoreFactory {
 						res.location = b.getLocation();
 					}
 					res.preferredZoom = 17;
+					
 					resultMatcher.publish(res);
 				}
 				String streetIntersection = phrase.getUnknownWordToSearch();
@@ -1251,7 +1263,6 @@ public class SearchCoreFactory {
 								|| !phrase.isSearchTypeAllowed(ObjectType.STREET_INTERSECTION)) {
 							continue;
 						}
-						// TOOO phrase.countUnknownWordsMatchMainResult(res);
 						res.otherNames = street.getAllNames(true);
 						res.localeName = street.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
 						res.object = street;
@@ -1263,6 +1274,7 @@ public class SearchCoreFactory {
 						res.objectType = ObjectType.STREET_INTERSECTION;
 						res.location = street.getLocation();
 						res.preferredZoom = 16;
+						phrase.countUnknownWordsMatchMainResult(res);
 						resultMatcher.publish(res);
 					}
 				}

OsmAnd-java/src/test/java/net/osmand/ReShaperTest.java

@@ -0,0 +1,56 @@
+package net.osmand;
+
+import java.text.Normalizer;
+
+import org.junit.Test;
+
+import com.ibm.icu.text.ArabicShaping;
+import com.ibm.icu.text.ArabicShapingException;
+import com.ibm.icu.text.Bidi;
+
+import net.osmand.Reshaper;
+
+public class ReShaperTest {
+
+
+	// 
+	
+//	Source  : ⁦ه ‎ە ‎ی ‎ب ‎ە ‎
+//	Expected: ⁦ه ‎ە ‎ی ‎ب ‎ە ‎
+//	Reshaped: ⁦ە ‎ﺐ ‎ﯾ ‎ە ‎ﻩ 
+	@Test
+	public void testArabName() throws ArabicShapingException {
+		// https://www.compart.com/en/unicode/U+FCD8
+//		String source = "\uFEEB\u06d5";
+//		System.out.println(new ArabicShaping(0).shape(s));
+//		System.out.println("\uFEEB\u06d5");
+		String source = "هەیبە";
+		String expected = "ەﺐﯾەﻩ";
+		String res = Reshaper.reshape(source);
+		Reshaper.check(source, res, expected);
+	}
+	
+	
+	@Test
+	public void test2() throws ArabicShapingException {
+		Reshaper.test2();
+	}
+	
+	@Test
+	public void test3() throws ArabicShapingException {
+		Reshaper.test3();
+	}
+	
+	@Test
+	public void test4() throws ArabicShapingException {
+		Reshaper.test4();
+	}
+	
+	@Test
+	public void test5() throws ArabicShapingException {
+		Reshaper.test5();
+	}
+	
+	
+
+}

OsmAnd-java/src/test/resources/search/navacerrada.json

@@ -12,7 +12,8 @@
   "phrase": "Calle de las eras 5, Navacerrada",
   "results": [
     "5, Calle de las Eras (Uranización Los Corales), Navacerrada [[6, HOUSE, 0.043, 70.17 km]]",
-    "Calle de las Eras (Uranización Los Corales), Navacerrada [[5, STREET, 0.310, 70.15 km]]"
+    "Calle de las Eras (Uranización Los Corales), Navacerrada [[5, STREET, 0.310, 70.15 km]]",
+	"Calle del Sotillo (Uranización Los Corales), Pasaje de las Eras (Uranización Los Corales), Navacerrada [[5, STREET_INTERSECTION, 0.043, 70.23 km]]"
   ],
   "extra-results": [	
   	"5, Calle Navacerrada (Urb. Las Suertes), Las Suertes [[4, HOUSE, 0.430, 60.50 km]]",
@@ -31,8 +32,7 @@
 	"Calle de las Cruces (Residencial Sanabria), Navacerrada [[4, STREET, 0.310, 70.14 km]]",
 	"Calle de las Escuelas, Navacerrada [[4, STREET, 0.310, 70.17 km]]",
 	"Calle de las Huertas (Residencial Sanabria), Navacerrada [[4, STREET, 0.310, 70.18 km]]",
-	"Calle de la Virgen de las Nieves, Puerto de Navacerrada [[4, STREET, 0.310, 74.59 km]]",
+	"Calle de la Virgen de las Nieves, Puerto de Navacerrada [[4, STREET, 0.310, 74.59 km]]"
-	"Calle del Sotillo (Uranización Los Corales), Pasaje de las Eras (Uranización Los Corales), Navacerrada [[4, STREET_INTERSECTION, 0.043, 70.23 km]]"
   ],
   "amenities": [
     {

OsmAnd/build.gradle

@@ -524,7 +524,7 @@ dependencies {
 	implementation 'androidx.gridlayout:gridlayout:1.0.0'
 	implementation 'androidx.cardview:cardview:1.0.0'
 	implementation 'androidx.appcompat:appcompat:1.1.0'
-	implementation 'com.google.android.material:material:1.2.0-alpha06'
+	implementation 'com.google.android.material:material:1.2.0-beta01'
 	implementation 'androidx.browser:browser:1.0.0'
 	implementation 'androidx.preference:preference:1.1.0'
 	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')

OsmAnd/res/anim/slide_in_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="100%p" android:toXDelta="0"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>

OsmAnd/res/anim/slide_out_right.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="0" android:toXDelta="100%p"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>

OsmAnd/res/drawable/img_help_vessel_width_day.xml

@@ -0,0 +1,59 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <group>
+    <clip-path android:pathData="M0,0h360v90h-360z M 0,0"/>
+    <path
+        android:pathData="M0.0,0.0h360.0v90.0h-360.0z"
+        android:fillColor="#F5F5F5"/>
+    <path
+        android:pathData="M360 12H0V90H21V33C21 28.0294 25.0294 24 30 24H102C106.971 24 111 28.0294 111 33V90H135V33C135 28.0294 139.029 24 144 24H216C220.971 24 225 28.0294 225 33V90H249V33C249 28.0294 253.029 24 258 24H330C334.971 24 339 28.0294 339 33V90H360V12Z"
+        android:fillColor="#D7D8DB"/>
+    <path
+        android:pathData="M360 90V85.5C359.426 85.5 358.883 85.5285 358.34 85.557C356.969 85.6291 355.599 85.701 353.737 85.313C349.087 84.3443 345.755 81.0125 342.523 77.78L342.5 77.7573C338.024 82.2333 333.076 85 326.5 85C319.924 85 314.976 82.2333 310.5 77.7573C306.024 82.2333 301.076 85 294.5 85C287.924 85 282.976 82.2333 278.5 77.7573C274.024 82.2333 269.076 85 262.5 85C255.924 85 250.976 82.2333 246.5 77.7573C242.024 82.2333 237.076 85 230.5 85C223.924 85 218.976 82.2333 214.5 77.7573C210.024 82.2333 205.076 85 198.5 85C191.924 85 186.976 82.2333 182.5 77.7573C178.024 82.2333 173.076 85 166.5 85C159.924 85 154.976 82.2333 150.5 77.7573C146.024 82.2333 141.076 85 134.5 85C127.924 85 122.976 82.2333 118.5 77.7573C114.024 82.2333 109.076 85 102.5 85C95.9237 85 90.976 82.2333 86.5 77.7573C82.024 82.2333 77.0763 85 70.5 85C63.9237 85 58.976 82.2333 54.5 77.7573C50.024 82.2333 45.0763 85 38.5 85C31.9237 85 26.9759 82.2333 22.5 77.7573C18.0241 82.2333 13.0763 85 6.5 85C4.14169 85 1.9928 84.6442 0 83.9813V90H360Z"
+        android:strokeAlpha="0.2"
+        android:fillColor="#1971F5"
+        android:fillAlpha="0.2"/>
+    <path
+        android:pathData="M182 32C182 30.8954 181.105 30 180 30C178.895 30 178 30.8954 178 32V36H182V32Z"
+        android:fillColor="#237BFF"/>
+    <path
+        android:pathData="M164 44C164 40.6863 166.686 38 170 38H190C193.314 38 196 40.6863 196 44V54H164V44ZM168 44H178V50H168V44ZM182 44H192V50H182V44Z"
+        android:fillColor="#237BFF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M156 56V65.7996C156 70.4917 158.735 74.7534 163 76.7084L169.682 79.7708C168.663 79.9219 167.605 80 166.5 80C159.924 80 154.976 77.2333 150.5 72.7573C146.024 77.2333 141.076 80 134.5 80C127.924 80 122.976 77.2333 118.5 72.7573C114.024 77.2333 109.076 80 102.5 80C95.9237 80 90.9759 77.2333 86.5 72.7573C82.0241 77.2333 77.0763 80 70.5 80C63.9237 80 58.9759 77.2333 54.5 72.7573C50.0241 77.2333 45.0763 80 38.5 80C31.9237 80 26.9759 77.2333 22.5 72.7573C18.0241 77.2333 13.0763 80 6.5 80C4.25312 80 2.04781 79.6869 0 79.0833V85.2787C2.13609 85.7633 4.33105 86 6.5 86C12.1587 86 17.9945 84.3888 22.5 80.9691C27.0055 84.3888 32.8413 86 38.5 86C44.1587 86 49.9945 84.3888 54.5 80.9691C59.0055 84.3888 64.8413 86 70.5 86C76.1587 86 81.9945 84.3888 86.5 80.9691C91.0055 84.3888 96.8413 86 102.5 86C108.159 86 113.994 84.3888 118.5 80.9691C123.006 84.3888 128.841 86 134.5 86C140.159 86 145.994 84.3888 150.5 80.9691C155.006 84.3888 160.841 86 166.5 86C170.43 86 174.446 85.2228 178.042 83.6024L180 84.5L184.612 82.3863C188.752 84.8358 193.69 86 198.5 86C204.159 86 209.994 84.3888 214.5 80.9691C219.006 84.3888 224.841 86 230.5 86C236.159 86 241.994 84.3888 246.5 80.9691C251.006 84.3888 256.841 86 262.5 86C268.159 86 273.994 84.3888 278.5 80.9691C283.006 84.3888 288.841 86 294.5 86C300.159 86 305.994 84.3888 310.5 80.9691C315.006 84.3888 320.841 86 326.5 86C332.131 86 337.938 84.4043 342.435 81.0184C346.057 84.0853 349.473 85.5535 352.513 86.1869C355.241 86.7551 357.783 86.6131 359.185 86.5347C359.531 86.5154 359.807 86.5 360 86.5V80.5C359.426 80.5 358.883 80.5285 358.34 80.557C356.969 80.6291 355.599 80.701 353.737 80.313C349.087 79.3443 345.755 76.0125 342.523 72.78L342.5 72.7573C338.024 77.2333 333.076 80 326.5 80C319.924 80 314.976 77.2333 310.5 72.7573C306.024 77.2333 301.076 80 294.5 80C287.924 80 282.976 77.2333 278.5 72.7573C274.024 77.2333 269.076 80 262.5 80C255.924 80 250.976 77.2333 246.5 72.7573C242.024 77.2333 237.076 80 230.5 80C223.924 80 218.976 77.2333 214.5 72.7573C210.024 77.2333 205.076 80 198.5 80C196.151 80 194.01 79.647 192.024 78.9892L197 76.7084C201.265 74.7534 204 70.4917 204 65.7996V56H156ZM172 62V66.5L164 62H172ZM188 62V66.5L196 62H188Z"
+        android:fillColor="#237BFF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M212 19L206 25L212 31V19Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M148 19L154 25L148 31L148 19Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M203 24C203.552 24 204 24.4477 204 25C204 25.5523 203.552 26 203 26L196 26C195.448 26 195 25.5523 195 25C195 24.4477 195.448 24 196 24L203 24Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M177 24C177.552 24 178 24.4477 178 25C178 25.5523 177.552 26 177 26L170 26C169.448 26 169 25.5523 169 25C169 24.4477 169.448 24 170 24L177 24Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M165 25C165 24.4477 164.552 24 164 24L157 24C156.448 24 156 24.4477 156 25C156 25.5523 156.448 26 157 26L164 26C164.552 26 165 25.5523 165 25Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M190 24C190.552 24 191 24.4477 191 25C191 25.5523 190.552 26 190 26L183 26C182.448 26 182 25.5523 182 25C182 24.4477 182.448 24 183 24L190 24Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M155 90H156L156 24H155L155 90Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#EE5622"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M204 90H205L205 24H204L204 90Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#EE5622"
+        android:fillAlpha="0.5"/>
+  </group>
+</vector>

OsmAnd/res/drawable/img_help_vessel_width_night.xml

@@ -0,0 +1,59 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="90dp"
+    android:viewportWidth="360"
+    android:viewportHeight="90">
+  <group>
+    <clip-path android:pathData="M0,0h360v90h-360z M 0,0"/>
+    <path
+        android:pathData="M0.0,0.0h360.0v90.0h-360.0z"
+        android:fillColor="#28292A"/>
+    <path
+        android:pathData="M360 12H0V90H21V33C21 28.0294 25.0294 24 30 24H102C106.971 24 111 28.0294 111 33V90H135V33C135 28.0294 139.029 24 144 24H216C220.971 24 225 28.0294 225 33V90H249V33C249 28.0294 253.029 24 258 24H330C334.971 24 339 28.0294 339 33V90H360V12Z"
+        android:fillColor="#4B4C4E"/>
+    <path
+        android:pathData="M360 90V85.5C359.426 85.5 358.883 85.5285 358.34 85.557C356.969 85.6291 355.599 85.701 353.737 85.313C349.087 84.3443 345.755 81.0125 342.523 77.78L342.5 77.7573C338.024 82.2333 333.076 85 326.5 85C319.924 85 314.976 82.2333 310.5 77.7573C306.024 82.2333 301.076 85 294.5 85C287.924 85 282.976 82.2333 278.5 77.7573C274.024 82.2333 269.076 85 262.5 85C255.924 85 250.976 82.2333 246.5 77.7573C242.024 82.2333 237.076 85 230.5 85C223.924 85 218.976 82.2333 214.5 77.7573C210.024 82.2333 205.076 85 198.5 85C191.924 85 186.976 82.2333 182.5 77.7573C178.024 82.2333 173.076 85 166.5 85C159.924 85 154.976 82.2333 150.5 77.7573C146.024 82.2333 141.076 85 134.5 85C127.924 85 122.976 82.2333 118.5 77.7573C114.024 82.2333 109.076 85 102.5 85C95.9237 85 90.976 82.2333 86.5 77.7573C82.024 82.2333 77.0763 85 70.5 85C63.9237 85 58.976 82.2333 54.5 77.7573C50.024 82.2333 45.0763 85 38.5 85C31.9237 85 26.9759 82.2333 22.5 77.7573C18.0241 82.2333 13.0763 85 6.5 85C4.14169 85 1.9928 84.6442 0 83.9813V90H360Z"
+        android:strokeAlpha="0.2"
+        android:fillColor="#1971F5"
+        android:fillAlpha="0.2"/>
+    <path
+        android:pathData="M182 32C182 30.8954 181.105 30 180 30C178.895 30 178 30.8954 178 32V36H182V32Z"
+        android:fillColor="#237BFF"/>
+    <path
+        android:pathData="M164 44C164 40.6863 166.686 38 170 38H190C193.314 38 196 40.6863 196 44V54H164V44ZM168 44H178V50H168V44ZM182 44H192V50H182V44Z"
+        android:fillColor="#237BFF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M156 56V65.7996C156 70.4917 158.735 74.7534 163 76.7084L169.682 79.7708C168.663 79.9219 167.605 80 166.5 80C159.924 80 154.976 77.2333 150.5 72.7573C146.024 77.2333 141.076 80 134.5 80C127.924 80 122.976 77.2333 118.5 72.7573C114.024 77.2333 109.076 80 102.5 80C95.9237 80 90.9759 77.2333 86.5 72.7573C82.0241 77.2333 77.0763 80 70.5 80C63.9237 80 58.9759 77.2333 54.5 72.7573C50.0241 77.2333 45.0763 80 38.5 80C31.9237 80 26.9759 77.2333 22.5 72.7573C18.0241 77.2333 13.0763 80 6.5 80C4.25312 80 2.04781 79.6869 0 79.0833V85.2787C2.13609 85.7633 4.33105 86 6.5 86C12.1587 86 17.9945 84.3888 22.5 80.9691C27.0055 84.3888 32.8413 86 38.5 86C44.1587 86 49.9945 84.3888 54.5 80.9691C59.0055 84.3888 64.8413 86 70.5 86C76.1587 86 81.9945 84.3888 86.5 80.9691C91.0055 84.3888 96.8413 86 102.5 86C108.159 86 113.994 84.3888 118.5 80.9691C123.006 84.3888 128.841 86 134.5 86C140.159 86 145.994 84.3888 150.5 80.9691C155.006 84.3888 160.841 86 166.5 86C170.43 86 174.446 85.2228 178.042 83.6024L180 84.5L184.612 82.3863C188.752 84.8358 193.69 86 198.5 86C204.159 86 209.994 84.3888 214.5 80.9691C219.006 84.3888 224.841 86 230.5 86C236.159 86 241.994 84.3888 246.5 80.9691C251.006 84.3888 256.841 86 262.5 86C268.159 86 273.994 84.3888 278.5 80.9691C283.006 84.3888 288.841 86 294.5 86C300.159 86 305.994 84.3888 310.5 80.9691C315.006 84.3888 320.841 86 326.5 86C332.131 86 337.938 84.4043 342.435 81.0184C346.057 84.0853 349.473 85.5535 352.513 86.1869C355.241 86.7551 357.783 86.6131 359.185 86.5347C359.531 86.5154 359.807 86.5 360 86.5V80.5C359.426 80.5 358.883 80.5285 358.34 80.557C356.969 80.6291 355.599 80.701 353.737 80.313C349.087 79.3443 345.755 76.0125 342.523 72.78L342.5 72.7573C338.024 77.2333 333.076 80 326.5 80C319.924 80 314.976 77.2333 310.5 72.7573C306.024 77.2333 301.076 80 294.5 80C287.924 80 282.976 77.2333 278.5 72.7573C274.024 77.2333 269.076 80 262.5 80C255.924 80 250.976 77.2333 246.5 72.7573C242.024 77.2333 237.076 80 230.5 80C223.924 80 218.976 77.2333 214.5 72.7573C210.024 77.2333 205.076 80 198.5 80C196.151 80 194.01 79.647 192.024 78.9892L197 76.7084C201.265 74.7534 204 70.4917 204 65.7996V56H156ZM172 62V66.5L164 62H172ZM188 62V66.5L196 62H188Z"
+        android:fillColor="#237BFF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M212 19L206 25L212 31V19Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M148 19L154 25L148 31L148 19Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M203 24C203.552 24 204 24.4477 204 25C204 25.5523 203.552 26 203 26L196 26C195.448 26 195 25.5523 195 25C195 24.4477 195.448 24 196 24L203 24Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M177 24C177.552 24 178 24.4477 178 25C178 25.5523 177.552 26 177 26L170 26C169.448 26 169 25.5523 169 25C169 24.4477 169.448 24 170 24L177 24Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M165 25C165 24.4477 164.552 24 164 24L157 24C156.448 24 156 24.4477 156 25C156 25.5523 156.448 26 157 26L164 26C164.552 26 165 25.5523 165 25Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M190 24C190.552 24 191 24.4477 191 25C191 25.5523 190.552 26 190 26L183 26C182.448 26 182 25.5523 182 25C182 24.4477 182.448 24 183 24L190 24Z"
+        android:fillColor="#EE5622"/>
+    <path
+        android:pathData="M155 90H156L156 24H155L155 90Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#EE5622"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M204 90H205L205 24H204L204 90Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#EE5622"
+        android:fillAlpha="0.5"/>
+  </group>
+</vector>

OsmAnd/res/layout-land/track_details.xml

@@ -12,8 +12,7 @@
         android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
+        android:orientation="vertical">
-        android:background="@drawable/bg_left_menu_dark">
 
         <LinearLayout
             android:id="@+id/top_bar_layout"

OsmAnd/res/layout/along_the_route_category_item.xml

@@ -30,17 +30,17 @@
 			android:id="@+id/title"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
+			android:layout_gravity="center_vertical|start"
 			android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
 			android:layout_marginRight="@dimen/bottom_sheet_divider_margin_start"
+			android:layout_marginEnd="@dimen/bottom_sheet_divider_margin_start"
+			android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start"
 			android:ellipsize="end"
 			android:maxLines="1"
 			android:textAppearance="@style/TextAppearance.ListItemTitle"
 			android:textColor="?attr/active_color_basic"
 			osmand:typeface="@string/font_roboto_medium"
-			tools:text="Some Title"
+			tools:text="Some Title" />
-			android:layout_marginEnd="@dimen/bottom_sheet_divider_margin_start"
-			android:layout_marginStart="@dimen/bottom_sheet_divider_margin_start" />
 
 		<androidx.appcompat.widget.SwitchCompat
 			android:id="@+id/compound_button"

OsmAnd/res/layout/fragment_edit_map_source.xml

@@ -1,7 +1,6 @@
 <?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"
-    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"
@@ -11,10 +10,9 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/toolbar_height"
-        android:background="?attr/actionModeBackground"
-        android:theme="?attr/toolbar_theme"
         app:title="@string/edit_online_source"
-        osmand:titleTextColor="?android:textColorPrimary">
+        android:theme="?attr/toolbar_theme"
+        tools:background="?attr/actionModeBackground">
 
         <ImageButton
             android:id="@+id/toolbar_action"
@@ -73,10 +71,7 @@
                     android:layout_height="match_parent" />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <View
+            <include layout="@layout/divider" />
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/divider_color_basic" />
 
             <LinearLayout
                 android:id="@+id/content_container"
@@ -88,27 +83,25 @@
 
     </ScrollView>
 
-    <View
+    <include layout="@layout/divider" />
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/divider_color_basic" />
 
     <FrameLayout
+        android:id="@+id/save_button_bg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/list_background_color"
         android:minHeight="@dimen/dialog_button_ex_height"
         android:paddingStart="@dimen/content_padding"
         android:paddingTop="@dimen/content_padding_small"
         android:paddingEnd="@dimen/content_padding"
-        android:paddingBottom="@dimen/content_padding_small">
+        android:paddingBottom="@dimen/content_padding_small"
+        tools:background="?attr/list_background_color">
 
         <FrameLayout
             android:id="@+id/save_button"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dialog_button_height"
             android:layout_gravity="center"
-            android:background="?attr/dlg_btn_primary">
+            tools:background="?attr/dlg_btn_primary">
 
             <TextView
                 android:id="@+id/save_button_title"
@@ -118,7 +111,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center"
                 android:text="@string/shared_string_save"
-                android:textColor="?attr/dlg_btn_primary_text" />
+                tools:textColor="?attr/dlg_btn_primary_text" />
 
         </FrameLayout>
 

OsmAnd/res/layout/fragment_terrain.xml

@@ -275,7 +275,7 @@
 							android:textSize="@dimen/default_list_text_size"
 							tools:text="3" />
 
-						<com.google.android.material.slider.Slider
+						<com.google.android.material.slider.RangeSlider
 							android:id="@+id/zoom_slider"
 							style="@style/Widget.Styled.Slider"
 							android:layout_width="0dp"

OsmAnd/res/layout/gpx_route_card.xml

@@ -77,7 +77,7 @@
 				android:id="@+id/show_all_title"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical"
+				android:layout_gravity="center_vertical|start"
 				android:paddingTop="@dimen/list_header_padding"
 				android:paddingBottom="@dimen/list_header_padding"
 				android:layout_marginStart="@dimen/route_info_list_text_padding"

OsmAnd/res/layout/popup_menu_item.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal" android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/bottom_sheet_list_item_height">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/standard_icon_size"
+        android:layout_height="@dimen/standard_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/content_padding_half"
+        android:layout_marginStart="@dimen/content_padding_half"
+        tools:src="@drawable/ic_action_info_dark"
+        android:tint="?attr/primary_icon_color"/>
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:textColorPrimary"
+        android:layout_gravity="center_vertical"
+        android:paddingLeft="@dimen/content_padding"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:textSize="@dimen/default_list_text_size"
+        tools:text="Title" />
+
+</LinearLayout>

OsmAnd/res/layout/zoom_levels_with_descr.xml

@@ -65,7 +65,7 @@
             android:textSize="@dimen/default_list_text_size"
             tools:text="3" />
 
-        <com.google.android.material.slider.Slider
+        <com.google.android.material.slider.RangeSlider
             android:id="@+id/zoom_slider"
             style="@style/Widget.Styled.Slider"
             android:layout_width="0dp"

OsmAnd/res/values-ar/strings.xml

@@ -2088,7 +2088,7 @@
     <string name="rendering_value_fine_name">اللون والسمك</string>
     <string name="route_roundabout_short">خذ المخرج %1$d ثم واصل</string>
     <string name="search_map_hint">المدينة أو المنطقة</string>
-    <string name="wiki_around">مقالات ويكيبيديا القريبة</string>
+    <string name="wiki_around">مقالات ويكيبيديا مجاورة</string>
     <string name="routing_attr_allow_motorway_name">استخدام الطرق السريعة</string>
     <string name="routing_attr_allow_motorway_description">السماح للطرق السريعة.</string>
     <string name="lang_sr_latn">الصربية (اللاتينية)</string>
@@ -3138,7 +3138,7 @@
     <string name="utm_format_descr">يستخدم أوسماند تنسيق UTM وهو مشابه ولكن غير مطابق لتنسيق UTM الناتو.</string>
     <string name="shared_string_example">مثال</string>
     <string name="navigate_point_format_utm">معيار الإحداثيات</string>
-    <string name="navigate_point_format_olc">Open Location Code</string>
+    <string name="navigate_point_format_olc">فتح رمز الموقع</string>
     <string name="coordinates_format_info">سيتم تطبيق التنسيق المحدد في كل أنحاء التطبيق.</string>
     <string name="pref_selected_by_default_for_profiles">يتم تحديد هذا الاعداد بشكل افتراضي للأوضاع: %s</string>
     <string name="change_default_settings">تغيير الإعدادات</string>
@@ -3599,7 +3599,7 @@
     <string name="app_mode_ski_touring">جولة التزلج</string>
     <string name="app_mode_ski_snowmobile">الثلج</string>
     <string name="custom_osmand_plugin">مخصص البرنامج المساعد أوسماند</string>
-    <string name="replace_point_descr">استبدل نقطة أخرى بالحالية</string>
+    <string name="replace_point_descr">استبدل نقطة أخرى بالحالية.</string>
     <string name="changes_applied_to_profile">تم تطبيق التغييرات على %1$s ملف تعريف.</string>
     <string name="settings_item_read_error">لايمكن قراءة %1$s.</string>
     <string name="settings_item_write_error">لايمكن كتابة %1$s.</string>
@@ -3730,7 +3730,7 @@
     <string name="turn_screen_on_wake_time_descr">حدد مهلة الشاشة بعد الاستيقاظ. (\"%1$s\" لا ينطبق أي مهلة.)</string>
     <string name="keep_screen_on">إبقاء الشاشة قيد التشغيل</string>
     <string name="keep_screen_off">إبقاء الشاشة مطفأة</string>
-    <string name="screen_timeout_descr">إذا تم تفعيل الخيار \"%1$s\" ، فسوف يعتمد وقت النشاط عليه.</string>
+    <string name="screen_timeout_descr">إذا تم تفعيل \"%1$s\" ، فسوف يعتمد وقت النشاط على ذلك.</string>
     <string name="pseudo_mercator_projection">إسقاط ميركاتور الوهمي</string>
     <string name="one_image_per_tile">ملف صورة واحد لكل إطار متجانب</string>
     <string name="sqlite_db_file">ملف SQLiteDB</string>
@@ -3741,29 +3741,35 @@
     <string name="mercator_projection">إسقاط مركاتور</string>
     <string name="storage_format">تنسيق التخزين</string>
     <string name="map_source_zoom_levels">تعيين الحد الأدنى والحد الأقصى لمستوى التكبير/التصغير الذي سيتم عرض الخريطة عبر الإنترنت أو تحميله.</string>
-    <string name="map_source_zoom_levels_descr">ستؤثر هذه المعلمات على العرض عند استخدامها كخريطة أو تراكب/وضع. 
+    <string name="map_source_zoom_levels_descr">يؤثر على الشاشة عند استخدامها كخريطة أو طبقة فوقية/تحتية. 
 \n 
-\n%1$s: ستقتصر الخريطة على التكبيرات المحددة. 
+\n%1$s: تقتصر الخريطة على مستوى التكبير المحدد. 
 \n 
-\n%2$s: مستويات التكبير التي ستكون فيها الإطارات المتجانبة الأصلية مرئية. سوف يحدث التحجيم أو التحجيم خارج هذه القيم.</string>
+\n%2$s هي مستويات التكبير التي ستكون فيها الإطارات المتجانبة الأصلية مرئية. سوف يحدث التحجيم للأكبر أو الأصغر خارج هذه القيم.</string>
     <string name="expire_time_descr">وقت انتهاء الصلاحية بالدقائق. سيتم إعادة تحميل الإطارات المتجانبة المخزنة مؤقتًا بعد الوقت المحدد. اترك هذا الحقل فارغًا لعدم تحديث الإطارات المتجانبة لهذا المصدر. 
 \n
 \nيوم واحد هو 1440 دقيقة.
 \nأسبوع واحد هو 10080 دقيقة.
 \nشهر واحد هو 43 829 دقيقة.</string>
-    <string name="tiles_storage_descr">اختر كيفية تخزين الطبقات التي تم تنزيلها.</string>
+    <string name="tiles_storage_descr">اختر كيفية تخزين الطبقات المنزلة.</string>
     <string name="default_screen_timeout">مهلة الشاشة الافتراضية</string>
-    <string name="export_import_quick_actions_with_profiles_promo">يمكنك تصدير أو استيراد إجراءات سريعة باستخدام ملفات تعريف بروفايل التطبيق.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">يمكنك تصدير أو استيراد إجراءات سريعة باستخدام ملفات بروفايل التطبيق .</string>
     <string name="shared_string_delete_all_q">حذف الكل؟</string>
     <string name="delete_all_actions_message_q">هل أنت متأكد من رغبتك في حذف الإجراءات السريعة %d نهائيًا؟</string>
     <string name="screen_timeout">مهلة الشاشة</string>
-    <string name="shared_string_tones">أساليب</string>
+    <string name="shared_string_tones">نغمات</string>
     <string name="width_limit_description">أدل بعرض مركبتك، قد يتم تطبيق بعض القيود على المركبات العريضة.</string>
     <string name="height_limit_description">أدل بارتفاع مركبتك ،قد يتم تطبيق بعض القيود على المركبات المرتفعة.</string>
     <string name="weight_limit_description">أدل بوزن مركبتك ،قد يتم تطبيق بعض القيود على المركبات الثقيلة.</string>
     <string name="shared_string_meters">أمتار</string>
-    <string name="details_dialog_decr">التحكم في رؤية التفاصيل الإضافية الظاهرة على الخريطة</string>
+    <string name="details_dialog_decr">إظهار أو إخفاء التفاصيل الإضافية للخريطة</string>
     <string name="shared_string_night_map">خريطة ليلية</string>
     <string name="shared_string_all_time">كل الوقت</string>
     <string name="turn_screen_on_power_button_disabled">ذوي الاحتياجات الخاصه. يتطلب \"إبقاء الشاشة قيد تشغيل\" تحت \"المهلة بعد الاستيقاظ\".</string>
+    <string name="vessel_height_limit_description">ضبط الارتفاع لتجنب الجسور المنخفضة. ضع في اعتبارك أنه إذا كان الجسر متحركاً ، فسوف نستخدم ارتفاعه في الحالة المفتوحة.</string>
+    <string name="add_online_source">إضافة مصدر عبر الإنترنت</string>
+    <string name="clear_tiles_warning">سيؤدي تطبيق التغييرات إلى مسح البيانات المخزنة مؤقتاً للمصدر هذا</string>
+    <string name="vessel_height_warning_link">ضبط ارتفاع السفينة</string>
+    <string name="vessel_height_warning">يمكنك ضبط ارتفاع الحاوية لتجنب الجسور المنخفضة. ضع في اعتبارك أنه إذا كان الجسر متحركاً ، فسوف نستخدم ارتفاعه في الحالة المفتوحة.</string>
+    <string name="vessel_width_limit_description">تحديد عرض السفينة لتجنب الجسور الضيقة</string>
 </resources>

OsmAnd/res/values-b+sr+Cyrl/phrases.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

OsmAnd/res/values-de/phrases.xml

@@ -396,7 +396,7 @@
     <string name="poi_quarry">Steinbruch</string>
     <string name="poi_raceway">Rennstrecke</string>
     <string name="poi_racquet">Racquetball</string>
-    <string name="poi_radiotechnics">Radiotechnikladen</string>
+    <string name="poi_radiotechnics">Funktechnik/Elektronikladen</string>
     <string name="poi_halt">Eisenbahnhaltestelle</string>
     <string name="poi_railway_platform">Bahnsteig</string>
     <string name="poi_railway_station">Bahnhof</string>
@@ -475,7 +475,7 @@
     <string name="poi_second_hand">Gebrauchtwarenladen</string>
     <string name="poi_service_tyres">Reifenhändler</string>
     <string name="poi_ses_station">SES-Station</string>
-    <string name="poi_sewing">Schneiderei</string>
+    <string name="poi_sewing">Nähbedarf</string>
     <string name="poi_shelter">Unterstand</string>
     <string name="poi_ship_chandler">Schiffsausrüster</string>
     <string name="poi_historic_ship">Historisches Schiff</string>
@@ -499,7 +499,7 @@
     <string name="poi_spring">Quelle</string>
     <string name="poi_stadium">Stadion</string>
     <string name="poi_craft_stand_builder">Messebauer</string>
-    <string name="poi_standpipe">Wasserhahn</string>
+    <string name="poi_standpipe">Standrohr</string>
     <string name="poi_stationery">Bürobedarf</string>
     <string name="poi_stone">Auffallender Stein</string>
     <string name="poi_craft_stonemason">Steinmetz</string>
@@ -616,7 +616,7 @@
     <string name="poi_shop_food">Lebensmittelgeschäft und Supermarkt</string>
     <string name="poi_emergency">Notfall</string>
     <string name="poi_road_obstacle">Straßenhindernis</string>
-    <string name="poi_filling_station">Tankstelle (alle Fzg.)</string>
+    <string name="poi_filling_station">Tankstelle (alle Typen)</string>
     <string name="poi_public_transport">ÖPNV</string>
     <string name="poi_man_made">von Menschenhand</string>
     <string name="poi_water_supply">Wasserversorgung</string>
@@ -713,7 +713,7 @@
     <string name="poi_forest">Forstwald</string>
     <string name="poi_reservoir">Reservoir</string>
     <string name="poi_general_tourist_attraction_yes">Allgemeine Sehenswürdigkeit</string>
-    <string name="poi_fuel_svo">Biokraftstoff</string>
+    <string name="poi_fuel_svo">Pflanzenölkraftstoff</string>
     <string name="poi_training">Übungsgelände</string>
     <string name="poi_quarter">Quartier</string>
     <string name="poi_hunting_lodge">Jagdhütte</string>
@@ -808,7 +808,7 @@
     <string name="poi_garden_furniture">Gartenmöbelladen</string>
     <string name="poi_leather">Ledergeschäft</string>
     <string name="poi_music">Musikgeschäft</string>
-    <string name="poi_scuba_diving_shop">Gerätetaucherbedarf</string>
+    <string name="poi_scuba_diving_shop">Tauchgerätebedarf</string>
     <string name="poi_tyres">Reifengeschäft</string>
     <string name="poi_watches">Uhrengeschäft</string>
     <string name="poi_swimming_pool_shop">Poolzubehörgeschäft</string>
@@ -915,7 +915,7 @@
     <string name="poi_recycling_tyres">Reifen</string>
     <string name="poi_recycling_tv_monitor">TV und Monitore</string>
     <string name="poi_recycling_bottles">Flaschen</string>
-    <string name="poi_recycling_cork">Korken</string>
+    <string name="poi_recycling_cork">Kork</string>
     <string name="poi_recycling_printer_cartridges">Druckerpatronen</string>
     <string name="poi_recycling_paint">Farben</string>
     <string name="poi_recycling_styrofoam">Styropor</string>
@@ -948,7 +948,7 @@
     <string name="poi_recycling_centre">Recyclingzentrum</string>
     <string name="poi_recycling_aluminium">Aluminium</string>
     <string name="poi_recycling_white_goods">Weiße Ware</string>
-    <string name="poi_recycling_cooking_oil">Speiseöl</string>
+    <string name="poi_recycling_cooking_oil">Frittieröl</string>
     <string name="poi_recycling_engine_oil">Motoröl</string>
     <string name="poi_recycling_hazardous_waste">Giftmüll</string>
     <string name="poi_recycling_hydrargyrum">Quecksilber</string>
@@ -1644,7 +1644,7 @@
     <string name="poi_garden_style_kitchen">Gartenstil: Küchengarten</string>
     <string name="poi_garden_style_rosarium">Gartenstil: Rosengarten</string>
     <string name="poi_garden_style_french">Gartenstil: französisch</string>
-    <string name="poi_love_hotel">Liebeshotel</string>
+    <string name="poi_love_hotel">Stundenhotel</string>
     <string name="poi_payment_electronic_purses_yes">Elektronische Geldbörsen</string>
     <string name="poi_payment_uta_yes">UTA</string>
     <string name="poi_payment_uta_no">UTA-Karten nicht akzeptiert</string>
@@ -1914,7 +1914,7 @@
     <string name="poi_artwork_type_statue">Kunstart: Statue</string>
     <string name="poi_artwork_type_mural">Kunstart: Wandgemälde</string>
     <string name="poi_artwork_type_architecture">Kunstart: Architektur</string>
-    <string name="poi_artwork_type_painting">Kunstart: Bild</string>
+    <string name="poi_artwork_type_painting">Kunstart: Gemälde</string>
     <string name="poi_artwork_type_stone">Kunstart: Stein</string>
     <string name="poi_artwork_type_bust">Kunstart: Büste</string>
     <string name="poi_artwork_type_installation">Kunstart: Installation</string>
@@ -2162,7 +2162,7 @@
     <string name="poi_step_condition_rough">Treppenzustand: schlecht</string>
     <string name="poi_cairn">Steinhügel</string>
     <string name="poi_memorial_fassade_decoration">Fassadendekoration</string>
-    <string name="poi_tomb_war_grave">Art: Kriegsgräber</string>
+    <string name="poi_tomb_war_grave">Art: Kriegsgrab</string>
     <string name="poi_tomb_tumulus">Art: Hügelgrab</string>
     <string name="poi_tomb_rock_cut">Art: Felsgrab</string>
     <string name="poi_tomb_hypogeum">Art: Hypogäum</string>
@@ -2800,7 +2800,7 @@
     <string name="poi_traffic_signals_sound">Signalton</string>
     <string name="poi_subway_station_filter">U-Bahnstation</string>
     <string name="poi_healthcare_alternative_types">Spezialisierung</string>
-    <string name="poi_free_flying_characteristics">Charakteristisch</string>
+    <string name="poi_free_flying_characteristics">Flugmerkmale</string>
     <string name="poi_religion_type">Religion</string>
     <string name="poi_information_contents">Informationsinhalt</string>
     <string name="poi_clock_option">Zusätzlich</string>
@@ -3621,7 +3621,7 @@
     <string name="poi_vehicle_yes">Zufahrt Fahrzeuge: ja</string>
     <string name="poi_vehicle_private">Zufahrt Fahrzeuge: privat</string>
     <string name="poi_vehicle_no">Zufahrt Fahrzeuge: nein</string>
-    <string name="poi_vehicle_destination">Zufahrt Fahrzeuge: für Anlieger</string>
+    <string name="poi_vehicle_destination">Zufahrt: Anlieger frei</string>
     <string name="poi_vehicle_permissive">Zufahrt Fahrzeuge: gestattet</string>
     <string name="poi_vehicle_customers">Zufahrt Fahrzeuge: Kunden</string>
     <string name="poi_vehicle_military">Zufahrt Fahrzeuge: militärisch</string>

OsmAnd/res/values-de/strings.xml

@@ -1123,7 +1123,7 @@
     <string name="driving_region_japan">Japan</string>
     <string name="driving_region_us">USA</string>
     <string name="driving_region_canada">Kanada</string>
-    <string name="driving_region_europe_asia">Europa, Asien, Lateinamerika und andere</string>
+    <string name="driving_region_europe_asia">Europa, Asien, Lateinamerika und ähnliche</string>
     <string name="driving_region_uk">UK, Indien und andere</string>
     <string name="driving_region_australia">Australien</string>
     <string name="driving_region">Verkehrsregion</string>
@@ -1131,13 +1131,13 @@
     <string name="shared_string_about">Über</string>
     <string name="about_settings_descr">Versionsinfo, Lizenz, Projektmitglieder</string>
     <string name="local_index_tile_data_zooms">Heruntergeladene Vergrößerungsstufen: %1$s</string>
-    <string name="local_index_tile_data_expire">Gültigkeit endet in (Minuten): %1$s</string>
+    <string name="local_index_tile_data_expire">Ablaufzeit (Minuten): %1$s</string>
     <string name="local_index_tile_data_downloadable">Herunterladbar: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Maximale Vergrößerung: %1$s</string>
     <string name="local_index_tile_data_minzoom">Minimale Vergrößerung: %1$s</string>
     <string name="local_index_tile_data_name">Kacheldaten: %1$s</string>
-    <string name="edit_tilesource_successfully">Kachelquelle %1$s wurde gespeichert</string>
+    <string name="edit_tilesource_successfully">Kachelquelle %1$s gespeichert</string>
-    <string name="edit_tilesource_elliptic_tile">Elliptischer Merkator</string>
+    <string name="edit_tilesource_elliptic_tile">Elliptische Mercator-Projektion</string>
     <string name="edit_tilesource_maxzoom">Maximale Vergrößerung</string>
     <string name="edit_tilesource_expiration_time">Ablaufzeit (Minuten)</string>
     <string name="edit_tilesource_minzoom">Minimale Vergrößerung</string>
@@ -3617,7 +3617,7 @@
     <string name="app_mode_ski_snowmobile">Schneemobil</string>
     <string name="custom_osmand_plugin">Benutzerdefiniertes OsmAnd-Plugin</string>
     <string name="slope_description">Hangneigungskarten verwendet Farben, um die Geländesteilheit zu visualisieren.</string>
-    <string name="replace_point_descr">Einen anderen Punkt durch diesen ersetzen</string>
+    <string name="replace_point_descr">Einen anderen Punkt durch diesen ersetzen.</string>
     <string name="changes_applied_to_profile">Die Änderungen wurden auf das \'%1$s\' Profil angewendet.</string>
     <string name="settings_item_read_error">Konnte nicht von \'%1$s\' lesen.</string>
     <string name="settings_item_write_error">Konnte nicht nach \'%1$s\' schreiben.</string>
@@ -3667,7 +3667,7 @@
     <string name="lang_bar">Bairisch</string>
     <string name="lang_ba">Baschkirisch</string>
     <string name="main_actions_descr">Hat nur vier Schaltflächen.</string>
-    <string name="select_wikipedia_article_langs">Wählen Sie die Sprachen aus, in denen Wikipedia-Artikel auf der Karte erscheinen sollen. Sie können zwischen allen verfügbaren Sprachen wechseln, während Sie den Artikel lesen.</string>
+    <string name="select_wikipedia_article_langs">Wählen Sie die Sprachen für Wikipedia-Artikel auf der Karte aus. Wechseln Sie beim Lesen des Artikels zu einer beliebigen verfügbaren Sprache.</string>
     <string name="hidden_items_descr">Diese Elemente werden aus dem Menü ausgeblendet, aber die entsprechenden Optionen oder Plugins funktionieren weiterhin.</string>
     <string name="reorder_or_hide_from">Ordnen Sie Elemente aus %1$s neu an oder blenden Sie sie aus.</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
@@ -3734,15 +3734,15 @@
     <string name="ui_customization_short_descr">Schubladenelemente, Kontextmenü</string>
     <string name="shared_string_drawer">Schublade</string>
     <string name="gpx_parse_error">OsmAnd GPX ist nicht optimal geformt, bitte kontaktieren Sie das Support-Team, um weitere Nachforschungen anzustellen.</string>
-    <string name="map_source_zoom_levels_descr">Diese Parameter beeinflussen die Darstellung, wenn sie als Karte oder Overlay/Underlay verwendet werden. 
+    <string name="map_source_zoom_levels_descr">Wirkt sich auf den Bildschirm aus, wenn er als Karte oder Overlay/Underlay verwendet wird. 
 \n 
-\n%1$s: Die Karte wird auf die gewählten Zoomstufen begrenzt. 
+\n%1$s: Die Karte ist auf den ausgewählten Zoomstufenbereich beschränkt. 
 \n 
-\n%2$s: Zoomstufen, bei denen die Originalkacheln sichtbar sind. Außerhalb dieser Werte tritt eine Skalierung nach oben oder unten ein.</string>
+\n%2$s sind die Ebenen, auf denen die ursprünglichen Kacheln sichtbar sind, eine Hoch- oder Herunterskalierung findet außerhalb dieser Werte statt.</string>
-    <string name="map_source_zoom_levels">Legen Sie die kleinste und größte Zoomstufe fest, bei denen die Online-Karte angezeigt oder geladen wird.</string>
+    <string name="map_source_zoom_levels">Legen Sie eine minimale und maximale Zoomstufe fest, um die Online-Karte anzuzeigen oder zu laden.</string>
     <string name="shared_string_always">Immer</string>
     <string name="screen_control">Bildschirmsteuerung</string>
-    <string name="system_screen_timeout_descr">Schaltet den Bildschirm nach dem Bildschirm-Timeout des Systems aus.</string>
+    <string name="system_screen_timeout_descr">Schaltet den Bildschirm entsprechend dem Bildschirm-Timeout des Systems aus.</string>
     <string name="system_screen_timeout">Systembildschirm-Timeout verwenden</string>
     <string name="turn_screen_on_options_descr">Optionen zum Aktivieren des Bildschirms:</string>
     <string name="turn_screen_on_descr">Wählen Sie Optionen zum Aufwecken des Bildschirms (stellen Sie sicher, dass OsmAnd im Vordergrund ist, wenn das Gerät gesperrt wird):</string>
@@ -3754,7 +3754,7 @@
     <string name="turn_screen_on_wake_time_descr">Wählen Sie die Zeitüberschreitung des Bildschirms nach dem Aufwachen. („%1$s”, um keine Zeitüberschreitung anzuwenden.)</string>
     <string name="keep_screen_on">Bildschirm eingeschaltet lassen</string>
     <string name="keep_screen_off">Bildschirm ausgeschaltet lassen</string>
-    <string name="screen_timeout_descr">Wenn die Option „%1$s” aktiviert ist, ist die Dauer der Aktivität davon abhängig.</string>
+    <string name="screen_timeout_descr">Wenn \"%1$s\" eingeschaltet ist, hängt die Aktivitätszeit davon ab.</string>
     <string name="pseudo_mercator_projection">Pseudo-Mercator-Projektion</string>
     <string name="one_image_per_tile">Eine Bilddatei pro Kachel</string>
     <string name="sqlite_db_file">SQLiteDB-Datei</string>
@@ -3764,22 +3764,29 @@
     <string name="expire_time">Verfallsdatum</string>
     <string name="mercator_projection">Mercator-Projektion</string>
     <string name="storage_format">Speicherformat</string>
-    <string name="expire_time_descr">Verfallsdatum in Minuten. Kacheln im Zwischenspeicher werden nach der festgelegten Zeit neu geladen. Lassen Sie das Feld leer, wenn die Karten aus dieser Quelle nie aktualisiert werden sollen. 
+    <string name="expire_time_descr">Zwischengespeicherte Kacheln werden nach der angegebenen Anzahl von Minuten erneut heruntergeladen. Lassen Sie dieses Feld leer, um Kacheln für diese Quelle niemals zu aktualisieren. 
 \n 
 \nEin Tag hat 1440 Minuten. 
 \nEine Woche hat 10 080 Minuten. 
 \nEin Monat hat 43 829 Minuten.</string>
-    <string name="tiles_storage_descr">Wählen Sie aus, wie heruntergeladene Kacheln gespeichert werden.</string>
+    <string name="tiles_storage_descr">Wählen Sie, wie heruntergeladene Kacheln gespeichert werden sollen.</string>
     <string name="default_screen_timeout">Zeitüberschreitung des Standardbildschirms</string>
-    <string name="width_limit_description">Bitte geben Sie Ihre Fahrzeugbreite an. Für breite Fahrzeuge könnten einige Streckenabschnitte nicht befahrbar sein.</string>
+    <string name="width_limit_description">Geben Sie Ihre Fahrzeugbreite an. Für breite Fahrzeuge können einige Routenbeschränkungen gelten.</string>
-    <string name="height_limit_description">Bitte geben Sie Ihre Fahrzeughöhe an. Für hohe Fahrzeuge könnten einige Streckenabschnitte nicht befahrbar sein.</string>
+    <string name="height_limit_description">Geben Sie Ihre Fahrzeughöhe an, für hohe Fahrzeuge können einige Routenbeschränkungen gelten.</string>
-    <string name="weight_limit_description">Bitte geben Sie Ihr Fahrzeuggewicht an. Für schwere Fahrzeuge könnten einige Streckenabschnitte nicht befahrbar sein.</string>
+    <string name="weight_limit_description">Geben Sie Ihr Fahrzeuggewicht an, für schwere Fahrzeuge können einige Routenbeschränkungen gelten.</string>
     <string name="export_import_quick_actions_with_profiles_promo">Sie können Schnellaktionen mit Anwendungsprofilen exportieren oder importieren.</string>
     <string name="shared_string_delete_all_q">Alles Löschen\?</string>
     <string name="delete_all_actions_message_q">Möchten Sie %d Schnellaktionen wirklich unwiderruflich löschen\?</string>
     <string name="shared_string_tones">Töne</string>
     <string name="shared_string_meters">Meter</string>
     <string name="screen_timeout">Bildschirm-Zeitlimit</string>
-    <string name="details_dialog_decr">Kontrollieren Sie die Sichtbarkeit zusätzlicher Details, die auf der Karte angezeigt werden</string>
+    <string name="details_dialog_decr">Zusätzliche Kartendetails anzeigen oder ausblenden</string>
     <string name="shared_string_night_map">Nachtkarte</string>
+    <string name="turn_screen_on_power_button_disabled">Deaktiviert. Erfordert \'Bildschirm eingeschaltet lassen\' unter \'Timeout nach dem Aufwachen\'.</string>
+    <string name="add_online_source">Online-Quelle hinzufügen</string>
+    <string name="clear_tiles_warning">Durch die Anwendung dieser Änderungen werden die zwischengespeicherten Daten für diese Kachelquelle gelöscht</string>
+    <string name="vessel_height_warning_link">Schiffshöhe einstellen</string>
+    <string name="vessel_height_warning">Sie können die Schiffshöhe einstellen, um niedrige Brücken zu vermeiden. Denken Sie daran, wenn die Brücke beweglich ist, werden wir ihre Höhe im offenen Zustand verwenden.</string>
+    <string name="vessel_height_limit_description">Stellen Sie die Schiffshöhe ein, um niedrige Brücken zu vermeiden.Denken Sie daran, wenn die Brücke beweglich ist, werden wir ihre Höhe im offenen Zustand verwenden.</string>
+    <string name="vessel_width_limit_description">Stellen Sie die Schiffsbreite ein, um schmale Brücken zu vermeiden</string>
 </resources>

OsmAnd/res/values-eo/phrases.xml

@@ -665,7 +665,7 @@
     <string name="poi_attraction_slide">Deglitejo</string>
     <string name="poi_attraction_summer_toboggan">Somera tobogano</string>
     <string name="poi_attraction_swing_carousel">Karuselo ĉenseĝa</string>
-    <string name="poi_attraction_train">Vagonareto (atrakcio)</string>
+    <string name="poi_attraction_train">Vagonareto (allogaĵo)</string>
     <string name="poi_attraction_water_slide">Akvodeglitejo</string>
     <string name="poi_religion_voodoo">Voduo</string>
     <string name="poi_religion_taoist">Daŭismo</string>
@@ -845,7 +845,7 @@
     <string name="poi_craft_gardener">Ĝardenistejo</string>
     <string name="poi_craft_glaziery">Vitristejo</string>
     <string name="poi_craft_handicraft">Manmetistejo</string>
-    <string name="poi_craft_hvac">Oficejo de isto de hejtado, aerumado, klimatizado</string>
+    <string name="poi_craft_hvac">Oficejo de isto pri hejtado, aerumado, klimatizado</string>
     <string name="poi_craft_watchmaker">Poŝ-horloĝistejo</string>
     <string name="poi_craft_insulation">Varmizolaĵistejo</string>
     <string name="poi_craft_jeweller">Juvelista laborejo</string>
@@ -1016,7 +1016,7 @@
     <string name="poi_wiki_lang_zh">Vikipedio Ĉina</string>
     <string name="facebook">Facebook</string>
     <string name="poi_skype">Skype</string>
-    <string name="poi_bollard">Paliseto</string>
+    <string name="poi_bollard">Paliso</string>
     <string name="poi_cycle_barrier">Barilo kontraŭbicikla</string>
     <string name="poi_motorcycle_barrier">Barilo kontraŭmotorcikla</string>
     <string name="poi_block">Bloko</string>
@@ -1129,7 +1129,7 @@
     <string name="poi_bicycle_parking_rack">rakoj</string>
     <string name="poi_bicycle_parking_building">speciala konstruaĵo</string>
     <string name="poi_bicycle_parking_shed">budo</string>
-    <string name="poi_bicycle_parking_bollard">paliseto</string>
+    <string name="poi_bicycle_parking_bollard">paliso</string>
     <string name="poi_bicycle_parking_informal">neformala</string>
     <string name="poi_leaf_type_broadleaved">Folihava(j)</string>
     <string name="poi_leaf_type_needleleaved">Pinglofolia(j)</string>

OsmAnd/res/values-eo/strings.xml

@@ -176,7 +176,7 @@
     <string name="driving_region_us">Usono</string>
     <string name="driving_region_canada">Kanado</string>
     <string name="driving_region_europe_asia">Eŭropo, Azio, Latin-Ameriko kaj similaj</string>
-    <string name="driving_region_uk">Britujo, Barato kaj similaj</string>
+    <string name="driving_region_uk">Britujo, Hindujo kaj similaj</string>
     <string name="index_name_north_america">Nordameriko</string>
     <string name="index_name_netherlands">Eŭropo - Nederlando</string>
     <string name="index_name_us">Nordameriko - Usono</string>
@@ -852,15 +852,15 @@
     <string name="base_world_map">Fundamenta mapo de mondo</string>
     <string name="map_magnifier">Map-skalado</string>
     <string name="local_index_tile_data_zooms">Elŝutitaj niveloj de pligrandigo: %1$s</string>
-    <string name="local_index_tile_data_expire">Senvalidiĝos (minutoj): %1$s</string>
+    <string name="local_index_tile_data_expire">Senvalidiĝos post (minutoj): %1$s</string>
     <string name="local_index_tile_data_downloadable">Elŝuteblaj: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Maksimuma skalo: %1$s</string>
     <string name="local_index_tile_data_minzoom">Minimuma skalo: %1$s</string>
     <string name="local_index_tile_data_name">Kahelaj datumoj: %1$s</string>
     <string name="edit_tilesource_successfully">Konservis kahelfonton %1$s</string>
-    <string name="edit_tilesource_elliptic_tile">Elipsa merkatora</string>
+    <string name="edit_tilesource_elliptic_tile">Elipsa merkatora projekcio</string>
     <string name="edit_tilesource_maxzoom">Maksimuma skalo</string>
-    <string name="edit_tilesource_expiration_time">Senvalidiĝos (minutoj)</string>
+    <string name="edit_tilesource_expiration_time">Senvalidiĝos post (minutoj)</string>
     <string name="edit_tilesource_minzoom">Minimuma skalo</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Elekti ekzistantan…</string>
@@ -3609,7 +3609,7 @@
     <string name="app_mode_ski_touring">Ski‑ekskursado</string>
     <string name="app_mode_ski_snowmobile">Motorsledo</string>
     <string name="custom_osmand_plugin">Propra OsmAnd-kromprogramo</string>
-    <string name="replace_point_descr">Anstataŭigi alian punkton per tiu ĉi</string>
+    <string name="replace_point_descr">Anstataŭigi alian punkton per tiu ĉi.</string>
     <string name="changes_applied_to_profile">Aplikis ŝanĝojn al la profilo “%1$s”.</string>
     <string name="settings_item_read_error">Ne povas legi el “%1$s”.</string>
     <string name="settings_item_write_error">Ne povas skribi al “%1%s”.</string>
@@ -3637,7 +3637,7 @@
     <string name="hidden_items_descr">La jenaj elementoj estas kaŝitaj el la menuo, sed la rilataj eblaĵoj kaj kromprogramoj plue funkcios.</string>
     <string name="shared_string_hidden">Kaŝitaj</string>
     <string name="reset_items_descr">Per kaŝi agordojn, ili revenos al la implicitaj valoroj.</string>
-    <string name="select_wikipedia_article_langs">Elektu lingvojn, en kiuj artikoloj de Vikipedio montriĝos sur la mapo. Vi povos baskuli inter ĉiuj disponeblaj lingvoj dum legi artikolon.</string>
+    <string name="select_wikipedia_article_langs">Elektu lingvojn por artikoloj de Vikipedio montrataj sur la mapo. Eblos baskuli inter ĉiuj disponeblaj lingvoj dum legi artikolon.</string>
     <string name="some_articles_may_not_available_in_lang">Iuj artikoloj de Vikipedio povas ne esti disponeblaj en via lingvo.</string>
     <string name="lang_zhyue">Kantona</string>
     <string name="lang_zhminnan">Minnana</string>
@@ -3728,7 +3728,7 @@
     <string name="gpx_parse_error">Tiu ĉi GPX-dosiero estas misformita, kontaktu la helpteamon por sciiĝi pli.</string>
     <string name="shared_string_always">Ĉiam</string>
     <string name="screen_control">Aktiveco de ekrano</string>
-    <string name="system_screen_timeout_descr">Malŝaltas la ekranon post la difinita tempo (laŭ agordo de Android).</string>
+    <string name="system_screen_timeout_descr">Malŝaltas la ekranon laŭ la sistemaj agordoj.</string>
     <string name="system_screen_timeout">Sistema agordo pri malŝalti ekranon</string>
     <string name="turn_screen_on_options_descr">Kondiĉoj por ŝalti ekranon:</string>
     <string name="turn_screen_on_descr">Alĝustigi kiam ŝalti ekranon (certiĝu, ke OsmAnd laboras malfone kiam la aparato estas ŝlosita):</string>
@@ -3750,13 +3750,13 @@
     <string name="expire_time">Tempo de senvalidiĝo</string>
     <string name="mercator_projection">Merkatora projekcio</string>
     <string name="storage_format">Formo de konservado</string>
-    <string name="map_source_zoom_levels">Agordi la minimuman kaj maksimuman skal‑nivelojn ĉe kiuj la enreta mapo estos montrata.</string>
+    <string name="map_source_zoom_levels">Agordi la minimuman kaj maksimuman skal‑nivelojn por montri aŭ elŝuti enretan mapon.</string>
-    <string name="map_source_zoom_levels_descr">La jenaj valoroj efikos sur vidigo de mapa sur-/sub-tavolo.
+    <string name="map_source_zoom_levels_descr">Efikos sur vidigo de mapa sur-/sub-tavolo. 
 \n 
-\n%1$s: la mapo estos limigita al la elektitaj skal‑niveloj.
+\n%1$s: la mapo estos limigita al la difinitaj skal‑niveloj. 
 \n 
-\n%2$s: skal‑niveloj inter kiuj la originalaj kaheloj estos montrataj. Kaheloj estos pli-/mal-grandigitaj ekster tiu ĉi rango.</string>
+\n%2$s: skal‑niveloj inter kiuj la originalaj kaheloj estos montrataj, kaheloj estos pli-/mal-grandigitaj ekster tiu ĉi rango.</string>
-    <string name="expire_time_descr">Tempo de senvalidiĝo en minutoj. Kaŝmemorigitaj kaheloj estos reelŝutitaj post la difinita tempo. Lasu tiun ĉi kampon malplena por neniam refreŝigi kahelojn el tiu ĉi fonto.
+    <string name="expire_time_descr">Kaŝmemorigitaj kaheloj estos reelŝutitaj post la difinita tempo (en minutoj). Lasu tiun ĉi kampon malplena por neniam refreŝigi kahelojn el tiu ĉi fonto. 
 \n 
 \nUnu tago egalas al 1440 minutoj. 
 \nUnu semajno egalas al 10 080 minutoj. 
@@ -3772,8 +3772,14 @@
     <string name="weight_limit_description">Enigu pezon de via veturilo, iuj vojaj limigoj aplikas al pezaj veturiloj.</string>
     <string name="shared_string_tones">tunoj</string>
     <string name="shared_string_meters">metroj</string>
-    <string name="details_dialog_decr">Alĝustigi videblon de pliaj detaloj montrataj sur la mapo</string>
+    <string name="details_dialog_decr">Montri aŭ kaŝi pliajn detalojn sur la mapo</string>
     <string name="shared_string_night_map">Nokta mapo</string>
     <string name="shared_string_all_time">Ĉiam</string>
     <string name="turn_screen_on_power_button_disabled">Malŝaltita. Postulas “teni ekranon aktiva” en la sekcio “aktiveca periodo de ekrano”.</string>
+    <string name="clear_tiles_warning">Per apliki tiujn ĉi ŝanĝojn, la kaŝmemorigitaj datumoj por tiu ĉi fonto de kaheloj forviŝiĝos</string>
+    <string name="add_online_source">Aldoni enretan fonton</string>
+    <string name="vessel_height_warning_link">Enigu alton de akvoveturilo</string>
+    <string name="vessel_height_warning">Vi povas enigi alton de via akvoveturilo por eviti malaltajn pontojn. Estu konscia, ke se ponto estas movebla, la alto en ĝia malfermita stato estos uzata.</string>
+    <string name="vessel_height_limit_description">Enigu alton de akvoveturilo por eviti malaltajn pontojn. Estu konscia, ke se ponto estas movebla, la alto en ĝia malfermita stato estos uzata.</string>
+    <string name="vessel_width_limit_description">Enigu larĝon de akvoveturilo por eviti mallarĝajn pontojn</string>
 </resources>

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

@@ -530,16 +530,16 @@
     <string name="about_version">Versión:</string>
     <string name="shared_string_about">Información</string>
     <string name="about_settings_descr">Información de la versión, licencias, miembros del proyecto</string>
-    <string name="local_index_tile_data_zooms">Zooms descargados: %1$s</string>
+    <string name="local_index_tile_data_zooms">Niveles de zoom descargados: %1$s</string>
-    <string name="local_index_tile_data_expire">Expira (minutos): %1$s</string>
+    <string name="local_index_tile_data_expire">Tiempo de expiración (minutos): %1$s</string>
     <string name="local_index_tile_data_downloadable">Descargable: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Zoom máximo: %1$s</string>
     <string name="local_index_tile_data_minzoom">Zoom mínimo: %1$s</string>
     <string name="local_index_tile_data_name">Datos de teselas: %1$s</string>
     <string name="edit_tilesource_successfully">Repositorio de teselas «%1$s» guardada</string>
-    <string name="edit_tilesource_elliptic_tile">Mercator elíptica</string>
+    <string name="edit_tilesource_elliptic_tile">Proyección elíptica de Mercator</string>
     <string name="edit_tilesource_maxzoom">Zoom máximo</string>
-    <string name="edit_tilesource_expiration_time">Expira (minutos)</string>
+    <string name="edit_tilesource_expiration_time">Tiempo de expiración (minutos)</string>
     <string name="edit_tilesource_minzoom">Zoom mínimo</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Elegir existente…</string>
@@ -2353,7 +2353,6 @@
 \n • Medio Oriente: **
 \n • África: **
 \n • Antártida: *
-\n
 \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</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. 
@@ -3249,7 +3248,7 @@
     <string name="analytics_pref_title">Análisis</string>
     <string name="turn_screen_on_info">Mostrar el mapa en la pantalla de bloqueo durante la navegación.</string>
     <string name="route_parameters_info">Ajustes para la navegación del perfil elegido «%1$s».</string>
-    <string name="wake_time">Tiempo de espera después del encendido</string>
+    <string name="wake_time">Tiempo de espera al encender</string>
     <string name="units_and_formats">Unidades y formatos</string>
     <string name="appearance">Aspecto</string>
     <string name="map_look_descr">Apariencia del mapa</string>
@@ -3613,7 +3612,7 @@
     <string name="app_mode_ski_touring">Esquí de travesía</string>
     <string name="app_mode_ski_snowmobile">Motonieve</string>
     <string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
-    <string name="replace_point_descr">Reemplaza otro punto con esto</string>
+    <string name="replace_point_descr">Reemplaza otro punto con esto.</string>
     <string name="settings_item_read_error">No se pudo leer desde «%1$s».</string>
     <string name="settings_item_write_error">No se pudo escribir en «%1$s».</string>
     <string name="settings_item_import_error">No se pudo importar desde «%1$s».</string>
@@ -3643,7 +3642,7 @@
     <string name="wikipedia_poi_languages_promo">Algunos artículos de Wikipedia pueden no estar disponibles en tu idioma, elige los idiomas en los que los artículos de Wikipedia aparecerán en el mapa.
 \nPodrás cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
     <string name="wiki_menu_download_descr">Se necesitan mapas adicionales para ver los puntos de interés de Wikipedia en el mapa.</string>
-    <string name="select_wikipedia_article_langs">Marca los idiomas en los que los artículos de Wikipedia aparecerán en el mapa. Puedes cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
+    <string name="select_wikipedia_article_langs">Marca los idiomas de los artículos de Wikipedia en el mapa. Cambia a cualquier idioma disponible mientras lees el artículo.</string>
     <string name="some_articles_may_not_available_in_lang">Es posible que algunos artículos de Wikipedia no estén disponibles en tu idioma.</string>
     <string name="lang_zhyue">Cantonés</string>
     <string name="lang_zhminnan">Min del Sur</string>
@@ -3734,7 +3733,7 @@
     <string name="gpx_parse_error">El GPX de OsmAnd no está bien formado, por favor, contacta con el equipo de soporte para investigar más a fondo.</string>
     <string name="shared_string_always">Siempre</string>
     <string name="screen_control">Control de pantalla</string>
-    <string name="system_screen_timeout_descr">Apaga la pantalla después del tiempo de espera del sistema.</string>
+    <string name="system_screen_timeout_descr">Apaga la pantalla según el tiempo de espera del sistema.</string>
     <string name="system_screen_timeout">Usar el tiempo de espera de la pantalla del sistema</string>
     <string name="turn_screen_on_options_descr">Opciones de activación de la pantalla:</string>
     <string name="turn_screen_on_descr">Elige las opciones de activación de la pantalla (asegúrate de que OsmAnd esté en primer plano al bloquear el dispositivo):</string>
@@ -3746,7 +3745,7 @@
     <string name="turn_screen_on_wake_time_descr">Elige el tiempo de espera de la pantalla luego del encendido. («%1$s» no aplica ningún tiempo de espera.)</string>
     <string name="keep_screen_on">Mantener la pantalla encendida</string>
     <string name="keep_screen_off">Mantener la pantalla apagada</string>
-    <string name="screen_timeout_descr">Si la opción «%1$s» está activada, el tiempo de actividad dependerá de ello.</string>
+    <string name="screen_timeout_descr">Si «%1$s» está activado, el tiempo de actividad dependerá de ello.</string>
     <string name="pseudo_mercator_projection">Proyección de pseudo-Mercator</string>
     <string name="one_image_per_tile">Un archivo de imagen por tesela</string>
     <string name="sqlite_db_file">Archivo SQLiteDB</string>
@@ -3756,29 +3755,36 @@
     <string name="expire_time">Tiempo de expiración</string>
     <string name="mercator_projection">Proyección de Mercator</string>
     <string name="storage_format">Formato de almacenamiento</string>
-    <string name="map_source_zoom_levels">Define el nivel de zoom mínimo y máximo en el que se muestra o carga el mapa en línea.</string>
+    <string name="map_source_zoom_levels">Define un nivel de zoom mínimo y máximo para mostrar o cargar el mapa en línea.</string>
-    <string name="map_source_zoom_levels_descr">Estos parámetros afectan a la visualización al usarlos como mapa, superposición o subyacencia.
+    <string name="map_source_zoom_levels_descr">Afectan a la pantalla al usarlos como mapa, superposición o subyacencia. 
 \n 
-\n%1$s: El mapa se limita a los zoom elegidos.
+\n%1$s: El mapa está limitado al rango de zoom elegidos. 
 \n 
-\n%2$s: Niveles de zoom en los que las teselas originales son visibles. El aumento o reducción de escala ocurrirá fuera de estos valores.</string>
+\n%2$s son los niveles en los que las teselas originales son visibles, el aumento o reducción de escala ocurrirá fuera de estos valores.</string>
-    <string name="expire_time_descr">Tiempo de expiración en minutos. Las teselas almacenadas serán recargadas después del tiempo indicado. Deja este campo vacío para que nunca se refresquen las teselas de este repositorio.
+    <string name="expire_time_descr">Las teselas almacenadas serán renovadas después del número especificado en minutos. Dejar este campo vacío para que nunca se renueven las teselas de este repositorio. 
 \n 
 \nUn día son 1440 minutos. 
 \nUna semana son 10 080 minutos. 
 \nUn mes son 43 829 minutos.</string>
-    <string name="tiles_storage_descr">Elige cómo se almacenarán las teselas descargadas.</string>
+    <string name="tiles_storage_descr">Elige cómo almacenar las teselas descargadas.</string>
     <string name="default_screen_timeout">Tiempo predefinido de la espera de la pantalla</string>
     <string name="export_import_quick_actions_with_profiles_promo">Puedes exportar o importar acciones rápidas con perfiles de aplicación.</string>
     <string name="shared_string_delete_all_q">¿Borrar todo\?</string>
     <string name="delete_all_actions_message_q">¿Borrar irrevocablemente %d acciones rápidas\?</string>
-    <string name="width_limit_description">Proporciona el ancho del vehículo. Se pueden aplicar algunas restricciones de ruta para vehículos anchos.</string>
+    <string name="width_limit_description">Proporciona el ancho del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos anchos.</string>
-    <string name="height_limit_description">Proporciona la altura del vehículo, se pueden aplicar algunas restricciones de ruta para vehículos altos.</string>
+    <string name="height_limit_description">Proporciona la altura del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos altos.</string>
-    <string name="weight_limit_description">Proporciona el peso del vehículo, se pueden aplicar algunas restricciones de ruta para vehículos pesados.</string>
+    <string name="weight_limit_description">Proporciona el peso del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos pesados.</string>
     <string name="screen_timeout">Tiempo de espera de la pantalla</string>
     <string name="shared_string_tones">tonos</string>
     <string name="shared_string_meters">metros</string>
-    <string name="details_dialog_decr">Controla la visibilidad de los detalles adicionales que se muestran en el mapa</string>
+    <string name="details_dialog_decr">Muestra u oculta los detalles adicionales del mapa</string>
     <string name="shared_string_night_map">Mapa nocturno</string>
     <string name="shared_string_all_time">Todo el tiempo</string>
+    <string name="turn_screen_on_power_button_disabled">Desactivado. Es necesario activar «Mantener la pantalla encendida» en «Tiempo de espera al encender».</string>
+    <string name="add_online_source">Añadir repositorio en línea</string>
+    <string name="clear_tiles_warning">Al aplicar estos cambios, los datos almacenados serán borrados para este repositorio de teselas</string>
+    <string name="vessel_height_warning_link">Definir altura de la embarcación</string>
+    <string name="vessel_height_limit_description">Define la altura de la embarcación para evitar puentes bajos. Tener en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
+    <string name="vessel_height_warning">Puedes definir la altura de la embarcación para evitar puentes bajos. Tener en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
+    <string name="vessel_width_limit_description">Define el ancho de la embarcación para evitar puentes estrechos</string>
 </resources>

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

@@ -530,16 +530,16 @@
     <string name="about_version">Versión:</string>
     <string name="shared_string_about">Información</string>
     <string name="about_settings_descr">Información de la versión, licencias, miembros del proyecto</string>
-    <string name="local_index_tile_data_zooms">Zooms descargados: %1$s</string>
+    <string name="local_index_tile_data_zooms">Niveles de zoom descargados: %1$s</string>
-    <string name="local_index_tile_data_expire">Expira (minutos): %1$s</string>
+    <string name="local_index_tile_data_expire">Tiempo de expiración (minutos): %1$s</string>
     <string name="local_index_tile_data_downloadable">Descargable: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Zoom máximo: %1$s</string>
     <string name="local_index_tile_data_minzoom">Zoom mínimo: %1$s</string>
     <string name="local_index_tile_data_name">Datos de teselas: %1$s</string>
     <string name="edit_tilesource_successfully">Repositorio de teselas «%1$s» guardada</string>
-    <string name="edit_tilesource_elliptic_tile">Mercator elíptica</string>
+    <string name="edit_tilesource_elliptic_tile">Proyección elíptica de Mercator</string>
     <string name="edit_tilesource_maxzoom">Zoom máximo</string>
-    <string name="edit_tilesource_expiration_time">Expira (minutos)</string>
+    <string name="edit_tilesource_expiration_time">Tiempo de expiración (minutos)</string>
     <string name="edit_tilesource_minzoom">Zoom mínimo</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Elegir existente…</string>
@@ -2353,7 +2353,6 @@
 \n • Medio Oriente: **
 \n • África: **
 \n • Antártida: *
-\n
 \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</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. 
@@ -3177,7 +3176,7 @@
     <string name="turn_screen_on_router">Despertar al girar</string>
     <string name="turn_screen_on_time_descr">Define durante cuánto tiempo debe estar encendida la pantalla.</string>
     <string name="turn_screen_on_sensor">Usar sensor de proximidad</string>
-    <string name="turn_screen_on_sensor_descr">Mueve la mano sobre la parte superior de la pantalla para encenderla mientras navegas.</string>
+    <string name="turn_screen_on_sensor_descr">Al mover la mano por la pantalla, se encenderá.</string>
     <string name="rendering_attr_highway_class_track_grade1_name">Grado 1</string>
     <string name="rendering_attr_highway_class_track_grade2_name">Grado 2</string>
     <string name="rendering_attr_highway_class_track_grade3_name">Grado 3</string>
@@ -3249,7 +3248,7 @@
     <string name="analytics_pref_title">Análisis</string>
     <string name="turn_screen_on_info">Mostrar el mapa en la pantalla de bloqueo durante la navegación.</string>
     <string name="route_parameters_info">Ajustes para la navegación del perfil elegido «%1$s».</string>
-    <string name="wake_time">Duración del encendido</string>
+    <string name="wake_time">Tiempo de espera al encender</string>
     <string name="units_and_formats">Unidades y formatos</string>
     <string name="appearance">Aspecto</string>
     <string name="map_look_descr">Apariencia del mapa</string>
@@ -3462,7 +3461,7 @@
     <string name="monitoring_min_speed_descr_side_effect">Efecto secundario: En la traza faltarán todos los tramos en los que no se haya cumplido el criterio de velocidad mínima (por ejemplo, cuando se empuja la bicicleta por una colina empinada). Además, no habrá información sobre los períodos de descanso, como las pausas. Esto tiene efectos en cualquier análisis o post-proceso, como cuando se trata de determinar la duración total del viaje, el tiempo en movimiento, o la velocidad promedio.</string>
     <string name="monitoring_min_speed_descr_recommendation">Recomendación: Prueba primero a utilizar la detección de movimiento mediante el filtro de desplazamiento mínimo de registro (B), puede producir mejores resultados y perderá menos datos. Si las trazas siguen siendo ruidosas a bajas velocidades, prueba aquí con valores distintos de cero. Tenga en cuenta que algunas mediciones pueden no informar ningún valor de velocidad (algunos métodos basados en la red), en cuyo caso no se registraría nada.</string>
     <string name="monitoring_min_speed_descr_remark">Observación: comprobar velocidad &gt; 0: La mayoría de los chipsets de GPS informan un valor de velocidad sólo si el algoritmo determina que está en movimiento. Por lo tanto, el uso del ajuste &gt; 0 en este filtro, en cierto sentido utiliza la detección de movimiento del conjunto de chips del GPS. Pero incluso si no se filtra aquí en el momento de la grabación, seguimos utilizando esta función en nuestro análisis GPX para determinar la distancia corregida, es decir, el valor que se muestra en ese campo es la distancia grabada en movimiento.</string>
-    <string name="monitoring_min_accuracy_descr">Esto registrará solo los puntos medidos con una indicación de precisión mínima (en metros o pies, según lo informado por Android para su conjunto de chips). La precisión se refiere a cuán cerca están sus mediciones de la ubicación real, y no está directamente relacionada con la precisión, que es la dispersión de las mediciones repetidas.</string>
+    <string name="monitoring_min_accuracy_descr">Esto registrará solo los puntos medidos con una indicación de precisión mínima (en metros o pies, según lo informado por Android para su conjunto de chips). La precisión es la proximidad de las mediciones a la ubicación real y no está directamente relacionada con la precisión, que es la dispersión de las mediciones repetidas.</string>
     <string name="monitoring_min_accuracy_descr_side_effect">Efecto secundario: Como resultado del filtrado por precisión, pueden faltar puntos por ejemplo debajo de puentes, bajo árboles, entre edificios altos o con ciertas condiciones climáticas.</string>
     <string name="monitoring_min_accuracy_descr_recommendation">Recomendación: Es difícil predecir lo que se grabará y lo que no, puede ser mejor apagar este filtro.</string>
     <string name="monitoring_min_accuracy_descr_remark">Observación: Si el GPS se hubiera apagado inmediatamente antes de una grabación, el primer punto medido podría tener una precisión disminuida, por lo que en nuestro código puede que queramos esperar un segundo más o menos antes de grabar un punto (o grabar el mejor de 3 puntos consecutivos, etc.), pero esto todavía no se ha implementado.</string>
@@ -3612,7 +3611,7 @@
     <string name="app_mode_ski_touring">Esquí de travesía</string>
     <string name="app_mode_ski_snowmobile">Motonieve</string>
     <string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
-    <string name="replace_point_descr">Reemplaza otro punto con esto</string>
+    <string name="replace_point_descr">Reemplaza otro punto con esto.</string>
     <string name="changes_applied_to_profile">Cambios aplicados al perfil «%1$s».</string>
     <string name="settings_item_read_error">No se pudo leer desde «%1$s».</string>
     <string name="settings_item_write_error">No se pudo escribir en «%1$s».</string>
@@ -3648,7 +3647,7 @@
     <string name="tracker_item">OsmAnd Tracker</string>
     <string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string>
     <string name="some_articles_may_not_available_in_lang">Es posible que algunos artículos de Wikipedia no estén disponibles en tu idioma.</string>
-    <string name="select_wikipedia_article_langs">Marca los idiomas en los que los artículos de Wikipedia aparecerán en el mapa. Puedes cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
+    <string name="select_wikipedia_article_langs">Marca los idiomas de los artículos de Wikipedia en el mapa. Cambia a cualquier idioma disponible mientras lees el artículo.</string>
     <string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Pulsa «Alternar» para marcar todo y el lado izquierdo para elegir una categoría.</string>
     <string name="search_poi_types">Buscar por tipos de PDI</string>
     <string name="radius_ruler_item">Regla radial</string>
@@ -3730,5 +3729,59 @@
     <string name="profiles_for_action_not_found">No se pudo encontrar ninguno de estos perfiles.</string>
     <string name="unsupported_type_error">Tipo no admitido</string>
     <string name="index_item_world_basemap_detailed">Mapa mundial general (detallado)</string>
-    <string name="gpx_parse_error">El GPX de OsmAnd no está bien formado, por favor, contacta con el equipo de soporte para investigar más a fondo</string>
+    <string name="gpx_parse_error">El GPX de OsmAnd no está bien formado, por favor, contacta con el equipo de soporte para investigar más a fondo.</string>
+    <string name="width_limit_description">Proporciona el ancho del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos anchos.</string>
+    <string name="weight_limit_description">Proporciona el peso del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos pesados.</string>
+    <string name="vessel_width_limit_description">Define el ancho de la embarcación para evitar puentes estrechos</string>
+    <string name="vessel_height_warning_link">Definir altura de la embarcación</string>
+    <string name="vessel_height_warning">Puedes definir la altura de la embarcación para evitar puentes bajos. Tener en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
+    <string name="vessel_height_limit_description">Define la altura de la embarcación para evitar puentes bajos. Tener en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
+    <string name="turn_screen_on_wake_time_descr">Elige el tiempo de espera de la pantalla luego del encendido. («%1$s» no aplica ningún tiempo de espera.)</string>
+    <string name="turn_screen_on_proximity_sensor">Sensor de proximidad</string>
+    <string name="turn_screen_on_power_button_disabled">Desactivado. Es necesario activar «Mantener la pantalla encendida» en «Tiempo de espera al encender».</string>
+    <string name="turn_screen_on_power_button_descr">Al pulsar el botón de encendido del dispositivo, se encenderá la pantalla de bloqueo con OsmAnd sobre ella.</string>
+    <string name="turn_screen_on_power_button">Botón de encendido</string>
+    <string name="turn_screen_on_navigation_instructions_descr">Cada indicación de navegación activará la pantalla.</string>
+    <string name="turn_screen_on_navigation_instructions">Indicaciones de navegación</string>
+    <string name="turn_screen_on_descr">Elige las opciones de activación de la pantalla (asegúrate de que OsmAnd esté en primer plano al bloquear el dispositivo):</string>
+    <string name="tiles_storage_descr">Elige cómo almacenar las teselas descargadas.</string>
+    <string name="system_screen_timeout_descr">Apaga la pantalla según el tiempo de espera del sistema.</string>
+    <string name="system_screen_timeout">Usar el tiempo de espera de la pantalla del sistema</string>
+    <string name="storage_format">Formato de almacenamiento</string>
+    <string name="sqlite_db_file">Archivo SQLiteDB</string>
+    <string name="shared_string_tones">tonos</string>
+    <string name="shared_string_night_map">Mapa nocturno</string>
+    <string name="shared_string_meters">metros</string>
+    <string name="shared_string_delete_all_q">¿Borrar todo\?</string>
+    <string name="shared_string_always">Siempre</string>
+    <string name="screen_timeout_descr">Si «%1$s» está activado, el tiempo de actividad dependerá de ello.</string>
+    <string name="screen_timeout">Tiempo de espera de la pantalla</string>
+    <string name="screen_control">Control de pantalla</string>
+    <string name="pseudo_mercator_projection">Proyección de pseudo-Mercator</string>
+    <string name="online_map_url_helper_text">Ingresa o pega la URL del repositorio en línea.</string>
+    <string name="online_map_name_helper_text">Proporciona un nombre para el repositorio del mapa en línea.</string>
+    <string name="one_image_per_tile">Un archivo de imagen por tesela</string>
+    <string name="mercator_projection">Proyección de Mercator</string>
+    <string name="map_source_zoom_levels_descr">Afectan a la pantalla al usarlos como mapa, superposición o subyacencia. 
+\n 
+\n%1$s: El mapa está limitado al rango de zoom elegidos. 
+\n 
+\n%2$s son los niveles en los que las teselas originales son visibles, el aumento o reducción de escala ocurrirá fuera de estos valores.</string>
+    <string name="map_source_zoom_levels">Define un nivel de zoom mínimo y máximo para mostrar o cargar el mapa en línea.</string>
+    <string name="keep_screen_on">Mantener la pantalla encendida</string>
+    <string name="keep_screen_off">Mantener la pantalla apagada</string>
+    <string name="height_limit_description">Proporciona la altura del vehículo, pueden aplicarse algunas restricciones de ruta para vehículos altos.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Puedes exportar o importar acciones rápidas con perfiles de aplicación.</string>
+    <string name="expire_time_descr">Las teselas almacenadas serán renovadas después del número especificado en minutos. Dejar este campo vacío para que nunca se renueven las teselas de este repositorio. 
+\n 
+\nUn día son 1440 minutos. 
+\nUna semana son 10 080 minutos. 
+\nUn mes son 43 829 minutos.</string>
+    <string name="expire_time">Tiempo de expiración</string>
+    <string name="edit_online_source">Editar repositorio en línea</string>
+    <string name="details_dialog_decr">Muestra u oculta los detalles adicionales del mapa</string>
+    <string name="delete_all_actions_message_q">¿Borrar irrevocablemente %d acciones rápidas\?</string>
+    <string name="default_screen_timeout">Tiempo predefinido de la espera de la pantalla</string>
+    <string name="clear_tiles_warning">Al aplicar estos cambios, los datos almacenados serán borrados para este repositorio de teselas</string>
+    <string name="add_online_source">Añadir repositorio en línea</string>
 </resources>

OsmAnd/res/values-fa/phrases.xml

@@ -1377,7 +1377,7 @@
     <string name="poi_trees_coconut">نارگیل</string>
     <string name="poi_trees_banana">موز</string>
     <string name="poi_trees_almond">بادام</string>
-    <string name="poi_trees_orange">پرتغال</string>
+    <string name="poi_trees_orange">پرتقال</string>
     <string name="poi_bicycle_parking_informal">غیررسمی</string>
     <string name="poi_bicycle_parking_building">ساختمان ویژه</string>
     <string name="poi_nudism_no">ممنوع</string>
@@ -1403,7 +1403,7 @@
     <string name="poi_email">رایانامه</string>
     <string name="poi_website">وب‌گاه</string>
     <string name="poi_phone">تلفن</string>
-    <string name="poi_opening_hours">ساعت باز شد</string>
+    <string name="poi_opening_hours">ساعت کاری</string>
     <string name="poi_entrance_exit">خروج</string>
     <string name="poi_entrance_main">ورودی اصلی</string>
     <string name="poi_height_restrictor">محدودکننده ارتفاع</string>

OsmAnd/res/values-fa/strings.xml

@@ -297,7 +297,7 @@
     <string name="follow">شروع هدایت</string>
     <string name="mark_final_location_first">لطفاً ابتدا مقصد را تنظیم کنید</string>
     <string name="get_directions">مسیریابی</string>
-    <string name="opening_hours">ساعات کاری</string>
+    <string name="opening_hours">ساعت کاری</string>
     <string name="shared_string_history">سابقه</string>
     <string name="search_nothing_found">چیزی پیدا نشد</string>
     <string name="searching">در حال جست‌وجو…</string>
@@ -1075,14 +1075,14 @@
     <string name="shared_string_about">درباره</string>
     <string name="about_settings_descr">دربارهٔ نسخه، گواهی‌ها، اعضای پروژه</string>
     <string name="local_index_tile_data_zooms">زوم‌های دانلود‌شده: %1$s</string>
-    <string name="local_index_tile_data_expire">انقضا (به دقیقه): %1$s</string>
+    <string name="local_index_tile_data_expire">زمان انقضا (به دقیقه): %1$s</string>
     <string name="local_index_tile_data_downloadable">قابل‌دانلود: %1$s</string>
     <string name="local_index_tile_data_maxzoom">بیشترین زوم: %1$s</string>
     <string name="local_index_tile_data_minzoom">کمترین زوم: %1$s</string>
     <string name="local_index_tile_data_name">منبع کاشی‌ها: %1$s</string>
     <string name="edit_tilesource_successfully">منبع کاشی %1$s ذخیره شد</string>
     <string name="edit_tilesource_maxzoom">بیشترین زوم</string>
-    <string name="edit_tilesource_expiration_time">انقضا (به دقیقه)</string>
+    <string name="edit_tilesource_expiration_time">زمان انقضا (به دقیقه)</string>
     <string name="edit_tilesource_minzoom">کمترین زوم</string>
     <string name="edit_tilesource_choose_existing">انتخاب از موارد موجود…</string>
     <string name="maps_define_edit">تعریف/ویرایش…</string>
@@ -3639,7 +3639,7 @@
     <string name="app_mode_ski_touring">تور اسکی</string>
     <string name="app_mode_ski_snowmobile">برف‌رو</string>
     <string name="custom_osmand_plugin">افزونهٔ سفارشی OsmAnd</string>
-    <string name="replace_point_descr">نقطهٔ دیگری را جانشین این کنید</string>
+    <string name="replace_point_descr">نقطهٔ دیگری را جانشین این کنید.</string>
     <string name="changes_applied_to_profile">تغییرات بر پروفایل %1$s به کار گرفته شد.</string>
     <string name="settings_item_read_error">خواندن از %1$s ناموفق بود.</string>
     <string name="settings_item_write_error">نوشتن در %1$s ناموفق بود.</string>
@@ -3668,7 +3668,7 @@
     <string name="divider_descr">چیزهایی که از این نقطه به پایین قرار می‌گیرند، با جداکننده جدا می‌شوند.</string>
     <string name="move_inside_category">اقلام را فقط درون این دسته می‌توانید جابه‌جا کنید.</string>
     <string name="shared_string_items">اقلام</string>
-    <string name="select_wikipedia_article_langs">انتخاب کنید مقاله‌های ویکی‌پدیا به چه زبان‌هایی روی نقشه نمایان شوند. هنگام مطالعهٔ مقاله می‌توانید بین زبان‌های مختلف جابه‌جا شوید.</string>
+    <string name="select_wikipedia_article_langs">زبان‌های مقاله‌های ویکی‌پدیا را برای نمایش روی نقشه انتخاب کنید. هنگام مطالعهٔ مقاله می‌توانید بین زبان‌های موجود جابه‌جا شوید.</string>
     <string name="some_articles_may_not_available_in_lang">ممکن است برخی مقاله‌های ویکی‌پدیا به زبان شما در دسترس نباشد.</string>
     <string name="lang_lmo">لومبارد</string>
     <string name="custom_color">رنگ دلخواه</string>
@@ -3758,7 +3758,7 @@
     <string name="reset_deafult_order">بازنشانی ترتیب پیشفرض اقلام</string>
     <string name="gpx_parse_error">‏OsmAnd GPX قالب درستی ندارد. لطفاً برای بررسی بیشتر با گروه پشتیبانی تماس بگیرید.</string>
     <string name="turn_screen_on_wake_time_descr">زمان خاموشی صفحه پس از بیدارباش را انتخاب کنید. («%1$s» یعنی خاموش نشود)</string>
-    <string name="screen_timeout_descr">اگر گزینهٔ «%1$s» فعال باشد، زمان فعالیت به آن وابسته خواهد بود.</string>
+    <string name="screen_timeout_descr">اگر «%1$s» روشن باشد، زمان فعالیت به آن وابسته خواهد بود.</string>
     <string name="shared_string_always">همیشه</string>
     <string name="screen_control">کنترل صفحه</string>
     <string name="system_screen_timeout_descr">هنگامی که زمان خاموشی صفحه مطابق تنظیمات دستگاه سر برسد، صفحه را خاموش می‌کند.</string>
@@ -3774,9 +3774,9 @@
     <string name="keep_screen_off">صفحه را خاموش نگه دار</string>
     <string name="mercator_projection">فراتابی مرکاتور</string>
     <string name="one_image_per_tile">یک فایل تصویر برای هر کاشی</string>
-    <string name="map_source_zoom_levels_descr">این پارامترها هنگام استفاده از منبع به‌عنوان نقشه یا رولایه/زیرلایه، بر نمایش آن اثر می‌گذارند. 
+    <string name="map_source_zoom_levels_descr">هنگام استفاده از منبع به‌عنوان نقشه یا رولایه/زیرلایه، بر نمایش آن اثر می‌گذارند. 
 \n 
-\n‏%1$s: نقشه محدود به پارامترهای انتخاب‌شده خواهد بود.
+\n‏%1$s: نقشه به دامنهٔ زوم انتخاب‌شده محدود می‌شود.
 \n 
 \n‏%2$s: درجات زوم که در آن کاشی‌های اصلی نمایان خواهند بود. خارج از این مقدارها افزایش یا کاهش مقیاس رخ خواهد داد.</string>
     <string name="sqlite_db_file">فایل SQLiteDB</string>
@@ -3785,8 +3785,8 @@
     <string name="edit_online_source">ویرایش منبع آنلاین</string>
     <string name="expire_time">زمان انقضا</string>
     <string name="storage_format">قالب ذخیره‌گاه</string>
-    <string name="map_source_zoom_levels">کمترین و بیشترین درجهٔ زوم که نقشهٔ آنلاین نمایان خواهد بود یا بار خواهد شد.</string>
+    <string name="map_source_zoom_levels">کمترین و بیشترین درجهٔ زوم را برای نمایش یا بارکردن نقشهٔ آنلاین تنظیم کنید.</string>
-    <string name="expire_time_descr">زمان انقضا به دقیقه. کاشی‌های ذخیره‌شده پس از این مدت زمان مجدداً بار می‌شوند. این خانه را خالی بگذارید تا کاشی‌های این منبع هیچ‌گاه تازه‌سازی نشود.
+    <string name="expire_time_descr">کاشی‌های ذخیره‌شده پس از این مدت (به دقیقه) مجدداً دانلود می‌شوند. این خانه را خالی بگذارید تا کاشی‌های این منبع هیچ‌گاه تازه‌سازی نشود. 
 \n 
 \nیک روز ۱ ۴۴۰ دقیقه است. 
 \nیک هفته ۱۰ ۰۸۰ دقیقه است. 
@@ -3802,11 +3802,17 @@
     <string name="weight_limit_description">وزن وسیلهٔ نقلیهٔ خود را مشخص کنید. ممکن است محدودیت‌های مسیر برای وسایل نقلیهٔ سنگین اِعمال شود.</string>
     <string name="shared_string_tones">تُن</string>
     <string name="shared_string_meters">متر</string>
-    <string name="details_dialog_decr">نمایانی جزئیات اضافه‌تر روی نقشه را کنترل کنید</string>
+    <string name="details_dialog_decr">جزئیات اضافه‌تر را روی نقشه آشکار یا پنهان کنید</string>
     <string name="shared_string_night_map">نقشهٔ شب</string>
     <string name="shared_string_all_time">همیشه</string>
     <string name="turn_screen_on_power_button_disabled">غیرفعال است. به گزینهٔ «روشن نگه داشتن صفحه» در قسمت «زمان خاموشی پس از بیدارباش» نیاز دارد.</string>
     <string name="pseudo_mercator_projection">فراتابی شبه مرکاتور</string>
     <string name="rendering_attr_piste_type_connection_name">اتصال</string>
     <string name="rendering_attr_piste_difficulty_connection_name">اتصال</string>
+    <string name="add_online_source">افزودن منبع آنلاین</string>
+    <string name="clear_tiles_warning">به‌کارگیری این تغییرات، دادهٔ ذخیره‌شده برای این منبعِ کاشی را پاک می‌کند</string>
+    <string name="vessel_height_warning_link">تنظیم ارتفاع کشتی</string>
+    <string name="vessel_height_warning">می‌توانید ارتفاع کشتی را برای پرهیز از پل‌های کوتاه وارد کنید. به یاد داشته باشید که اگر پل متحرک است، در حالت باز نیز ارتفاع کشتی را در نظر می‌گیریم.</string>
+    <string name="vessel_height_limit_description">ارتفاع کشتی را برای پرهیز از پل‌های کوتاه وارد کنید. به یاد داشته باشید که اگر پل متحرک است، در حالت باز نیز ارتفاع کشتی را در نظر می‌گیریم.</string>
+    <string name="vessel_width_limit_description">عرض کشتی را برای پرهیز از پل های باریک وارد کنید</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -3820,4 +3820,8 @@
     <string name="poi_traffic_signals_sound_locate">Uniquement si la marche est autorisée</string>
     <string name="poi_internet_access_fee_customers">Signal pour trouver le pôle</string>
     <string name="poi_fire_hydrant_pressure_filter">Pression</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Aspiration</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pressurisé</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">Eaux souterraines</string>
+    <string name="poi_fire_hydrant_type_pipe">Tuyau</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -1021,7 +1021,7 @@
     <string name="speak_speed_limit">Limitations de vitesse</string>
     <string name="shared_string_about">À propos</string>
     <string name="about_settings_descr">Note de version, licences, membres du projet</string>
-    <string name="local_index_tile_data_zooms">Zooms téléchargés : %1$s</string>
+    <string name="local_index_tile_data_zooms">Niveaux de zoom téléchargés : %1$s</string>
     <string name="local_index_tile_data_expire">Expire (minutes) : %1$s</string>
     <string name="local_index_tile_data_downloadable">Téléchargeable : %1$s</string>
     <string name="local_index_tile_data_maxzoom">Zoom maximum : %1$s</string>
@@ -1041,8 +1041,8 @@
     <string name="clear_intermediate_points">Supprimer les étapes</string>
     <string name="keep_intermediate_points">Conserver les étapes</string>
     <string name="local_index_tile_data_name">Données de tuile : %1$s</string>
-    <string name="edit_tilesource_successfully">Le fournisseur de tuiles %1$s a été enregistré avec succès</string>
+    <string name="edit_tilesource_successfully">La source de tuiles %1$s a été enregistrée</string>
-    <string name="edit_tilesource_elliptic_tile">Mercator elliptique</string>
+    <string name="edit_tilesource_elliptic_tile">Projection de Mercator elliptique</string>
     <string name="edit_tilesource_choose_existing">Sélectionner existant…</string>
     <string name="maps_define_edit">Définir/Éditer…</string>
     <string name="speak_descr">Paramétrer les annonces des noms de rue, alertes de circulation (bouchons, ralentissements), radars et limites de vitesse.</string>
@@ -3591,7 +3591,7 @@
     <string name="app_mode_ski_touring">Ski de randonnée</string>
     <string name="app_mode_ski_snowmobile">Motoneige</string>
     <string name="custom_osmand_plugin">Greffon OsmAnd personnalisé</string>
-    <string name="replace_point_descr">Remplacer un point par celui-ci</string>
+    <string name="replace_point_descr">Remplacer un point par celui-ci.</string>
     <string name="changes_applied_to_profile">Modifications appliquées au profil \'%1$s\'.</string>
     <string name="settings_item_read_error">Impossible de lire depuis \'%1$s\'.</string>
     <string name="settings_item_write_error">Impossible d\'écrire dans \'%1$s\'.</string>
@@ -3708,16 +3708,16 @@
     <string name="index_item_world_basemap_detailed">Carte mondiale générale (plus détaillée)</string>
     <string name="unsupported_type_error">Type non pris en charge</string>
     <string name="gpx_parse_error">Le fichier GPX OsmAnd n\'est pas construit correctement. Vous pouvez transmettre ce fichier à l\'équipe support OsmAnd pour investiguer.</string>
-    <string name="system_screen_timeout_descr">L\'écran s\'éteindra après le délai système.</string>
+    <string name="system_screen_timeout_descr">Éteint l\'écran en fonction du délai système.</string>
-    <string name="map_source_zoom_levels_descr">Ces paramètres affecteront l\'affichage lorsqu\'ils seront utilisés comme carte ou sur-couche / sous-couche.
+    <string name="map_source_zoom_levels_descr">Affecte l\'affichage de la carte ou des sur-couche / sous-couche. 
 \n 
-\n%1$s : La carte sera limitée aux zooms sélectionnés.
+\n%1$s : La carte est limitée aux zooms sélectionnés. 
 \n 
-\n%2$s : Niveaux de zoom auxquels les tuiles originales seront visibles. En dehors de ces valeurs, il y aura une augmentation ou une diminution d\'échelle.</string>
+\n%2$s sont les niveaux de zoom auxquels les tuiles originales seront visibles. En dehors de ces valeurs, il y aura une augmentation ou une diminution d\'échelle.</string>
     <string name="turn_screen_on_navigation_instructions_descr">L\'écran s\'allumera pour afficher les instructions de navigation.</string>
     <string name="turn_screen_on_wake_time_descr">Sélectionnez la durée d\'affichage de l\'écran après allumage (\"%1$s\" signifie pas d\'extinction).</string>
-    <string name="screen_timeout_descr">Si l\'option \"%1$s\" est activée, le temps d\'activité en dépendra.</string>
+    <string name="screen_timeout_descr">Si \"%1$s\" est activé, le temps d\'activité en dépendra.</string>
-    <string name="expire_time_descr">Délai d\'expiration en minutes. Les tuiles en cache seront rechargées après ce délai. Laissez ce champ vide pour ne jamais rafraîchir les tuiles pour cette source.
+    <string name="expire_time_descr">Les tuiles en cache seront à nouveau téléchargées après ce délai (en minutes). Laissez ce champ vide pour ne jamais rafraîchir les tuiles pour cette source. 
 \n 
 \nUn jour correspond à 1440 minutes. 
 \nUne semaine correspond à 10 080 minutes. 
@@ -3743,7 +3743,7 @@
     <string name="mercator_projection">Projection de Mercator</string>
     <string name="storage_format">Format de stockage</string>
     <string name="map_source_zoom_levels">Définissez les niveaux de zoom minimum et maximum auxquels la carte en ligne sera affichée ou chargée.</string>
-    <string name="tiles_storage_descr">Sélectionnez comment les tuiles téléchargées seront stockées.</string>
+    <string name="tiles_storage_descr">Sélectionnez comment stocker les tuiles téléchargées.</string>
     <string name="default_screen_timeout">Délai par défaut de veille écran</string>
     <string name="export_import_quick_actions_with_profiles_promo">Vous pouvez exporter ou importer les actions rapides avec les profils d’application.</string>
     <string name="shared_string_delete_all_q">Tout supprimer \?</string>
@@ -3754,8 +3754,14 @@
     <string name="width_limit_description">Indiquez la largeur de votre véhicule, certaines restrictions d\'itinéraire peuvent s\'appliquer aux véhicules larges.</string>
     <string name="shared_string_tones">sonneries</string>
     <string name="shared_string_meters">mètres</string>
-    <string name="details_dialog_decr">Contrôler la visibilité des autres détails affichés sur la carte</string>
+    <string name="details_dialog_decr">Afficher ou masquer les autres détails sur la carte</string>
     <string name="shared_string_night_map">Carte nocturne</string>
     <string name="shared_string_all_time">Tout le temps</string>
     <string name="turn_screen_on_power_button_disabled">Désactivé. Nécessite l\'option « Garder l\'écran allumé » sous « Délai d\'affichage de l\'écran ».</string>
+    <string name="add_online_source">Ajouter une source en ligne</string>
+    <string name="clear_tiles_warning">Appliquer ces modifications effacera les données mises en cache pour cette source de tuiles</string>
+    <string name="vessel_height_warning_link">Définir la hauteur du navire</string>
+    <string name="vessel_height_warning">Vous pouvez définir la hauteur du navire pour éviter les ponts bas. Souvenez-vous que si le pont est mobile, nous utiliserons sa hauteur en position ouverte.</string>
+    <string name="vessel_height_limit_description">Définir la hauteur du navire afin d\'éviter les ponts bas. Souvenez-vous que si le pont est mobile, nous utiliserons sa hauteur en position ouverte.</string>
+    <string name="vessel_width_limit_description">Définir la largeur du navire pour éviter les ponts étroits</string>
 </resources>

OsmAnd/res/values-gl/phrases.xml

@@ -1736,7 +1736,7 @@
     <string name="poi_additional_atm_yes">Caixeiro automático: si</string>
     <string name="poi_atm_no">Caixeiro automático: non</string>
     <string name="poi_brushless">Sen vasoira</string>
-    <string name="poi_pharmacy_dispensing">Dispensa recetas médicas</string>
+    <string name="poi_pharmacy_dispensing">Dispensa receitas médicas</string>
     <string name="poi_scout_camp">Campamento de exploradores</string>
     <string name="poi_backcountry">Acampada libre</string>
     <string name="poi_drive_in">Conducir por dentro</string>

OsmAnd/res/values-gl/strings.xml

@@ -264,16 +264,16 @@
     <string name="about_version">Versión:</string>
     <string name="shared_string_about">Sobre</string>
     <string name="about_settings_descr">Información sobre a versión, licenzas, participantes no proxecto</string>
-    <string name="local_index_tile_data_zooms">Achegamentos baixados: %1$s</string>
+    <string name="local_index_tile_data_zooms">Niveis de achegamento baixados: %1$s</string>
-    <string name="local_index_tile_data_expire">Caducidade (minutos): %1$s</string>
+    <string name="local_index_tile_data_expire">Tempo de caducidade (minutos): %1$s</string>
     <string name="local_index_tile_data_downloadable">Baixábel: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Achegamento máximo: %1$s</string>
     <string name="local_index_tile_data_minzoom">Achegamento mínimo: %1$s</string>
     <string name="local_index_tile_data_name">Datos das teselas: %1$s</string>
-    <string name="edit_tilesource_successfully">A fonte das teselas \"%1$s\" foi gardada</string>
+    <string name="edit_tilesource_successfully">Fonte das teselas %1$s gardada</string>
-    <string name="edit_tilesource_elliptic_tile">Mercator elíptico</string>
+    <string name="edit_tilesource_elliptic_tile">Proxección do Mercator elíptico</string>
     <string name="edit_tilesource_maxzoom">Achegamento máximo</string>
-    <string name="edit_tilesource_expiration_time">Caducidade (minutos)</string>
+    <string name="edit_tilesource_expiration_time">Tempo de caducidade (minutos)</string>
     <string name="edit_tilesource_minzoom">Achegamento mínimo</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Escoller existente…</string>
@@ -3594,7 +3594,7 @@ Lon %2$s</string>
     <string name="saving_new_profile">Gardando novo perfil</string>
     <string name="profile_backup_failed">Non foi posíbel facer unha copia de seguranza do perfil.</string>
     <string name="developer_plugin">Plugin do desenvolvedor</string>
-    <string name="replace_point_descr">Substitúe outro punto por este</string>
+    <string name="replace_point_descr">Substitúe outro punto por este.</string>
     <string name="app_mode_ski_touring">Esquí de ruta</string>
     <string name="app_mode_ski_snowmobile">Moto de neve</string>
     <string name="custom_osmand_plugin">Plugin personalizado do OsmAnd</string>
@@ -3611,7 +3611,7 @@ Lon %2$s</string>
     <string name="main_actions_descr">Só ten catro botóns.</string>
     <string name="main_actions">Accións principais</string>
     <string name="move_inside_category">Só podes mover obxectos dentro desta categoría.</string>
-    <string name="select_wikipedia_article_langs">Escolle as linguas nas que os artigos da Wikipedia aparecerán no mapa. Podes trocar entre todos as linguas dispoñíbeis en canto leas o artigo.</string>
+    <string name="select_wikipedia_article_langs">Escolle as linguas para os artigos da Wikipedia no mapa. Muda a calquera lingua dispoñíbel mentres les o artigo.</string>
     <string name="some_articles_may_not_available_in_lang">Algúns artigos da Wikipedia poden non estar dispoñíbeis na túa lingua.</string>
     <string name="lang_zhyue">Cantonés</string>
     <string name="lang_zhminnan">Min do sur</string>
@@ -3761,7 +3761,7 @@ Lon %2$s</string>
     <string name="pseudo_mercator_projection">Proxección pseudo-Mercator</string>
     <string name="sqlite_db_file">Ficheiro SQLiteDB</string>
     <string name="shared_string_always">Sempre</string>
-    <string name="system_screen_timeout_descr">Apaga a apantalla após o tempo de espera da pantalla do sistema.</string>
+    <string name="system_screen_timeout_descr">Apaga a apantalla segundo o tempo de espera da pantalla do sistema.</string>
     <string name="turn_screen_on_options_descr">Opcións de acendido da pantalla:</string>
     <string name="turn_screen_on_navigation_instructions_descr">A pantalla acenderase de xeito automático uns segundos antes das instrucións de navegación durante un tempo específico na opción \"Tempo de activación\".
 \n
@@ -3769,7 +3769,7 @@ Lon %2$s</string>
     <string name="turn_screen_on_power_button_descr">Premendo o botón de acendido do dispositivo acenderá a pantalla co OsmAnd na pantalla de bloqueo.</string>
     <string name="turn_screen_on_proximity_sensor">Sensor de proximidade</string>
     <string name="keep_screen_on">Manter a pantalla acendida</string>
-    <string name="screen_timeout_descr">Se a opción \"%1$s\" está activada, o tempo de actividade dependerá diso.</string>
+    <string name="screen_timeout_descr">Se \"%1$s\" está activado, o tempo de actividade dependerá diso.</string>
     <string name="one_image_per_tile">Un ficheiro de imaxe por tesela</string>
     <string name="online_map_name_helper_text">Fornece un nome para a fonte do mapa en liña.</string>
     <string name="online_map_url_helper_text">Insire ou pega a URL da fonte en liña.</string>
@@ -3777,20 +3777,20 @@ Lon %2$s</string>
     <string name="expire_time">Tempo de caducidade</string>
     <string name="mercator_projection">Proxección do Mercator</string>
     <string name="storage_format">Formato de almacenamento</string>
-    <string name="map_source_zoom_levels">Estabelece o nivel de achegamento mínimo e máximo no que se amosará ou cargará o mapa en liña.</string>
+    <string name="map_source_zoom_levels">Estabelece un nivel de achegamento mínimo e máximo para amosar ou cargar o mapa en liña.</string>
-    <string name="map_source_zoom_levels_descr">Estes parámetros afectarán á pantalla cando sexan empregados como mapa normal ou mapa sobreposto/subcapa.
+    <string name="map_source_zoom_levels_descr">Afecta a pantalla cando é empregado coma mapa ou sobreposición/subcapa.
 \n
-\n%1$s: O mapa estará limitado ós achegamentos escollidos.
+\n%1$s: o mapa está limitado ó nivel de achegamento escollido.
 \n
-\n%2$s: Niveis de achegamento nos que as teselas orixinais serán visíbeis. O aumento o a reducción de escala ocurrirán fóra destes valores.</string>
+\n%2$s son os niveis nos que as teselas orixinais serán visíbeis, a escala ascendente ou descendente ocurrirá fóra destes valores.</string>
-    <string name="expire_time_descr">Tempo de caducidade en minutos. As teselas na caché volveranse a cargar após o tempo especificado. Deixa este campo baleiro para nunca actualizar as teselas desta fonte.
+    <string name="expire_time_descr">As teselas na caché volveranse a baixar após o número de minutos especificado. Deixa este campo baleiro para nunca actualizar as teselas desta fonte. 
 \n 
 \n Un día son 1440 minutos. 
 \n Unha semana son 10080 minutos. 
 \n Un mes son 43829 minutos.</string>
-    <string name="tiles_storage_descr">Escolle de que xeito serán almacenadas as teselas baixadas.</string>
+    <string name="tiles_storage_descr">Escoller de que xeito almacenar as teselas baixadas.</string>
     <string name="default_screen_timeout">Tempo de espera da pantalla por defecto</string>
-    <string name="export_import_quick_actions_with_profiles_promo">Podes exportar ou importar accións rápidas con perfís de aplicación.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Podes exportar ou importar accións rápidas cos perfís de aplicación.</string>
     <string name="shared_string_delete_all_q">Eliminar todo\?</string>
     <string name="delete_all_actions_message_q">Eliminar de xeito irrevogábel %d accións rápidas\?</string>
     <string name="screen_timeout">Tempo de espera da pantalla</string>
@@ -3799,7 +3799,14 @@ Lon %2$s</string>
     <string name="width_limit_description">Fornece a largura do teu vehículo. Algunhas restricións de ruta poden ser aplicadas a vehículos largos.</string>
     <string name="shared_string_tones">tons</string>
     <string name="shared_string_meters">metros</string>
-    <string name="details_dialog_decr">Controlar a visibilidade dos detalles adicionais amosados no mapa</string>
+    <string name="details_dialog_decr">Amosar ou agochar detalles adicionais do mapa</string>
     <string name="shared_string_night_map">Mapa de noite</string>
     <string name="shared_string_all_time">Todo o tempo</string>
+    <string name="turn_screen_on_power_button_disabled">Desactivado. Require \'manter a pantalla acendida\' en \'tempo de espera após o acendido\'.</string>
+    <string name="add_online_source">Engadir fonte en liña</string>
+    <string name="clear_tiles_warning">Aplicando estas modificacións eliminarás os datos almacenados na caché para esta fonte de teselas</string>
+    <string name="vessel_height_warning_link">Definir altura da embarcación</string>
+    <string name="vessel_height_warning">Podes definir a altura da embarcación para evitar pontes baixas. Lémbrate se a ponte é móbil, empregaremos a súa altura no estado aberto.</string>
+    <string name="vessel_height_limit_description">Define o alto da embarcación para evitar pontes baixas. Lémbrate se a ponte é móbil, empregaremos a súa altura no estado aberto.</string>
+    <string name="vessel_width_limit_description">Estabelecer o largo da embarcación para evitar pontes estreitas</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -1583,7 +1583,7 @@
     <string name="about_version">גרסה:</string>
     <string name="shared_string_about">על אודות</string>
     <string name="edit_tilesource_maxzoom">תקריב מרבי</string>
-    <string name="edit_tilesource_expiration_time">תפוגה (דקות)</string>
+    <string name="edit_tilesource_expiration_time">זמן תפוגה (דקות)</string>
     <string name="edit_tilesource_minzoom">תקריב מזערי</string>
     <string name="edit_tilesource_url_to_load">כתובת</string>
     <string name="edit_tilesource_choose_existing">בחירה בקיים…</string>
@@ -2275,7 +2275,7 @@
     <string name="map_magnifier">מגדיל מפה</string>
     <string name="about_settings_descr">פרטי גרסה, רשיונות, חברי המיזם</string>
     <string name="local_index_tile_data_zooms">רמות תקריב שהתקבלו: %1$s</string>
-    <string name="local_index_tile_data_expire">תפוגה (דקות): %1$s</string>
+    <string name="local_index_tile_data_expire">זמן תפוגה (דקות): %1$s</string>
     <string name="local_index_tile_data_downloadable">ניתן להורדה: %1$s</string>
     <string name="local_index_tile_data_maxzoom">תקריב מרבי: %1$s</string>
     <string name="local_index_tile_data_minzoom">תקריב מזערי: %1$s</string>
@@ -2777,7 +2777,7 @@
     <string name="read_wikipedia_offline_description">עליך לערוך מינוי ל־OsmAnd חי כדי לקרוא ערכים מוויקיפדיה ומוויקימסע ללא חיבור לאינטרנט.</string>
     <string name="how_to_open_link">כיצד לפתוח את הקישור?</string>
     <string name="read_wikipedia_offline">קריאת ויקיפדיה ללא חיבור לאינטרנט</string>
-    <string name="edit_tilesource_elliptic_tile">היטל כדורי</string>
+    <string name="edit_tilesource_elliptic_tile">היטל מרקטור כדורי</string>
     <string name="hide_full_description">הסתרת התיאור המלא</string>
     <string name="show_full_description">הצגת התיאור המלא</string>
     <string name="nautical_render_descr">לניווט ימי. לרבות מצופים, מגדלורים, מסלולי נהרות, סימונים ומסלולים לניווט בים, מעגנים, שירותי סימונים ימיים וקווי מתאר לתיאור עומק.</string>
@@ -3599,7 +3599,7 @@
     <string name="reset_plugin_to_default">איפוס הגדרות התוסף לבררת המחדל</string>
     <string name="live_monitoring_tracking_interval">מרווח מעקב</string>
     <string name="monitoring_min_distance_descr">מסנן זה מונע תיעוד כפילות של נקודות כשלא הייתה מספיק תנועה, יוצר תצוגה מרחבית נאה יותר של מסלולים שלא עוברים עיבוד לאחר מכן.</string>
-    <string name="replace_point_descr">החלפת נקודה אחרת בזו</string>
+    <string name="replace_point_descr">החלפת נקודה אחרת בזו.</string>
     <string name="changes_applied_to_profile">השינויים לפרופיל ‚%1$s’ חלו.</string>
     <string name="settings_item_read_error">לא ניתן לקרוא מתוך ‚%1$s’.</string>
     <string name="settings_item_write_error">לא ניתן לכתוב אל ‚%1$s’.</string>
@@ -3638,7 +3638,7 @@
     <string name="main_actions_descr">מכילות 4 כפתורים בלבד.</string>
     <string name="main_actions">פעולות ראשית</string>
     <string name="move_inside_category">ניתן להעביר פריטים בתוך קטגוריה זו בלבד.</string>
-    <string name="select_wikipedia_article_langs">נא לבחור את השפות בהן יופיעו ערכים של ויקיפדיה במפה. ניתן להחליף בין כל השפות הזמינות בזמן קריאת הערך.</string>
+    <string name="select_wikipedia_article_langs">נא לבחור את השפות לערכים של ויקיפדיה במפה. ניתן להחליף לכל אחת מהשפות הזמינות בזמן קריאת הערך.</string>
     <string name="some_articles_may_not_available_in_lang">יתכן שחלק מהערכים בוויקיפדיה לא יהיו זמינים בשפה שלך.</string>
     <string name="lang_zhyue">קנטונזית</string>
     <string name="lang_zhminnan">מין נאן</string>
@@ -3742,22 +3742,22 @@
     <string name="expire_time">זמן תפוגה</string>
     <string name="mercator_projection">היטל מרקטור</string>
     <string name="storage_format">תצורת שמירה</string>
-    <string name="map_source_zoom_levels">יש להגדיר את רמת התקריב המזערית והמרבית שבהן המפה המקוונת תוצג או תיטען.</string>
+    <string name="map_source_zoom_levels">יש להגדיר רמת תקריב מזערית ומרבית להצגה או טעינה של המפה המקוונת.</string>
-    <string name="map_source_zoom_levels_descr">המשתנים האלו ישפיעו על התצוגה כאשר נעשה בהם שימוש כמפה או כשכבה עליונה/תחתונה.
+    <string name="map_source_zoom_levels_descr">משפיע על המסך בעת שימוש כמפה או שכבת על/תחתונה.
 \n 
-\n%1$s: המפה תוגבל לרמות התקריב הנבחרות. 
+\n%1$s: המפה מוגבלת לטווח רמות התקריב הנבחר. 
 \n 
-\n%2$s: רמות תקריב שבהן האריחים המקוריים יהיו גלויים. הגדלה או הקטנה ייתרחשו מחוץ לערכים האלו.</string>
+\n%2$s הן רמות שבהן האריחים המקוריים יהיו גלויים. הגדלה או הקטנה ייתרחשו מחוץ לערכים האלו.</string>
-    <string name="expire_time_descr">זמן התפוגה בדקות. אריחים שנשמרו במטמון ייטענו מחדש לאחר זמן מסוים. יש להשאיר את השדה הזה ריק כדי לא לרענן את האריחים ממקור זה. 
+    <string name="expire_time_descr">אריחים ייטענו מחדש לאחר כמות דקות מסוימת. יש להשאיר את השדה הזה ריק כדי לא לרענן את האריחים ממקור זה. 
 \n 
 \nיום מלא הוא 1440 דקות. 
 \nשבוע מלא הוא 10,080 דקות. 
 \nחודש מלא הוא 43,829 דקות.</string>
-    <string name="tiles_storage_descr">נא לבחור כיצד אריחים שהתקבלו יאוחסנו.</string>
+    <string name="tiles_storage_descr">נא לבחור כיצד לאחסן אריחים שהתקבלו.</string>
     <string name="pseudo_mercator_projection">היטל דמוי מרקטור</string>
     <string name="shared_string_always">תמיד</string>
     <string name="screen_control">בקרת מסך</string>
-    <string name="system_screen_timeout_descr">לכבות את המסך לאחר תפוגת שומר המסך של המערכת.</string>
+    <string name="system_screen_timeout_descr">לכבות את המסך בהתאם לתפוגת שומר המסך של המערכת.</string>
     <string name="system_screen_timeout">להשתמש בתפוגת שומר המסך של המערכת</string>
     <string name="turn_screen_on_options_descr">אפשרות יקיצת מסך:</string>
     <string name="turn_screen_on_descr">נא לבחור את אפשרויות יקיצת המסך (נא לוודא ש־OsmAnd בחזית כאשר המכשיר ננעל):</string>
@@ -3769,7 +3769,7 @@
     <string name="turn_screen_on_wake_time_descr">לבחור את זמן תפוגת שומר המסך של המערכת לאחר ההתעוררות. („%1$s” - ללא זמן תפוגה.)</string>
     <string name="keep_screen_on">להשאיר את המסך פעיל</string>
     <string name="keep_screen_off">להשאיר את המסך כבוי</string>
-    <string name="screen_timeout_descr">אם האפשרות „%1$s” פעילה, זמן הפעילות יהיה תלוי בה.</string>
+    <string name="screen_timeout_descr">אם „%1$s” פעילה, זמן הפעילות יהיה תלוי בה.</string>
     <string name="default_screen_timeout">ברירת מחדל של תפוגת שומר המסך</string>
     <string name="export_import_quick_actions_with_profiles_promo">ניתן לייצא או לייבא פעולות מהירות עם פרופילי יישומון.</string>
     <string name="shared_string_delete_all_q">למחוק הכול\?</string>
@@ -3780,8 +3780,14 @@
     <string name="weight_limit_description">נא לציין את משקל כלי הרכב שלך, יתכן שחלות מגבלות מעבר על כלי רכב כבדים.</string>
     <string name="shared_string_tones">גוונים</string>
     <string name="shared_string_meters">מטרים</string>
-    <string name="details_dialog_decr">שליטה בהופעה של פירוט נוסף על המפה</string>
+    <string name="details_dialog_decr">הצגה או הסתרה של פירוט נוסף על המפה</string>
     <string name="shared_string_night_map">מפת לילה</string>
     <string name="shared_string_all_time">כל הזמן</string>
     <string name="turn_screen_on_power_button_disabled">מושבת. נדרשת ההגדרה ‚להשאיר את המסך פעיל’ תחת ‚תפוגת זמן לאחר התעוררות’.</string>
+    <string name="add_online_source">הוספת מקור מקוון</string>
+    <string name="clear_tiles_warning">החלת השינויים האלו תפנה את הנתונים שנשמרו עבור מקור אריחים זה</string>
+    <string name="vessel_height_warning_link">הגדרת גובה כלי השיט</string>
+    <string name="vessel_height_warning">ניתן להגדיר את גובה כלי השיט כדי להימנע מגשרים נמוכים. נא לשים לב שאם הגשר נע, אנו נשתמש בגובהו במצב הפתוח.</string>
+    <string name="vessel_height_limit_description">יש להגדיר את גובה כלי השיט כדי להימנע מגשרים נמוכים. נא לשים לב שאם הגשר נע, אנו נשתמש בגובהו במצב הפתוח.</string>
+    <string name="vessel_width_limit_description">הגדרת רוחב כלי השיט כדי להימנע מגשרים צרים</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -187,7 +187,7 @@
     <string name="local_index_items_deleted">%2$d elemből %1$d törölve.</string>
     <string name="local_index_items_restored">%2$d elemből %1$d aktiválva.</string>
     <string name="local_index_no_items_to_do">Nincs elem ehhez: %1$s</string>
-    <string name="local_index_action_do">%1$s: %2$s elem. Folytatja\?</string>
+    <string name="local_index_action_do">%2$s elem %1$sére készül. Folytatja\?</string>
     <string name="local_index_descr_title">Térképfájlok kezelése.</string>
     <string name="local_index_mi_restore">Aktiválás</string>
     <string name="local_index_mi_backup">Inaktiválás</string>
@@ -1488,7 +1488,7 @@ Hosszúság: %2$s</string>
     <string name="days_behind">napos</string>
     <string name="welmode_download_maps">Térképek letöltése</string>
     <string name="confirm_usage_speed_cameras">Néhány országban (Németország, Franciaország, Olaszország és még néhány) tilos a traffipax figyelmeztetés használata! Az OsmAnd nem vállal felelősséget a szabályok megsértéséért. Koppints az Igen gombra, ha jogosult vagy a funkció használatára.</string>
-    <string name="welcome_select_region">A jelzőtáblák és szabályok helyes értelmezéséhez jelöld ki a vezetési régiódat:</string>
+    <string name="welcome_select_region">A jelzőtáblák és szabályok helyes értelmezéséhez jelölje ki a vezetési régiót:</string>
     <string name="welcome_text">Az OsmAnd lehetővé teszi a térképek és a navigáció offline használatát az egész világon.</string>
     <string name="current_route">Jelenlegi útvonal</string>
     <string name="local_osm_changes_upload_all_confirm">Biztosan fel kíván tölteni %1$d módosítást az OSM-re\?</string>
@@ -1713,7 +1713,7 @@ Hosszúság: %2$s</string>
     <string name="update_all">Összes frissítése (%1$s MB)</string>
     <string name="free_downloads_used">Elhasznált ingyenes letöltés</string>
     <string name="free_downloads_used_description">Megjeleníti a maradék ingyenes letöltéseket.</string>
-    <string name="simulate_initial_startup_descr">Az első indítást jelző flag beállítása, a többi beállítás változatlan marad.</string>
+    <string name="simulate_initial_startup_descr">Az első indítást jelző címke beállítása, a többi beállítás változatlan marad.</string>
     <string name="simulate_initial_startup">Alkalmazás első indításának szimulálása</string>
     <string name="share_geo">geo:</string>
     <string name="share_menu_location">Pozíció megosztása</string>
@@ -1816,7 +1816,7 @@ Hosszúság: %2$s</string>
     <string name="live_updates">Élő frissítések</string>
     <string name="available_maps">Elérhető térképek</string>
     <string name="select_voice_provider">Hangutasítás kijelölése</string>
-    <string name="select_voice_provider_descr">Jelöld ki vagy töltsd le a nyelvednek megfelelő hangutasítást.</string>
+    <string name="select_voice_provider_descr">Jelölje ki vagy töltse le a nyelvének megfelelő hangutasítást.</string>
     <string name="impassable_road_desc">A navigáció során elkerülendő utak kijelölése.</string>
     <string name="shared_string_sound">Hang</string>
     <string name="no_location_permission">Helyadatok használatának engedélyezése.</string>
@@ -2340,12 +2340,12 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="wrong_user_name">Hibás felhasználónév</string>
     <string name="shared_string_to">Eddig:</string>
     <string name="mapillary_menu_date_from">Ettől:</string>
-    <string name="mapillary_menu_descr_dates">Csak a hozzáadott képek megtekintése</string>
+    <string name="mapillary_menu_descr_dates">Csak az ekkor hozzáadott képek megtekintése:</string>
     <string name="mapillary_menu_title_dates">Dátum</string>
     <string name="mapillary_menu_edit_text_hint">Felhasználónév megadása</string>
     <string name="mapillary_menu_descr_username">Csak az általa hozzáadott képek megtekintése:</string>
     <string name="mapillary_menu_title_username">Felhasználónév</string>
-    <string name="mapillary_menu_filter_description">A képek szűrése feltöltő, dátum vagy típus szerint. Csak erős nagyításnál használhatók.</string>
+    <string name="mapillary_menu_filter_description">A képek szűrése feltöltő, dátum vagy típus szerint. Csak magas nagyítási szinteknél lépnek érvénybe.</string>
     <string name="map_widget_ruler_control">Sugaras vonalzó</string>
     <string name="average">Átlag</string>
     <string name="of">%1$d / %2$d</string>
@@ -3130,7 +3130,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="analytics_pref_title">Analitika</string>
     <string name="turn_screen_on_info">Navigáció közben a térkép megjelenítése a lezárási képernyőn.</string>
     <string name="route_parameters_info">Útvonaltervezési beállítások erre a profilra: %1$s.</string>
-    <string name="wake_time">Felébresztési idő</string>
+    <string name="wake_time">Időtúllépés felébresztés után</string>
     <string name="units_and_formats">Mértékegységek &amp; formátumok</string>
     <string name="appearance">Megjelenés</string>
     <string name="map_look_descr">Térkép megjelenés</string>
@@ -3333,7 +3333,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="profile_appearance">Profil megjelenése</string>
     <string name="choose_icon_color_name">Ikon, szín és név</string>
     <string name="reorder_profiles">Profilok listájának szerkesztése</string>
-    <string name="selected_profile">Kijelölt profil</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_first_part">%1$s az első %2$s</string>
@@ -3511,7 +3511,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="shared_string_import_complete">Importálás kész</string>
     <string name="items_added">Tételek hozzáadva</string>
     <string name="recalculate_route_in_deviation">Útvonal újraszámítása letérés esetén</string>
-    <string name="select_distance_route_will_recalc">Jelöld ki a távolságot, amely fölött az útvonal újraszámításra kerül.</string>
+    <string name="select_distance_route_will_recalc">Jelölje ki a távolságot, amely fölött az útvonal újraszámításra kerül.</string>
     <string name="recalculate_route_distance_promo">Az útvonal újraszámításra kerül, amennyiben az útvonal és a jelenlegi helyzet közötti távolság nagyobb, mint a kiválasztott érték.</string>
     <string name="n_items_of_z">%1$s a %2$s-ból</string>
     <string name="download_slope_maps">Lejtők</string>
@@ -3655,12 +3655,10 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
 \n%2$s: Ezen nagyítási szintek között az eredeti csempék jelennek meg, ezeken kívül pedig felskálázásra vagy leskálázásra kerülnek.</string>
     <string name="shared_string_always">Mindig</string>
     <string name="screen_control">Kijelző beállításai</string>
-    <string name="system_screen_timeout">Kijelző időtúllépés</string>
+    <string name="system_screen_timeout">Kijelző időtűllépés rendszerbeállítás használata</string>
     <string name="turn_screen_on_options_descr">Ezekkel a beállításokkal az OsmAnddal az előtérben ébresztheti fel a kijelzőt.</string>
     <string name="turn_screen_on_descr">Ezek a beállítások csak akkor működnek, ha az eszköz az OsmAnddal az előtérben kerül lezárásra.</string>
-    <string name="turn_screen_on_navigation_instructions_descr">A kijelző automatikusan bekapcsol néhány másodperccel a navigációs utasítás előtt a \"Felébresztési idő\" opcióban megadott időtartamra.
+    <string name="turn_screen_on_navigation_instructions_descr">Valamennyi navigációs utasítás előtt a kijelző bekapcsolásra kerül.</string>
-\n
-\nKizárólag navigáció közben működik.</string>
     <string name="turn_screen_on_navigation_instructions">Navigációs utasítások</string>
     <string name="turn_screen_on_power_button_descr">A feloldógomb megnyomásakor a kijelző az OsmAnddal az előtérben fog megjelenni.</string>
     <string name="turn_screen_on_power_button">Lezárógomb</string>
@@ -3683,4 +3681,27 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
 \nEgy hét 10 080 perc.
 \nEgy hónap 43 829 perc.</string>
     <string name="tiles_storage_descr">Válassza ki a letöltött csempék tárolási módját.</string>
+    <string name="width_limit_description">Adja meg a járműve szélességét, a széles járművekre útvonalkorlátozások lehetnek érvényben.</string>
+    <string name="height_limit_description">Adja meg a járműve magasságát, a magas járművekre útvonalkorlátozások lehetnek érvényben.</string>
+    <string name="weight_limit_description">Adja meg a járműve tömegét, a nehéz járművekre útvonalkorlátozások lehetnek érvényben.</string>
+    <string name="gpx_parse_error">Az OsmAnd GPX formázása helytelen, további vizsgálatért kérem, lépjen kapcsolatba a támogató csapattal.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Az alkalmazásprofilokkal exportálhat és importálhat gyorsműveleteket.</string>
+    <string name="shared_string_delete_all_q">Összes törlése\?</string>
+    <string name="delete_all_actions_message_q">Biztosan véglegesen törölni szeretne %d gyorsműveletet\?</string>
+    <string name="shared_string_tones">tonna</string>
+    <string name="shared_string_meters">méter</string>
+    <string name="details_dialog_decr">További térképrészletek megjelenítése vagy elrejtése</string>
+    <string name="shared_string_night_map">Éjszakai térkép</string>
+    <string name="add_online_source">Online forrás hozzáadása</string>
+    <string name="system_screen_timeout_descr">Kikapcsolja a kijelzőt a rendszer kijelző időtúllépés beállításának megfelelően.</string>
+    <string name="turn_screen_on_wake_time_descr">Adja meg a felébresztés utáni kijelző időtúllépést. (\"%1$s\" esetén nincs időtúllépés.)</string>
+    <string name="screen_timeout">Kijelző időtúllépés</string>
+    <string name="screen_timeout_descr">Amenniben a \"%1$s\" engedélyezve van, az aktivitásidő attól fog függeni.</string>
+    <string name="default_screen_timeout">Alapértelmezett kijelző időtúllépés</string>
+    <string name="turn_screen_on_power_button_disabled">Letiltva. Használatához szükséges a \'Kijelző maradjon bekapcsolva\' beállítás az \'Időtúllépés felébresztés után\' menüpont alatt.</string>
+    <string name="clear_tiles_warning">A módosítások alkalmazása esetén a csempeforrás gyorsítótárazott adatai törlésre kerülnek</string>
+    <string name="vessel_height_warning_link">Hajómagasság megadása</string>
+    <string name="vessel_height_limit_description">Adja meg a hajómagasságot az alacsony hidak elkerüléséhez. Ne feledje, amennyiben a híd mozdítható, a nyitott állapotú magasságát vesszük figyelembe.</string>
+    <string name="vessel_height_warning">Megadhatja a hajómagasságot az alacsony hidak elkerüléséhez. Ne feledje, amennyiben a híd mozdítható, a nyitott állapotú magasságát vesszük figyelembe.</string>
+    <string name="vessel_width_limit_description">Adja meg a hajószélességet a keskeny hidak elkerüléséhez</string>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -1608,7 +1608,7 @@
     <string name="amenity_type_seamark">Sjómerki</string>
     <string name="animate_routing_route_not_calculated">Reikna leiðina fyrst</string>
     <string name="local_index_tile_data_name">Kortaflísagögn: %1$s</string>
-    <string name="edit_tilesource_elliptic_tile">Sporöskjulagað Mercator</string>
+    <string name="edit_tilesource_elliptic_tile">Sporöskjulöguð Mercator</string>
     <string name="speak_traffic_warnings">Aðvaranir vegna umferðar</string>
     <string name="osb_author_or_password_not_specified">Settu OSM-notandanafn og lykilorð inn í stillingarnar</string>
     <string name="context_menu_item_directions_to">Leiðir til</string>
@@ -2035,7 +2035,7 @@
 \n • Norður-Ameríka: *** 
 \n • Suður-Ameríka: ** 
 \n • Asía: ** 
-\n • Japan &amp; Kórea: ***
+\n • Japan og Kórea: *** 
 \n • Miðausturlönd: ** 
 \n • Afríka: ** 
 \n • Suðurskautslandið: * 
@@ -2347,8 +2347,8 @@
 \n • Miðausturlönd: ** 
 \n • Afríka: ** 
 \n • Antarktíka: * 
-\n Flest lönd í heiminum eru tiltæk sem niðurhalspakkar! 
+\n Flest lönd í heiminum eru tiltæk sem niðurhalspakkar
-\n Frá Afghanistan til Simbabve, frá Ástralíu til BNA. Argentína, Brasilía, Kanada, Frakkland, Þýskaland, Mexíkó, UK, Spánn, …
+\n Frá Afghanistan til Simbabve, frá Ástralíu til BNA. Argentína, Brasilía, Kanada, Frakkland, Þýskaland, Mexíkó, Bretland, Spánn, … 
 \n</string>
     <string name="rendering_attr_contourLines_description">Birta frá aðdráttarstigi (krefst hæðarlínugagna):</string>
     <string name="live_monitoring_max_interval_to_send">Tímabiðminni fyrir rakningu með netstuðningi</string>
@@ -3617,7 +3617,7 @@
     <string name="shared_string_circle">Hringur</string>
     <string name="shared_string_rhomb">Tígull</string>
     <string name="shared_string_square">Ferningur</string>
-    <string name="replace_point_descr">Skipta út öðrum punkti með þessum</string>
+    <string name="replace_point_descr">Skipta út öðrum punkti með þessum.</string>
     <string name="changes_applied_to_profile">Breytingum beitt á \'%1$s\' sniðið.</string>
     <string name="settings_item_read_error">Gat ekki lesið úr \'%1$s\'.</string>
     <string name="settings_item_write_error">Gat ekki skrifað \'%1$s\'.</string>
@@ -3724,7 +3724,7 @@
     <string name="unsupported_type_error">Óstudd tegund</string>
     <string name="turn_screen_on_navigation_instructions">Leiðsagnarleiðbeiningar</string>
     <string name="favorites_item">Eftirlæti</string>
-    <string name="screen_timeout_descr">Ef \"%1$s\" valkosturinn er virkur, mun tími virkni vera háður honum.</string>
+    <string name="screen_timeout_descr">Ef \"%1$s\" er virkt, mun tími virkni vera háður því.</string>
     <string name="navigation_profiles_item">Leiðsagnarsnið</string>
     <string name="shared_string_resume">Halda áfram</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
@@ -3740,19 +3740,40 @@
     <string name="online_map_name_helper_text">Settu inn nafn á nettengdum kortagjafa.</string>
     <string name="measure_distance_item">Mæla vegalengd</string>
     <string name="pseudo_mercator_projection">Gervi-Mercatorvörpun</string>
-    <string name="expire_time_descr">Gildistími í mínútum. Kortaflísar í skyndiminni verða endurlesnar eftir tiltekinn tíma. Skildu þennan reit eftir auðan ef þú þarft ekki að láta endurlesa kortaflísar frá þessum kortagjafa.
+    <string name="expire_time_descr">Kortaflísar í skyndiminni verða endurlesnar eftir tiltekinn tíma. Skildu þennan reit eftir auðan ef þú þarft ekki að láta endurlesa kortaflísar frá þessum kortagjafa. 
 \n 
 \nEinn dagur er 1.440 mínútur. 
 \nEin vika er 10.080 mínútur. 
-\nEinn mánuður er 43 829 mínútur.</string>
+\nEinn mánuður er 43.829 mínútur.</string>
     <string name="back_to_editing">Til baka í breytingar</string>
-    <string name="system_screen_timeout_descr">Slekkur á skjánum eftir að tímamörkum kerfis fyrir skjá er náð.</string>
+    <string name="system_screen_timeout_descr">Slekkur á skjánum miðað við tímamörk kerfisins.</string>
     <string name="delete_all_actions_message_q">Ertu viss um að þú viljir eyða %d flýtiaðgerðum\?</string>
     <string name="quick_action_switch_profile_descr">Ef ýtt er á þennan aðgerðahnapp verður skipt á milli valinna notkunarsniða.</string>
     <string name="shared_string_delete_all_q">Eyða öllu\?</string>
     <string name="screen_timeout">Tímamörk skjás</string>
     <string name="shared_string_tones">tónar</string>
     <string name="shared_string_meters">metrar</string>
-    <string name="details_dialog_decr">Stýra sýnileika viðbótaratriða sem birtast á kortinu</string>
+    <string name="details_dialog_decr">Birta eða fela viðbótaratriði á kortinu</string>
     <string name="shared_string_night_map">Næturkort</string>
+    <string name="map_source_zoom_levels_descr">Hefur áhrif á skjáinn þegar er notað sem kort eða yfirlag/undirlag. 
+\n
+\n%1$s: Kortið takmarkast við svið valinna aðdráttarstiga. 
+\n
+\n%2$s eru þau aðdráttarstig þar sem upprunalegir kortatíglar eru sýnilegir, kvörðun upp/niður mun eiga sér stað utan þessara gilda.</string>
+    <string name="add_online_source">Bæta við gagnagjafa á netinu</string>
+    <string name="turn_screen_on_descr">Veldu hvernig skjárinn er vakinn úr dvala (gakktu úr skugga um að OsmAnd sé í forgrunni þegar tækinu er læst):</string>
+    <string name="vessel_height_limit_description">Settu hæð skips til að geta forðast lágar brýr. Hafðu í huga að ef um hreyfanlega brú er að ræða, þá er miðað við hæð í opinni stöðu.</string>
+    <string name="vessel_height_warning">Þú getur stillt hæð skips til að geta forðast lágar brýr. Hafðu í huga að ef um hreyfanlega brú er að ræða, þá er miðað við hæð í opinni stöðu.</string>
+    <string name="vessel_width_limit_description">Settu breidd skips til að geta forðast þröngar brýr</string>
+    <string name="clear_tiles_warning">Séu þessar breytingar virkjaðar mun það hreinsa skyndiminnið fyrir þennan kortatíglagjafa</string>
+    <string name="weight_limit_description">Settu inn þyngd farartækisins, takmarkanir geta verið á sumum leiðum varðandi þyngd farartækja.</string>
+    <string name="turn_screen_on_wake_time_descr">Veldu tímamörk skjás eftir vöknun. (\"%1$s\" setur engin tímamörk.)</string>
+    <string name="turn_screen_on_power_button_disabled">Óvirkt. Krefst þess að valið sé \'Halda skjá í gangi\' undir \'Tímamörk eftir vöknun\'.</string>
+    <string name="vessel_height_warning_link">Settu hæð skips</string>
+    <string name="height_limit_description">Settu inn hæð farartækisins, takmarkanir geta verið á sumum leiðum varðandi hæð farartækja.</string>
+    <string name="width_limit_description">Settu inn breidd farartækisins, takmarkanir geta verið á sumum leiðum varðandi breidd farartækja.</string>
+    <string name="map_source_zoom_levels">Stilltu lágmarks og hámarks aðdráttarstig þess að nettengt kort verður birt eða hlaðið inn.</string>
+    <string name="gpx_parse_error">GPX-ferill OsmAnd er gallaður, hafðu samband við aðstoðarteymið til að fá botn í þetta.</string>
+    <string name="turn_screen_on_power_button_descr">Ef ýtt er á aflhappinn verður kveikt á skjánum með OsmAnd ofan á læsiskjánum.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Þú getur flutt flýtiaðgerðir inn eða út með forritasniðum.</string>
 </resources>

OsmAnd/res/values-it/phrases.xml

@@ -263,7 +263,7 @@
     <string name="poi_tattoo">Tatuatore</string>
     <string name="poi_massage">Centro massaggi</string>
     <string name="poi_hairdresser">Parrucchiere</string>
-    <string name="poi_beauty_salon_nails">"Manicure "</string>
+    <string name="poi_beauty_salon_nails">Manicure</string>
     <string name="poi_beauty">Salone di bellezza</string>
     <string name="poi_craft_window_construction">Costruzione finestre</string>
     <string name="poi_craft_watchmaker">Costruttore orologi</string>
@@ -404,7 +404,7 @@
     <string name="poi_club_fan">Fan club</string>
     <string name="poi_club_fishing">Club di pesca</string>
     <string name="poi_club_veterans">Club di veterani</string>
-    <string name="poi_club_linux">"Club Linux "</string>
+    <string name="poi_club_linux">Club Linux</string>
     <string name="poi_club_theatre">Associazione teatrale</string>
     <string name="poi_club_photography">Club fotografico</string>
     <string name="poi_club_hunting">Club caccia</string>
@@ -502,7 +502,7 @@
     <string name="poi_ice_stock">Stock sport</string>
     <string name="poi_korfbal">Korfball</string>
     <string name="poi_orienteering">Orientamento</string>
-    <string name="poi_paddle_tennis">"Paddle tennis "</string>
+    <string name="poi_paddle_tennis">Paddle tennis</string>
     <string name="poi_surfing">Surf</string>
     <string name="poi_artwork">Opera d\'arte</string>
     <string name="poi_historic_cannon">Cannone storico</string>
@@ -516,7 +516,7 @@
     <string name="poi_arts_centre">Centro artistico</string>
     <string name="poi_leisure_fishing">Postazione di pesca</string>
     <string name="poi_harbour">Porto</string>
-    <string name="poi_biergarten">"Biergarten "</string>
+    <string name="poi_biergarten">Biergarten</string>
     <string name="poi_craft_agricultural_engines">Motori agricoli</string>
     <string name="poi_craft_basket_maker">Cestaio</string>
     <string name="poi_cape">Capo</string>
@@ -721,7 +721,7 @@
     <string name="poi_parking_type">Tipo</string>
     <string name="poi_covered">Coperto</string>
     <string name="poi_subway_station_filter">Stazione della metropolitana</string>
-    <string name="poi_ferry_terminal_cargo">"Cargo "</string>
+    <string name="poi_ferry_terminal_cargo">Carico</string>
     <string name="poi_bicycle_parking_type">Tipo</string>
     <string name="poi_aerialway_bicycle">Trasporto di biciclette</string>
     <string name="poi_aerialway_heating">Riscaldamento</string>
@@ -748,7 +748,7 @@
     <string name="poi_fee">Costi</string>
     <string name="poi_smoking">Fumatori</string>
     <string name="poi_delivery">Consegna</string>
-    <string name="poi_drive_in">"Drive in "</string>
+    <string name="poi_drive_in">Drive in</string>
     <string name="poi_takeaway">Cibo da asporto</string>
     <string name="poi_cocktails">Cocktail</string>
     <string name="poi_microbrewery">Microbirrificio</string>
@@ -859,7 +859,7 @@
     <string name="poi_mast">Palo</string>
     <string name="poi_reservoir">Serbatoio</string>
     <string name="poi_gasometer">Gasometro</string>
-    <string name="poi_silo">"Silo "</string>
+    <string name="poi_silo">Silo</string>
     <string name="poi_pension_fund">Fondo pensione</string>
     <string name="poi_quarter">Quartiere</string>
     <string name="poi_residential">Area residenziale</string>
@@ -998,7 +998,7 @@
     <string name="poi_trees_plum">Prugna</string>
     <string name="poi_trees_peach">Pesca</string>
     <string name="poi_trees_tea">Tè</string>
-    <string name="poi_trees_coca">"Coca "</string>
+    <string name="poi_trees_coca">Coca</string>
     <string name="poi_trees_kiwi">Kiwi</string>
     <string name="poi_trees_nectorine">Nettarina</string>
     <string name="poi_trees_mango">Mango</string>
@@ -1111,9 +1111,9 @@
     <string name="poi_stars_1">1 (turista)</string>
     <string name="poi_stars_1s">1S (turistica superiore)</string>
     <string name="poi_stars_2">2 (standard)</string>
-    <string name="poi_stars_2s">"2S (standard  superiore)"</string>
+    <string name="poi_stars_2s">2S (standard superiore)</string>
     <string name="poi_stars_3">3 (comfort)</string>
-    <string name="poi_stars_3s">"3S (comfort  superiore)"</string>
+    <string name="poi_stars_3s">3S (comfort superiore)</string>
     <string name="poi_stars_4">4 (prima classe)</string>
     <string name="poi_stars_4s">4S (prima classe superiore)</string>
     <string name="poi_stars_5">5 (lusso)</string>
@@ -1143,23 +1143,23 @@
     <string name="poi_payment_account_cards_yes">Schede conto</string>
     <string name="poi_payment_maestro_yes">Maestro</string>
     <string name="poi_payment_maestro_no">Maestro non accettato</string>
-    <string name="poi_payment_american_express_yes">"American Express (AMEX) "</string>
+    <string name="poi_payment_american_express_yes">American Express (AMEX)</string>
     <string name="poi_payment_american_express_no">American Express (AMEX) non accettato</string>
-    <string name="poi_payment_diners_club_yes">"Diners Club "</string>
+    <string name="poi_payment_diners_club_yes">Diners Club</string>
     <string name="poi_payment_diners_club_no">Diners Club non accettate</string>
     <string name="poi_payment_dkv_yes">DKV</string>
     <string name="poi_payment_dkv_no">DKV non accettato</string>
     <string name="poi_payment_uta_yes">UTA</string>
     <string name="poi_payment_uta_no">Carte UTA non accettato</string>
-    <string name="poi_payment_efectivo_yes">"Efectivo "</string>
+    <string name="poi_payment_efectivo_yes">Efectivo</string>
     <string name="poi_payment_efectivo_no">Efectivo non accettato</string>
-    <string name="poi_payment_girocard_yes">"Girocard "</string>
+    <string name="poi_payment_girocard_yes">Girocard</string>
     <string name="poi_payment_girocard_no">Girocard non accettato</string>
-    <string name="poi_payment_discover_card_yes">"Discover Card "</string>
+    <string name="poi_payment_discover_card_yes">Discover Card</string>
     <string name="poi_payment_discover_card_no">Discover Card non accettata</string>
-    <string name="poi_payment_visa_electron_yes">"Visa Electron "</string>
+    <string name="poi_payment_visa_electron_yes">Visa Electron</string>
     <string name="poi_payment_visa_electron_no">Visa Electron non accettato</string>
-    <string name="poi_payment_litecoin_yes">"Litecoin "</string>
+    <string name="poi_payment_litecoin_yes">Litecoin</string>
     <string name="poi_payment_litecoin_no">Litecoin non accettato</string>
     <string name="poi_payment_cheque_yes">Assegni</string>
     <string name="poi_payment_pikepass_yes">PIKEPASS</string>
@@ -1170,19 +1170,19 @@
     <string name="poi_payment_cryptocurrencies_no">Cryptomonete non accettate</string>
     <string name="poi_payment_others_yes">Altro</string>
     <string name="poi_payment_others_no">Altri metodi di pagamento non accettati</string>
-    <string name="poi_payment_routex_yes">"Routex "</string>
+    <string name="poi_payment_routex_yes">Routex</string>
     <string name="poi_payment_bancomat_yes">Bancomat</string>
     <string name="poi_payment_bancomat_no">Bancomat non accettato</string>
     <string name="poi_payment_prepaid_ticket_yes">Biglietti prepagati</string>
     <string name="poi_payment_jcb_yes">JCB</string>
-    <string name="poi_payment_ep_quick_yes">"Quick "</string>
+    <string name="poi_payment_ep_quick_yes">Quick</string>
-    <string name="poi_payment_eurowag_yes">"Eurowag "</string>
+    <string name="poi_payment_eurowag_yes">Eurowag</string>
-    <string name="poi_payment_e_zpass_yes">"E‑ZPass "</string>
+    <string name="poi_payment_e_zpass_yes">E‑ZPass</string>
     <string name="poi_payment_e_zpass_no">E‑ZPass non accettato</string>
     <string name="poi_payment_euroshell_yes">EuroShell</string>
-    <string name="poi_payment_kitcard_yes">"KITCard "</string>
+    <string name="poi_payment_kitcard_yes">KITCard</string>
     <string name="poi_payment_kitcard_no">KITCard non accettato</string>
-    <string name="poi_payment_westfalen_card_yes">"Westfalen "</string>
+    <string name="poi_payment_westfalen_card_yes">Westfalen</string>
     <string name="poi_payment_wire_transfer_yes">Bonifici</string>
     <string name="poi_payment_wire_transfer_no">Bonifici non accettati</string>
     <string name="poi_payment_sms_yes">Pagamenti tramite SMS</string>
@@ -1221,7 +1221,7 @@
     <string name="poi_recycling_plasterboard">Cartongesso</string>
     <string name="poi_monitoring_station">Stazione di monitoraggio</string>
     <string name="poi_country">Paese</string>
-    <string name="poi_base">"Base jumping "</string>
+    <string name="poi_base">Base jumping</string>
     <string name="poi_religion_jain">Giainismo</string>
     <string name="poi_religion_bahai">Bahaismo</string>
     <string name="poi_religion_scientologist">Scientologismo</string>
@@ -1315,41 +1315,41 @@
     <string name="poi_payment_electronic_purses_no">Portafogli elettronici non accettati</string>
     <string name="poi_payment_laser_yes">Laser</string>
     <string name="poi_payment_v_pay_yes">V PAY</string>
-    <string name="poi_payment_dogecoin_yes">"Dogecoin "</string>
+    <string name="poi_payment_dogecoin_yes">Dogecoin</string>
     <string name="poi_payment_dogecoin_no">Dogecoin non accettato</string>
-    <string name="poi_payment_cibus_yes">"Cibus "</string>
+    <string name="poi_payment_cibus_yes">Cibus</string>
     <string name="poi_payment_ep_avant_yes">AvantCard</string>
     <string name="poi_payment_ep_avant_no">AvantCard non accettato</string>
     <string name="poi_payment_ep_mep_yes">MEP</string>
     <string name="poi_payment_ep_mep_no">MEP non accettato</string>
-    <string name="poi_payment_ep_minipay_yes">"Minipay "</string>
+    <string name="poi_payment_ep_minipay_yes">Minipay</string>
     <string name="poi_payment_ep_minipay_no">Minipay non accettato</string>
     <string name="poi_payment_ep_minicash_yes">MiniCash</string>
     <string name="poi_payment_ep_minicash_no">MiniCash non accettato</string>
-    <string name="poi_payment_ep_moneo_yes">"Moneo "</string>
+    <string name="poi_payment_ep_moneo_yes">Moneo</string>
     <string name="poi_payment_ep_moneo_no">Moneo non accettato</string>
-    <string name="poi_payment_ep_monedero4b_yes">"Monedero 4B "</string>
+    <string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
     <string name="poi_payment_ep_monedero4b_no">Monedero 4B non accettato</string>
-    <string name="poi_payment_ep_monedero_yes">"Monedero "</string>
+    <string name="poi_payment_ep_monedero_yes">Monedero</string>
     <string name="poi_payment_ep_monedero_no">Monedero non accettato</string>
-    <string name="poi_payment_bankaxess_yes">"BankAxess "</string>
+    <string name="poi_payment_bankaxess_yes">BankAxess</string>
     <string name="poi_payment_bankaxess_no">BankAxess non accettato</string>
-    <string name="poi_payment_coinkite_yes">"Coinkite "</string>
+    <string name="poi_payment_coinkite_yes">Coinkite</string>
     <string name="poi_payment_coinkite_no">Coinkite non accettato</string>
-    <string name="poi_payment_roadrunner_yes">"Roadrunner "</string>
+    <string name="poi_payment_roadrunner_yes">Roadrunner</string>
     <string name="poi_payment_svg_yes">SVG</string>
     <string name="poi_payment_svg_no">SVG non accettato</string>
-    <string name="poi_payment_ov_chipkaart_yes">"OV-Chipkaart "</string>
+    <string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
     <string name="poi_payment_ov_chipkaart_no">OV-Chipkaart non accettato</string>
-    <string name="poi_payment_oyster_yes">"Oyster "</string>
+    <string name="poi_payment_oyster_yes">Oyster</string>
     <string name="poi_payment_sube_yes">SUBE</string>
-    <string name="poi_payment_via_verde_yes">"Via Verde "</string>
+    <string name="poi_payment_via_verde_yes">Via Verde</string>
     <string name="poi_payment_via_verde_no">Via Verde non accettato</string>
     <string name="poi_payment_meal_voucher_yes">Buoni pasto</string>
     <string name="poi_payment_meal_voucher_no">Buoni pasto non accettati</string>
-    <string name="poi_payment_u_key_yes">"U-Key "</string>
+    <string name="poi_payment_u_key_yes">U-Key</string>
     <string name="poi_payment_u_key_no">U-Key non accettato</string>
-    <string name="poi_payment_pro100_yes">"PRO100  "</string>
+    <string name="poi_payment_pro100_yes">PRO100</string>
     <string name="poi_payment_yandexmoney_yes">Yandex. Money</string>
     <string name="poi_payment_yandexmoney_no">Yandex. Money non accettato</string>
     <string name="poi_diet_vegetarian_filter_yes">Vegetariana</string>
@@ -1361,7 +1361,7 @@
     <string name="poi_diet_gluten_free_yes">Senza glutine</string>
     <string name="poi_diet_gluten_free_no">Dieta senza glutine: no</string>
     <string name="poi_drive_in_yes">sì</string>
-    <string name="poi_drive_in_no">"Drive-in: no "</string>
+    <string name="poi_drive_in_no">Drive-in: no</string>
     <string name="poi_drive_through_yes">sì</string>
     <string name="poi_microbrewery_yes">sì</string>
     <string name="poi_takeaway_filter_yes">sì</string>
@@ -1438,7 +1438,7 @@
     <string name="poi_resource_coal">Carbone</string>
     <string name="poi_resource_copper">Rame</string>
     <string name="poi_resource_diamond">Diamante</string>
-    <string name="poi_resource_dolomite">"Dolomite "</string>
+    <string name="poi_resource_dolomite">Dolomite</string>
     <string name="poi_resource_gas">Gas</string>
     <string name="poi_resource_gold">Oro</string>
     <string name="poi_resource_graphite">Grafite</string>
@@ -1537,7 +1537,7 @@
     <string name="poi_surface_snow">Superficie: neve</string>
     <string name="poi_route_bus_ref">Autobus</string>
     <string name="poi_route_trolleybus_ref">Filobus</string>
-    <string name="poi_route_tram_ref">"Tram "</string>
+    <string name="poi_route_tram_ref">Tram</string>
     <string name="poi_route_train_ref">Treno</string>
     <string name="poi_route_funicular_ref">Funicolare</string>
     <string name="poi_route_ferry_ref">Traghetto</string>
@@ -1578,7 +1578,7 @@
     <string name="poi_office_forestry">Ufficio forestale</string>
     <string name="poi_fuel_91ul">Carburante 91UL</string>
     <string name="poi_fuel_100ll">Carburante 100LL</string>
-    <string name="poi_fuel_autogas">"Autogas "</string>
+    <string name="poi_fuel_autogas">Autogas</string>
     <string name="poi_fuel_jeta1">Carburante Jet A-1</string>
     <string name="poi_fuel_adblue">Carburante AdBlue</string>
     <string name="poi_escape_lane">Lane di fuga</string>
@@ -1663,7 +1663,7 @@
     <string name="poi_theatre_genre_philharmonic">Filarmonica</string>
     <string name="poi_theatre_genre_drama">Dramma</string>
     <string name="poi_theatre_genre_opera">Opera</string>
-    <string name="poi_theatre_genre_cabaret">"Cabaret "</string>
+    <string name="poi_theatre_genre_cabaret">Cabaret</string>
     <string name="poi_theatre_genre_comedy">Commedia</string>
     <string name="poi_theatre_genre_marionette">Marionetta</string>
     <string name="poi_theatre_genre_ballet">Balletto</string>
@@ -1752,17 +1752,17 @@
     <string name="poi_cargo_container">Contenitori</string>
     <string name="poi_aerialway_length">Lunghezza</string>
     <string name="poi_fitness_centre">Centro fitness</string>
-    <string name="poi_fitness">"Fitness "</string>
+    <string name="poi_fitness">Fitness</string>
     <string name="poi_billiards">Biliardo</string>
     <string name="poi_microwave_oven_yes">Forno a microonde: sì</string>
     <string name="poi_microwave_oven_no">Forno a microonde: no</string>
     <string name="poi_water_heater_yes">Riscaldatore di acqua: sì</string>
     <string name="poi_water_heater_no">Riscaldatore di acqua: no</string>
     <string name="poi_parking_surface">Tipo: superficie</string>
-    <string name="poi_dojo">"Dojo "</string>
+    <string name="poi_dojo">Dojo</string>
     <string name="poi_gaelic_games">Giochi Gaelic</string>
-    <string name="poi_netball">"Netball "</string>
+    <string name="poi_netball">Netball</string>
-    <string name="poi_judo">"Judo "</string>
+    <string name="poi_judo">Judo</string>
     <string name="poi_disc_golf">Disc golf</string>
     <string name="poi_boxing">Boxe</string>
     <string name="poi_official_name">Nome ufficiale</string>
@@ -1784,7 +1784,7 @@
     <string name="poi_amenity_vacuum_cleaner">Aspirapolvere</string>
     <string name="poi_button_operated_yes">Sgancio a pulsante: sì</string>
     <string name="poi_button_operated_no">Sgancio a pulsante: no</string>
-    <string name="poi_tanning_salon">"Solarium "</string>
+    <string name="poi_tanning_salon">Solarium</string>
     <string name="poi_fire_hydrant_type_pillar">Pilastro</string>
     <string name="poi_fire_hydrant_type_pond">Stagno</string>
     <string name="poi_fire_hydrant_type_wall">Parete</string>
@@ -1817,12 +1817,12 @@
     <string name="poi_aerodrome_type_military_public">Militare/pubblico</string>
     <string name="poi_aerodrome_type_private">Privato</string>
     <string name="poi_ventilation_shaft">Pozzo di ventilazione</string>
-    <string name="poi_payment_troika_yes">"Troika "</string>
+    <string name="poi_payment_troika_yes">Troika</string>
     <string name="poi_payment_troika_no">Carta Troika non accettata</string>
     <string name="poi_telescope">Telescopio</string>
     <string name="poi_telescope_type_optical">Ottico</string>
     <string name="poi_telescope_type_radio">Radio</string>
-    <string name="poi_telescope_type_gamma">"Gamma "</string>
+    <string name="poi_telescope_type_gamma">Gamma</string>
     <string name="poi_telescope_diameter">Diametro</string>
     <string name="poi_telescope_usage_espionage">Utilizzo: spionaggio</string>
     <string name="poi_observatory_type_espionage">Utilizzo: spionaggio</string>
@@ -1881,28 +1881,28 @@
     <string name="poi_cuisine_seafood">Frutti di mare</string>
     <string name="poi_cuisine_breakfast">Colazione</string>
     <string name="poi_cuisine_steak">Bistecca</string>
-    <string name="poi_cuisine_tapas">"Tapas "</string>
+    <string name="poi_cuisine_tapas">Tapas</string>
-    <string name="poi_cuisine_heuriger">"Heuriger "</string>
+    <string name="poi_cuisine_heuriger">Heuriger</string>
     <string name="poi_cuisine_curry">Curry</string>
-    <string name="poi_cuisine_buschenschank">"Buschenschank "</string>
+    <string name="poi_cuisine_buschenschank">Buschenschank</string>
     <string name="poi_cuisine_grill">Griglia</string>
     <string name="poi_cuisine_bagel">Bagel</string>
-    <string name="poi_cuisine_pasta">"Pasta "</string>
+    <string name="poi_cuisine_pasta">Pasta</string>
     <string name="poi_cuisine_juice">Succo di frutta</string>
     <string name="poi_cuisine_tea">Tè</string>
     <string name="poi_cuisine_tea_shop">Negozio tè</string>
     <string name="poi_cuisine_soup">Zuppa</string>
     <string name="poi_cuisine_hotdog">Hot Dog</string>
     <string name="poi_cuisine_salad">Insalata</string>
-    <string name="poi_cuisine_bistro">"Bistro "</string>
+    <string name="poi_cuisine_bistro">Bistrò</string>
     <string name="poi_cuisine_couscous">Cous cous</string>
     <string name="poi_cuisine_fried_chicken">Pollo fritto</string>
-    <string name="poi_cuisine_dessert">"Dessert "</string>
+    <string name="poi_cuisine_dessert">Dolce</string>
     <string name="poi_cuisine_canteen">Mensa</string>
-    <string name="poi_cuisine_tacos">"Tacos "</string>
+    <string name="poi_cuisine_tacos">Tacos</string>
-    <string name="poi_cuisine_falafel">"Falafel "</string>
+    <string name="poi_cuisine_falafel">Falafel</string>
-    <string name="poi_cuisine_smoothie">"Smoothie "</string>
+    <string name="poi_cuisine_smoothie">Frullato</string>
-    <string name="poi_cuisine_gyros">"Gyros "</string>
+    <string name="poi_cuisine_gyros">Gyros</string>
     <string name="poi_cuisine_crepes">Crepes</string>
     <string name="poi_cuisine_meat">Carne</string>
     <string name="poi_cuisine_chocolate">Cioccolato</string>
@@ -1960,7 +1960,7 @@
     <string name="poi_cuisine_cuban">Cubano</string>
     <string name="poi_cuisine_british">Britannico</string>
     <string name="poi_cuisine_latin_american">Latino-americana</string>
-    <string name="poi_cuisine_nepalese">"Nepalese "</string>
+    <string name="poi_cuisine_nepalese">Nepalese</string>
     <string name="poi_cuisine_mongolian">Mongolo</string>
     <string name="poi_cuisine_middle_eastern">Mediorientale</string>
     <string name="poi_cuisine_ukrainian">Ucraino</string>
@@ -1976,12 +1976,12 @@
     <string name="poi_cuisine_english">Inglese</string>
     <string name="poi_cuisine_pakistani">Pakistano</string>
     <string name="poi_cuisine_taiwanese">Taiwan</string>
-    <string name="poi_cuisine_tex_mex">"Tex-mex "</string>
+    <string name="poi_cuisine_tex_mex">Tex-mex</string>
     <string name="poi_cuisine_dutch">Olandese</string>
     <string name="poi_cuisine_syrian">Siriano</string>
     <string name="poi_cuisine_australian">Australiano</string>
     <string name="poi_cuisine_egyptian">Egiziano</string>
-    <string name="poi_cuisine_senegalese">"Senegalese "</string>
+    <string name="poi_cuisine_senegalese">Senegalese</string>
     <string name="poi_cuisine_jewish">Ebraico</string>
     <string name="poi_cuisine_bulgarian">Bulgaro</string>
     <string name="poi_cuisine_tibetan">Tibetano</string>
@@ -2097,21 +2097,21 @@
     <string name="poi_animal_shelter_purpose_adoption_yes">Adozione: sì</string>
     <string name="poi_animal_shelter_purpose_adoption_no">Adozione: no</string>
     <string name="poi_direction_n">Direzione: nord</string>
-    <string name="poi_direction_nne">Direzione: nord nord est</string>
+    <string name="poi_direction_nne">Direzione: nord-nordest</string>
     <string name="poi_direction_ne">Direzione: nord est</string>
     <string name="poi_direction_ene">Direzione: est nord est</string>
     <string name="poi_direction_e">Direzione: est</string>
     <string name="poi_direction_ese">Direzione: est sud est</string>
     <string name="poi_direction_se">Direzione: sud est</string>
-    <string name="poi_direction_sse">Direzione: sud sud est</string>
+    <string name="poi_direction_sse">Direzione: sud-sudest</string>
     <string name="poi_direction_s">Direzione: sud</string>
-    <string name="poi_direction_ssw">Direzione: sud sud ovest</string>
+    <string name="poi_direction_ssw">Direzione: sud-sudovest</string>
     <string name="poi_direction_sw">Direzione: sud ovest</string>
     <string name="poi_direction_wsw">Direzione: ovest sud ovest</string>
     <string name="poi_direction_w">Direzione: ovest</string>
     <string name="poi_direction_wnw">Direzione: ovest nord ovest</string>
     <string name="poi_direction_nw">Direzione: nord ovest</string>
-    <string name="poi_direction_nnw">Direzione: nord nord ovest</string>
+    <string name="poi_direction_nnw">Direzione: nord-nordovest</string>
     <string name="poi_direction_forward">Direzione: avanti</string>
     <string name="poi_direction_up">Direzione: sopra</string>
     <string name="poi_direction_down">Direzione: sotto</string>
@@ -2220,7 +2220,7 @@
     <string name="poi_socket_cee_blue_output_filter">Uscita CEE blu</string>
     <string name="poi_socket_schuko_output_filter">Uscita Schuko</string>
     <string name="poi_operational_status">Stato di servizio</string>
-    <string name="poi_via_ferrata">"Via ferrata "</string>
+    <string name="poi_via_ferrata">Via ferrata</string>
     <string name="poi_via_ferrata_scale">Difficoltà</string>
     <string name="poi_boat_sharing">Condivisione di barche</string>
     <string name="poi_water_purification">Potabilizzazione acqua</string>
@@ -2247,14 +2247,14 @@
     <string name="poi_tax_advisor">Ufficio consulente fiscale</string>
     <string name="poi_lodging">Alloggio</string>
     <string name="poi_hunting_lodge">Alloggio di caccia</string>
-    <string name="poi_religion_tenrikyo">"Tenrikyo "</string>
+    <string name="poi_religion_tenrikyo">Tenrikyo</string>
     <string name="poi_denomination_united">Unito</string>
     <string name="poi_denomination_bulgarian_orthodox">Ortodosso bulgaro</string>
     <string name="poi_denomination_armenian_apostolic">Apostolico armeno</string>
     <string name="poi_denomination_coptic_orthodox">Ortodosso copto</string>
     <string name="poi_anchor_berth">Ormeggio ancoraggio</string>
     <string name="poi_berth">Ormeggio</string>
-    <string name="poi_wiki_lang_af">"Africaans wiki "</string>
+    <string name="poi_wiki_lang_af">Wiki in Africaans</string>
     <string name="poi_full_height_turnstile">Tornello a tutta altezza</string>
     <string name="poi_stile">Scaletta</string>
     <string name="poi_aerialway_pylon">Pilone di sollevamento aereo</string>
@@ -2289,9 +2289,9 @@
     <string name="poi_fire_hydrant_style_water_source_main">Principale</string>
     <string name="poi_fire_hydrant_style_water_source_pond">Stagno</string>
     <string name="poi_fire_hydrant_style_water_source_stream">Ruscello</string>
-    <string name="poi_valley_balka">"Balka "</string>
+    <string name="poi_valley_balka">Balka</string>
     <string name="poi_display_yes">Display: sì</string>
-    <string name="poi_display_no">"Display: no "</string>
+    <string name="poi_display_no">Display: no</string>
     <string name="poi_display_analog_yes">Display analogico</string>
     <string name="poi_display_digital_yes">Display digitale</string>
     <string name="poi_organic_yes">sì</string>
@@ -2308,19 +2308,19 @@
     <string name="poi_boat_jetski_rental_no">Jetski: no</string>
     <string name="poi_boat_kayak_rental_rental_yes">Kayak: sì</string>
     <string name="poi_boat_kayak_rental_rental_no">Kayak: no</string>
-    <string name="poi_surface_tartan">"Tartan "</string>
+    <string name="poi_surface_tartan">Tartan</string>
     <string name="poi_checkpoint_type">Tipo Checkpoint</string>
     <string name="poi_bowls">Ciotole</string>
     <string name="poi_water_place_access">Accesso all\'acqua</string>
-    <string name="poi_resort">"Resort "</string>
+    <string name="poi_resort">Villaggio turistico</string>
     <string name="poi_recreation_ground">Terreno ricreativo</string>
-    <string name="poi_cuisine_donut">"Donut "</string>
+    <string name="poi_cuisine_donut">Ciambella</string>
-    <string name="poi_cuisine_crepe">"Crepe "</string>
+    <string name="poi_cuisine_crepe">Crepe</string>
     <string name="poi_cuisine_bakery">Panificio</string>
     <string name="poi_cuisine_snack">Spuntino</string>
-    <string name="poi_cuisine_yogurt">"Yogurt "</string>
+    <string name="poi_cuisine_yogurt">Yogurt</string>
-    <string name="poi_cuisine_cajun">"Cajun "</string>
+    <string name="poi_cuisine_cajun">Cajun</string>
-    <string name="poi_motorcycle_type_standard">"Standard "</string>
+    <string name="poi_motorcycle_type_standard">Standard</string>
     <string name="poi_surface_clay">Argilla</string>
     <string name="poi_operational_status_needs_maintenance">Necessità di manutenzione</string>
     <string name="poi_water_supply_pump">Pompa</string>
@@ -2342,8 +2342,8 @@
     <string name="poi_climbing_ice_yes">Ghiaccio: sì</string>
     <string name="poi_climbing_ice_no">Ghiaccio: no</string>
     <string name="poi_frozen_food">Alimenti surgelati</string>
-    <string name="poi_socket_chademo_yes">"CHAdeMO "</string>
+    <string name="poi_socket_chademo_yes">CHAdeMO</string>
-    <string name="poi_socket_schuko_yes">"Schuko "</string>
+    <string name="poi_socket_schuko_yes">Schuko</string>
     <string name="poi_socket_chademo_output_low">Bassa</string>
     <string name="poi_socket_type2_output_medium">Medio</string>
     <string name="poi_barbecue_grill">Griglia barbecue: sì</string>
@@ -2504,7 +2504,7 @@
     <string name="poi_crop_tobacco">Raccolta: tabacco</string>
     <string name="poi_crop_strawberry">Raccolta: fragole</string>
     <string name="poi_crop_vegetables_flowers">Raccolta: verdura, fiori</string>
-    <string name="poi_crop_cassava">"Raccolta:  manioca"</string>
+    <string name="poi_crop_cassava">Raccolta: manioca</string>
     <string name="poi_crop_cranberry">Raccolta: mirtillo rosso</string>
     <string name="poi_surveillance_outdoor">Sorveglianza: esterna</string>
     <string name="poi_surveillance_public">Sorveglianza: luogo pubblico</string>

OsmAnd/res/values-it/strings.xml

@@ -160,8 +160,7 @@
     <string name="install_more">Installa altro…</string>
     <string name="level_to_switch_vector_raster_descr">Usare le mappe vettoriali per andare oltre questo livello.</string>
     <string name="level_to_switch_vector_raster">Minimo livello di zoom vettoriale</string>
-    <string name="create_poi_link_to_osm_doc">
+    <string name="create_poi_link_to_osm_doc"><u>OSM online</u> classificazione di mappa con immagini.</string>
-        <u>OSM Online</u> con immagini.</string>
     <string name="error_doing_search">Non posso effettuare una ricerca offline.</string>
     <string name="search_osm_offline">Ricerco tramite geo posizione</string>
     <string name="system_locale">Sistema</string>
@@ -689,8 +688,7 @@
     <string name="osmand_parking_am">AM</string>
     <string name="osmand_parking_position_name">Punto di parcheggio</string>
     <string name="osmand_parking_plugin_description">Ti permette di memorizzare dove l\'auto è parcheggiata e quanto tempo rimane. 
-\n Puoi trovare il luogo di parcheggio e il tempo rimanente nel pannello di controllo e nel widget sulla mappa. 
+\n Puoi trovare il luogo di parcheggio e il tempo rimanente nel pannello di controllo e nel widget sulla mappa. Si può aggiungere un promemoria al calendario di Android.</string>
-\nSi può aggiungere un promemoria al calendario di Android.</string>
     <string name="osmand_parking_plugin_name">Posizione parcheggio</string>
     <string name="context_menu_item_add_parking_point">Marca come posizione di parcheggio</string>
     <string name="context_menu_item_delete_parking_point">Elimina marcatore di parcheggio</string>
@@ -1257,9 +1255,9 @@
     <string name="speak_poi">PDI nelle vicinanze</string>
     <string name="index_tours">Itinerari</string>
     <string name="shared_string_all">Tutti</string>
-    <string name="record_plugin_description">"Questo componente aggiuntivo attiva la funzionalità di registrare e salvare le tue tracce, o manualmente attraverso il pulsante dedicato nella mappa, oppure automaticamente tenendo traccia di tutti i tuoi spostamenti in un file GPX.  
+    <string name="record_plugin_description">Questo componente aggiuntivo attiva la funzionalità di registrare e salvare le tue tracce, o manualmente attraverso il pulsante dedicato nella mappa, oppure automaticamente tenendo traccia di tutti i tuoi spostamenti in un file GPX. 
 \n
-\nLe tracce registrate possono essere condivise con i tuoi amici o essere usate per chi contribuire a OSM. Gli atleti possono utilizzate le tracce registrate per monitorare i loro allenamenti. Alcune analisi di base possono essere fatte direttamente in OsmAnd, come il tempo sul giro, la velocità media ecc., le tracce naturalmente possono essere in seguito analizzate con strumenti di analisi esterni."</string>
+\n Le tracce registrate possono essere condivise con i tuoi amici o essere usate per chi contribuire a OSM. Gli atleti possono utilizzate le tracce registrate per monitorare i loro allenamenti. Alcune analisi di base possono essere fatte direttamente in OsmAnd, come il tempo sul giro, la velocità media ecc., le tracce naturalmente possono essere in seguito analizzate con strumenti di analisi esterni.</string>
     <string name="record_plugin_name">Registrazione viaggio</string>
     <string name="int_hour">h</string>
     <string name="duration">Durata</string>
@@ -2296,20 +2294,20 @@
     <string name="edit_name">Modifica il nome</string>
     <string name="route_is_too_long_v2">Per lunghe distanze: aggiungere delle mete intermedie se non si ottiene un risultato entro 10 minuti.</string>
     <string name="save_poi_too_many_uppercase">Il nome contiene troppe maiuscole. Continuare\?</string>
-    <string name="osmand_plus_extended_description_part8">"Copertura e qualità approssimativa delle mappe: 
+    <string name="osmand_plus_extended_description_part8">Copertura e qualità approssimativa delle mappe: 
-\n  • Ovest Europa: **** 
+\n • Ovest Europa: **** 
-\n  • Est Europa: *** 
+\n • Est Europa: *** 
-\n  • Russia: *** 
+\n • Russia: *** 
-\n  • Nord America: *** 
+\n • Nord America: *** 
-\n  • Sud America: ** 
+\n • Sud America: ** 
-\n  • Asia: ** 
+\n • Asia: ** 
-\n  • Giappone e Corea: *** 
+\n • Giappone e Corea: *** 
-\n  • Medio Oriente: ** 
+\n • Medio Oriente: ** 
-\n  • Africa: ** 
+\n • Africa: ** 
-\n  • Antartide: * 
+\n • Antartide: * 
-\n  Molte nazioni del mondo disponibili come download! 
+\n Molte nazioni del mondo disponibili da scaricare 
-\n  Dall\'Afghanistan al Zimbabwe, dall\'Australia agli USA. Argentina, Brasile, Canada, Francia, Germania, Messico, Gran Bretagna, Spagna, …
+\n Dall\'Afghanistan al Zimbabwe, dall\'Australia agli USA. Argentina, Brasile, Canada, Francia, Germania, Messico, Regno Unito, Spagna, …
-\n"</string>
+\n</string>
     <string name="osmand_plus_extended_description_part7">Contribuisci direttamente a OSM 
 \n • Segnala errori nei dati 
 \n • Contribuisci tracce GPX a OSM direttamente dall\'app 
@@ -2471,15 +2469,15 @@
 \n • Supporta i punti intermedi nel tuo itinerario 
 \n • Registra la tua traccia GPX oppure caricarne una e seguirla
 \n</string>
-    <string name="osmand_extended_description_part3">"Mappa 
+    <string name="osmand_extended_description_part3">Mappa 
 \n • Mostra i PDI (punti di interesse) vicino a te 
 \n • Disponi la mappa nella direzione del movimento (o della bussola) 
-\n • Mostra dove sei e  la direzione verso cui sei rivolto 
+\n • Mostra dove sei e la direzione verso cui sei rivolto 
 \n • Condividi la tua posizione così i tuoi amici possano trovarti 
 \n • Raccogli i luoghi più importanti nei \'Preferiti\' 
 \n • Ti permette di scegliere come visualizzare i nomi nella mappa: in inglese, in lingua locale, oppure secondo la pronuncia 
 \n • Visualizza mattonelle online speciali, vista satellitare (da Bing), diverse sovrapposizioni come turistico/navigazione tracce GPX e strati aggiuntivi con trasparenze personalizzabili
-\n"</string>
+\n</string>
     <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automatizzata Navigazione Direzioni) è un\'applicazione di navigazione con l\'accesso ai dati delle mappe mondiali, gratuite e di grande qualità di OpenStreetMap (OSM). 
 \n Goditi la navigazione con indicazioni visive e vocali, la visualizzazione dei PDI (punti di interesse), creando e gestendo le tracce GPX, usando visualizzazione delle linee isoipse e dell\'altitudine, scegliendo fra le modalità auto, bici, pedone, modifiche OSM e molto altro. 
 \n 
@@ -2645,7 +2643,7 @@
     <string name="waypoints_removed_from_map_markers">Punti intermedi rimossi dai marcatori della mappa</string>
     <string name="nothing_found_in_radius">Nessun risultato trovato:</string>
     <string name="shared_string_total">Totale</string>
-    <string name="use_two_digits_longitude">"Usa  due cifre per la longitudine"</string>
+    <string name="use_two_digits_longitude">Usa due cifre per la longitudine</string>
     <string name="shared_string_travel_guides">Viaggio</string>
     <string name="select_waypoints_category_description">Aggiungi tutti i punti intermedi della traccia oppure scegli una categoria separata.</string>
     <string name="shared_string_dont">Non fare</string>
@@ -2723,7 +2721,8 @@
 \n • Guida sulla corsia opzionale, visualizzazione dei nomi delle strade, e tempo di arrivo stimato 
 \n • Supporto per punti intermedi del tuo itinerario 
 \n • Rielaborazione del percorso automatico ogni volta che si devia 
-\n • Ricerca di posti per indirizzo, per tipo (es: ristorante, albergo, stazione di servizio, museo) o per coordinate geografiche</string>
+\n • Ricerca di posti per indirizzo, per tipo (es: ristorante, albergo, stazione di servizio, museo) o per coordinate geografiche
+\n</string>
     <string name="hide_full_description">Nascondi la descrizione completa</string>
     <string name="show_full_description">Mostra la descrizione completa</string>
     <string name="nautical_render_descr">Stile per la navigazione marittima e fluviale. Caratteristiche principali: boe, fari, linee e punti per la navigazione su acqua, porti, servizi marittimi e isobate.</string>
@@ -3200,7 +3199,7 @@
     <string name="app_mode_camper">Camper</string>
     <string name="shared_string_default">Predefinita</string>
     <string name="app_mode_wagon">Familiare</string>
-    <string name="app_mode_pickup_truck">Pickup</string>
+    <string name="app_mode_pickup_truck">Pick-up</string>
     <string name="weeks_5">Settimane</string>
     <string name="month">Mese</string>
     <string name="months_2_4">Mesi</string>
@@ -3697,11 +3696,11 @@
     <string name="lang_zhminnan">Min meridionale</string>
     <string name="lang_war">Wáray</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
-    <string name="osm_live_payment_subscription_management">"Il tuo account Google Play viene addebitato al momento dell\'acquisto di una sottoscrizione.
+    <string name="osm_live_payment_subscription_management">Il tuo account Google Play viene addebitato al momento dell\'acquisto di una sottoscrizione. 
 \n 
 \n La sottoscrizione si rinnova automaticamente finché non viene cancellata prima del rinnovo. Il tuo account verrà addebitato per il rinnovo periodico (mensile, trimestrale, annuale) solo alla data di rinnovo. 
 \n 
-\n Puoi gestire  e cancellare la tua sottoscrizione dalle impostazioni del tuo account Google Play."</string>
+\n Puoi gestire e cancellare la tua sottoscrizione dalle impostazioni del tuo account Google Play.</string>
     <string name="search_poi_types_descr">Combina PDI di più categorie. Tappa il pulsante per selezionarle tutte, oppure sul lato sinistro per una selezione puntuale.</string>
     <string name="lang_gu">Gujarati</string>
     <string name="lang_ba">Baschiro</string>
@@ -3741,7 +3740,7 @@
     <string name="reset_items_descr">Nascondere le opzioni le reimposta al loro valore originale.</string>
     <string name="main_actions">Azioni principali</string>
     <string name="additional_actions_descr">Puoi accedere a queste azioni toccando il pulsante \"Azioni aggiuntive\".</string>
-    <string name="move_inside_category">Puoi spostare gli elementi solo all\'interno di questa categoria</string>
+    <string name="move_inside_category">Puoi spostare gli elementi solo all\'interno di questa categoria.</string>
     <string name="select_wikipedia_article_langs">Seleziona i linguaggi in cui gli articoli di Wikipedia appariranno sulla mappa. Puoi cambiare fra tutte le lingue disponibili mentre leggi questo articolo.</string>
     <string name="some_articles_may_not_available_in_lang">Alcuni articoli di Wikipedia potrebbero non essere disponibili nella tua lingua.</string>
     <string name="lang_zhyue">Cantonese</string>
@@ -3769,6 +3768,13 @@
     <string name="search_poi_types">Cerca in base al PDI</string>
     <string name="export_import_quick_actions_with_profiles_promo">Puoi Esportare o importare le azioni veloci con i profili dell\'applicazione.</string>
     <string name="shared_string_delete_all_q">Cancellare tutto\?</string>
-    <string name="delete_all_actions_message_q">Sei sicuro di volere cancellare definitivamente l\'azione veloce %d \?</string>
+    <string name="delete_all_actions_message_q">Sei sicuro di volere cancellare definitivamente %d le azioni rapide\?</string>
     <string name="screen_timeout">Tempo del blocco schermo</string>
+    <string name="width_limit_description">Indica la larghezza del veicolo, alcune restrizioni stradali potrebbero essere applicate per veicoli larghi.</string>
+    <string name="height_limit_description">Indica l\'altezza del veicolo, alcune restrizioni stradali potrebbero essere applicate per veicoli alti.</string>
+    <string name="weight_limit_description">Indica il peso del veicolo, alcune restrizioni stradali potrebbero essere applicate per veicoli pesanti.</string>
+    <string name="turn_screen_on_power_button_disabled">Disattivato. Richiede \'Mantieni lo schermo acceso\' sotto \'Tempo di accensione\'.</string>
+    <string name="shared_string_meters">metri</string>
+    <string name="details_dialog_decr">Controlla la visibilità di dettagli aggiuntivi mostrati su mappa</string>
+    <string name="shared_string_night_map">Mappa notturna</string>
 </resources>

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

@@ -346,7 +346,7 @@
     <string name="app_mode_truck">Caminhão</string>
     <string name="auto_zoom_far">Para nível intermediário</string>
     <string name="local_index_tile_data_minzoom">Zoom mínimo: %1$s</string>
-    <string name="edit_tilesource_successfully">A fonte da quadrícula %1$s foi salva</string>
+    <string name="edit_tilesource_successfully">A fonte da quadrícula %1$s salva</string>
     <string name="speak_traffic_warnings">Moderadores de tráfego</string>
     <string name="context_menu_item_directions_from">Rota a partir daqui</string>
     <string name="app_mode_default">Navegar no mapa</string>
@@ -544,14 +544,14 @@
     <string name="about_version">Versão:</string>
     <string name="shared_string_about">Sobre</string>
     <string name="about_settings_descr">Versão, licenças, membros do projeto</string>
-    <string name="local_index_tile_data_zooms">Zooms baixados: %1$s</string>
+    <string name="local_index_tile_data_zooms">Níveis de zoom baixados:: %1$s</string>
-    <string name="local_index_tile_data_expire">Expirar (minutos): %1$s</string>
+    <string name="local_index_tile_data_expire">Tempo de expiração (minutos): %1$s</string>
     <string name="local_index_tile_data_downloadable">Transferível: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Zoom máximo: %1$s</string>
     <string name="local_index_tile_data_name">Dados da quadrícula: %1$s</string>
-    <string name="edit_tilesource_elliptic_tile">Mercator elíptico</string>
+    <string name="edit_tilesource_elliptic_tile">Projeção elíptica de Mercator</string>
     <string name="edit_tilesource_maxzoom">Zoom máximo</string>
-    <string name="edit_tilesource_expiration_time">Expirar (minutos)</string>
+    <string name="edit_tilesource_expiration_time">Tempo de expiração (minutos)</string>
     <string name="edit_tilesource_minzoom">Zoom mínimo</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Selecionar existente…</string>
@@ -562,7 +562,7 @@
     <string name="driving_region_japan">Japão</string>
     <string name="driving_region_us">Estados Unidos</string>
     <string name="driving_region_canada">Canadá</string>
-    <string name="driving_region_europe_asia">Europa, Ásia, América Latina etc</string>
+    <string name="driving_region_europe_asia">Europa, Ásia, América Latina e similar</string>
     <string name="driving_region_uk">Reino Unido, Índia e similares</string>
     <string name="speak_descr">Configure o anúncio de nomes de ruas, avisos de trânsito (paradas forçadas, lombadas), avisos de radares de velocidade, limites de velocidade.</string>
     <string name="speak_street_names">Nome das ruas (TTS)</string>
@@ -3596,7 +3596,7 @@ Pôr do Sol: %2$s</string>
     <string name="app_mode_ski_touring">Passeio de esqui</string>
     <string name="app_mode_ski_snowmobile">Moto de neve</string>
     <string name="custom_osmand_plugin">Plug-in OsmAnd personalizado</string>
-    <string name="replace_point_descr">Substitua outro ponto por este</string>
+    <string name="replace_point_descr">Substitua outro ponto por este.</string>
     <string name="changes_applied_to_profile">Alterações aplicadas ao perfil \'%1$s\'.</string>
     <string name="settings_item_read_error">Não foi possível ler a partir de \'%1$s\'.</string>
     <string name="settings_item_write_error">Não foi possível escrever para \'%1$s\'.</string>
@@ -3624,7 +3624,7 @@ Pôr do Sol: %2$s</string>
     <string name="move_inside_category">Você pode mover itens somente dentro desta categoria.</string>
     <string name="developer_plugin">Plugin do desenvolvedor</string>
     <string name="shared_string_items">Itens</string>
-    <string name="select_wikipedia_article_langs">Selecione os idiomas em que os artigos da Wikipédia aparecerão no mapa. Você pode alternar entre todos os idiomas disponíveis enquanto lê o artigo.</string>
+    <string name="select_wikipedia_article_langs">Selecione os idiomas para os artigos da Wikipedia no mapa. Alterne para qualquer idioma disponível enquanto lê o artigo.</string>
     <string name="some_articles_may_not_available_in_lang">Alguns artigos da Wikipédia podem não estar disponíveis no seu idioma.</string>
     <string name="lang_zhyue">Cantonês</string>
     <string name="lang_zhminnan">Min do Sul</string>
@@ -3716,22 +3716,22 @@ Pôr do Sol: %2$s</string>
     <string name="expire_time">Tempo de expiração</string>
     <string name="mercator_projection">Projeção de Mercator</string>
     <string name="storage_format">Formato de armazenamento</string>
-    <string name="map_source_zoom_levels">Defina o nível mínimo e máximo de zoom no qual o mapa online será exibido ou carregado.</string>
+    <string name="map_source_zoom_levels">Defina um nível mínimo e máximo de zoom para mostrar ou carregar o mapa online.</string>
-    <string name="map_source_zoom_levels_descr">Esses parâmetros afetarão a exibição quando usados como mapa ou sobreposição/subjacência.
+    <string name="map_source_zoom_levels_descr">Afeta a tela quando usada como mapa ou sobreposição / subjacência.
 \n
-\n%1$s: O mapa será limitado aos zooms selecionados.
+\n%1$s: o mapa é limitado ao nível de zoom selecionado.
 \n
-\n%2$s: Níveis de zoom nos quais os blocos originais estarão visíveis. O aumento ou redução do tamanho ocorrerá fora desses valores.</string>
+\n%2$s são os níveis em que os blocos originais estarão visíveis, o aumento ou redução do tamanho ocorrerão fora desses valores.</string>
-    <string name="expire_time_descr">Tempo de expiração em minutos. Os mosaicos em cache serão recarregados após o tempo especificado. Deixe esse campo em branco para nunca atualizar mosaicos para esta fonte.
+    <string name="expire_time_descr">Os mosaicos em cache serão baixados novamente após o número especificado de minutos. Deixe esse campo em branco para nunca atualizar mosaicos para esta fonte.
 \n 
 \nUm dia é 1440 minutos. 
 \nUma semana é de 10 080 minutos. 
 \nUm mês é 43 829 minutos.</string>
-    <string name="tiles_storage_descr">Escolha como os mosaicos baixados serão armazenados.</string>
+    <string name="tiles_storage_descr">Escolha como armazenar os mosaicos baixados.</string>
     <string name="default_screen_timeout">Tempo limite da tela padrão</string>
     <string name="shared_string_always">Sempre</string>
     <string name="screen_control">Controle de tela</string>
-    <string name="system_screen_timeout_descr">Desligar a tela após o tempo limite da tela do sistema.</string>
+    <string name="system_screen_timeout_descr">Desligar a tela conforme o tempo limite da tela do sistema.</string>
     <string name="system_screen_timeout">Usar tempo limite da tela do sistema</string>
     <string name="turn_screen_on_options_descr">Opções de ativação da tela:</string>
     <string name="turn_screen_on_descr">Selecione as opções de ativação da tela (verifique se OsmAnd está em primeiro plano quando o dispositivo está sendo bloqueado):</string>
@@ -3743,7 +3743,7 @@ Pôr do Sol: %2$s</string>
     <string name="turn_screen_on_wake_time_descr">Selecionar o tempo limite da tela depois de acordar. (\"%1$s\" não se aplica a tempo limite.)</string>
     <string name="keep_screen_on">Manter a tela ligada</string>
     <string name="keep_screen_off">Manter a tela desligada</string>
-    <string name="screen_timeout_descr">Se a opção \"%1$s\" estiver ativada, o tempo de atividade dependerá disso.</string>
+    <string name="screen_timeout_descr">Se %1$s\" estiver ativado, o tempo de atividade dependerá disso.</string>
     <string name="pseudo_mercator_projection">Projeção pseudo-Mercator</string>
     <string name="one_image_per_tile">Um arquivo de imagem por mosaico</string>
     <string name="sqlite_db_file">Arquivo SQLiteDB</string>
@@ -3754,13 +3754,19 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_delete_all_q">Excluir tudo\?</string>
     <string name="delete_all_actions_message_q">Tem certeza de que deseja excluir irrevogavelmente %d ações rápidas\?</string>
     <string name="screen_timeout">Tempo limite da tela</string>
-    <string name="width_limit_description">Forneça a largura do seu veículo. Algumas restrições de rotas podem ser aplicadas a veículos largos.</string>
+    <string name="width_limit_description">Forneça a largura do seu veículo. Algumas restrições de rota podem se aplicar a veículos largos.</string>
-    <string name="height_limit_description">Forneça a altura do veículo, algumas restrições de rotas podem ser aplicadas para veículos altos.</string>
+    <string name="height_limit_description">Forneça a altura do veículo, algumas restrições de rota podem ser aplicadas para veículos altos.</string>
-    <string name="weight_limit_description">Forneça o peso do veículo, algumas restrições de rotas podem ser aplicadas a veículos pesados.</string>
+    <string name="weight_limit_description">Forneça o peso do seu veículo. Algumas restrições de rota podem ser aplicadas a veículos pesados.</string>
     <string name="shared_string_tones">tons</string>
     <string name="shared_string_meters">metros</string>
-    <string name="details_dialog_decr">Controlar a visibilidade dos detalhes adicionais mostrados no mapa</string>
+    <string name="details_dialog_decr">Mostrar ou ocultar detalhes adicionais do mapa</string>
     <string name="shared_string_night_map">Mapa noturno</string>
     <string name="shared_string_all_time">Tempo todo</string>
     <string name="turn_screen_on_power_button_disabled">Desativado. Requer \'manter a tela ligada\' em \'tempo limite após a ativação\'.</string>
+    <string name="add_online_source">Adicionar fonte online</string>
+    <string name="clear_tiles_warning">A aplicação dessas alterações limpará os dados em cache dessa origem de bloco</string>
+    <string name="vessel_height_warning_link">Definir altura da embarcação</string>
+    <string name="vessel_height_warning">Você 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="vessel_height_limit_description">Defina a altura do vaso para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
+    <string name="vessel_width_limit_description">Defina a largura da embarcação para evitar pontes estreitas</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -40,7 +40,7 @@
     <string name="increase_search_radius">Увеличить радиус поиска</string>
     <string name="nothing_found">Ничего не найдено</string>
     <string name="nothing_found_descr">Изменить запрос или увеличить радиус поиска.</string>
-    <string name="quick_action_showhide_osmbugs_title">Отобразить/скрыть заметки OSM</string>
+    <string name="quick_action_showhide_osmbugs_title">Показать/скрыть заметки OSM</string>
     <string name="quick_action_osmbugs_show">Показать заметки OSM</string>
     <string name="quick_action_osmbugs_hide">Скрыть заметки OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">Переключатель, чтобы отобразить или скрыть заметки OSM на карте.</string>
@@ -1322,7 +1322,7 @@
     <string name="driving_region">Регион вождения</string>
     <string name="driving_region_japan">Япония</string>
     <string name="driving_region_us">США</string>
-    <string name="driving_region_europe_asia">Европа, Азия, Латинская Америка и т.п</string>
+    <string name="driving_region_europe_asia">Европа, Азия, Латинская Америка и т.п.</string>
     <string name="driving_region_uk">Великобритания, Индия и др.</string>
     <string name="context_menu_item_directions_to">Проложить маршрут</string>
     <string name="context_menu_item_directions_from">Пункт отправления</string>
@@ -1331,14 +1331,14 @@
     <string name="local_index_tile_data_expire">Время действия (в минутах): %1$s</string>
     <string name="local_index_tile_data_downloadable">Загружаемые: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Максимальное увеличение: %1$s</string>
-    <string name="edit_tilesource_successfully">Источник тайлов %1$s успешно сохранён</string>
+    <string name="edit_tilesource_successfully">Источник тайлов %1$s сохранён</string>
     <string name="edit_tilesource_maxzoom">Максимальное увеличение</string>
     <string name="edit_tilesource_minzoom">Минимальное увеличение</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="map_widget_fps_info">Отладочная информация FPS</string>
     <string name="shared_string_about">О программе</string>
     <string name="about_settings_descr">Информация о версии, участниках проекта</string>
-    <string name="local_index_tile_data_zooms">Загружено данных по масштабам: %1$s</string>
+    <string name="local_index_tile_data_zooms">Загруженные уровни масштабирования: %1$s</string>
     <string name="local_index_tile_data_minzoom">Минимальное увеличение: %1$s</string>
     <string name="local_index_tile_data_name">Данные о тайлах: %1$s</string>
     <string name="base_world_map">Обзорная карта мира</string>
@@ -3608,7 +3608,7 @@
     <string name="hillshade_description">Затенение рельефа использует тёмные оттенки для отображения склонов, вершин и низменностей.</string>
     <string name="slope_download_description">Для отображения склонов на карте необходимы дополнительные карты.</string>
     <string name="download_slope_maps">Склоны</string>
-    <string name="replace_point_descr">Заменить другую точку на эту</string>
+    <string name="replace_point_descr">Заменить другую точку на эту.</string>
     <string name="changes_applied_to_profile">Изменения применены к профилю «%1$s».</string>
     <string name="settings_item_read_error">Невозможно прочитать из «%1$s».</string>
     <string name="settings_item_write_error">Невозможно записать в «%1$s».</string>
@@ -3733,7 +3733,7 @@
     <string name="pseudo_mercator_projection">Псевдо-проекция Меркатора</string>
     <string name="one_image_per_tile">Каждый тайл в своём файле</string>
     <string name="edit_online_source">Изменить онлайн-источник</string>
-    <string name="map_source_zoom_levels">Установите минимальный и максимальный уровни масштабирования, при которых будет отображаться или загружаться онлайн-карта.</string>
+    <string name="map_source_zoom_levels">Установите минимальный и максимальный уровни масштабирования для отображения или загрузки онлайн-карты.</string>
     <string name="shared_string_always">Всегда</string>
     <string name="system_screen_timeout">Использовать системную настройку</string>
     <string name="turn_screen_on_power_button">Кнопка питания</string>
@@ -3746,7 +3746,7 @@
     <string name="expire_time">Время устаревания</string>
     <string name="mercator_projection">Проекция Меркатора</string>
     <string name="storage_format">Формат хранения</string>
-    <string name="expire_time_descr">Время устаревания в минутах. Кешированные тайлы будут перезагружены после указанного времени. Оставьте поле пустым, чтобы никогда не обновлять тайлы из этого источника. 
+    <string name="expire_time_descr">Кешированные тайлы будут перезагружены после указанного количества минут. Оставьте поле пустым, чтобы никогда не обновлять тайлы из этого источника. 
 \n 
 \nОдин день — 1440 минут. 
 \nОдна неделя — 10 080 минут. 
@@ -3755,24 +3755,30 @@
     <string name="system_screen_timeout_descr">Экран будет отключаться после периода бездействия, указанного в системных настройках устройства.</string>
     <string name="map_source_zoom_levels_descr">Эти параметры влияют на отображение при использовании в качестве карты или подложки. 
 \n 
-\n%1$s: карта будет ограничена выбранными масштабами. 
+\n%1$s: карта будет ограничена выбранными уровнями масштабирования. 
 \n 
-\n%2$s: уровни масштабирования, при которых будут видны оригинальные тайлы. Увеличение и уменьшение масштаба может происходить вне этих значений.</string>
+\n%2$s: уровни масштабирования, при которых будут видны оригинальные тайлы; увеличение и уменьшение масштаба может происходить вне этих значений.</string>
     <string name="screen_control">Управление экраном</string>
     <string name="turn_screen_on_options_descr">Параметры включения экрана:</string>
     <string name="turn_screen_on_descr">Настройки включения экрана (убедитесь, что перед блокировкой устройства OsmAnd находится на переднем плане):</string>
     <string name="default_screen_timeout">Настройка отключения экрана по умолчанию</string>
-    <string name="export_import_quick_actions_with_profiles_promo">Вы можете экспортировать или импортировать быстрые действия вместе с профилями.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Вы можете экспортировать или импортировать быстрые действия вместе с профилями приложения.</string>
     <string name="shared_string_delete_all_q">Удалить все\?</string>
     <string name="delete_all_actions_message_q">Вы уверены, что хотите безвозвратно удалить %d быстрых действий\?</string>
     <string name="screen_timeout">Время экрана</string>
-    <string name="width_limit_description">Укажите ширину автомобиля, для больших транспортных средств могут применяться ограничения на некоторых маршрутах.</string>
+    <string name="width_limit_description">Укажите ширину автомобиля, для широких транспортных средств могут применяться ограничения на маршруте.</string>
-    <string name="height_limit_description">Укажите высоту автомобиля, для больших транспортных средств могут применяться ограничения на некоторых маршрутах.</string>
+    <string name="height_limit_description">Укажите высоту автомобиля, для высоких транспортных средств могут применяться ограничения на маршруте.</string>
-    <string name="weight_limit_description">Укажите вес автомобиля, для тяжёлых транспортных средств могут применяться ограничения на некоторых маршрутах.</string>
+    <string name="weight_limit_description">Укажите вес автомобиля, для тяжёлых транспортных средств могут применяться ограничения на маршруте.</string>
     <string name="shared_string_tones">тонны</string>
     <string name="shared_string_meters">метры</string>
     <string name="details_dialog_decr">Управление отображением дополнительных деталей на карте</string>
     <string name="shared_string_all_time">Всё время</string>
     <string name="shared_string_night_map">Ночная карта</string>
     <string name="turn_screen_on_power_button_disabled">Отключено. Необходимо включить «Держать экран включённым» в разделе «Время работы после пробуждения».</string>
+    <string name="clear_tiles_warning">Применение этих изменений приведёт к очистке кешированных данных этого источника тайлов</string>
+    <string name="add_online_source">Добавить онлайн-источник</string>
+    <string name="vessel_height_warning_link">Указать высоту судна</string>
+    <string name="vessel_height_warning">Вы можете указать высоту судна, чтобы избегать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
+    <string name="vessel_height_limit_description">Укажите высоту судна, чтобы избежать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
+    <string name="vessel_width_limit_description">Укажите ширину судна, чтобы избежать узких мостов</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -119,16 +119,16 @@
     <string name="about_version">Versione:</string>
     <string name="shared_string_about">Informatziones</string>
     <string name="about_settings_descr">Informatziones de sa versione, litzèntzias, membros de su progetu</string>
-    <string name="local_index_tile_data_zooms">Ismanniamentos iscarrigados: %1$s</string>
+    <string name="local_index_tile_data_zooms">Livellos de ismanniamentu iscarrigados: %1$s</string>
-    <string name="local_index_tile_data_expire">Iscadèntzia (minutos): %1$s</string>
+    <string name="local_index_tile_data_expire">Tempus de iscadèntzia (minutos): %1$s</string>
     <string name="local_index_tile_data_downloadable">Iscarrigàbiles: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Ismanniamentu màssimu: %1$s</string>
     <string name="local_index_tile_data_minzoom">Ismanniamentu mìnimu: %1$s</string>
     <string name="local_index_tile_data_name">Datos tasseddos: %1$s</string>
-    <string name="edit_tilesource_successfully">Sa mitza %1$s de sas imbrèstias est istada sarvada</string>
+    <string name="edit_tilesource_successfully">Mitza de tasseddos %1$s sarvada</string>
-    <string name="edit_tilesource_elliptic_tile">Mercatore ellitticu</string>
+    <string name="edit_tilesource_elliptic_tile">Projetzione de Mercatore ellìtica</string>
     <string name="edit_tilesource_maxzoom">Ismanniamentu màssimu</string>
-    <string name="edit_tilesource_expiration_time">Iscadèntzia (minutos)</string>
+    <string name="edit_tilesource_expiration_time">Tempus de iscadèntzia (minutos)</string>
     <string name="edit_tilesource_minzoom">Ismanniamentu mìnimu</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Ischerta intre sos esistentes…</string>
@@ -137,8 +137,8 @@
     <string name="driving_region">Regione de ghia</string>
     <string name="driving_region_us">Istados Unidos</string>
     <string name="driving_region_canada">Cànada</string>
-    <string name="driving_region_europe_asia">Europa, Àsia, Amèrica latina e sìmiles</string>
+    <string name="driving_region_europe_asia">Europa, Àsia, Amèrica latina e simigiantes</string>
-    <string name="driving_region_uk">UK, Ìndia, e sìmiles</string>
+    <string name="driving_region_uk">UK, Ìndia, e simigiantes</string>
     <string name="driving_region_descr">Issèbera sa regione de ghia: USA, Europa, UK, Àsia e àteras.</string>
     <string name="driving_region_japan">Giapone</string>
     <string name="speak_title">Annuntzia…</string>
@@ -3177,7 +3177,7 @@
     <string name="turn_screen_on_router">Allughe in sas bortadas</string>
     <string name="turn_screen_on_time_descr">Imposta pro cantu tempus s\'ischermu at a abarrare allutu.</string>
     <string name="turn_screen_on_sensor">Imprea su sensore de prossimidade</string>
-    <string name="turn_screen_on_sensor_descr">Cola sa manu tua in dae in antis de s\'ala superiore de s\'ischermu pro l\'allùghere durante sa navigatzione.</string>
+    <string name="turn_screen_on_sensor_descr">Colende sa manu tua in dae in antis de s\'ischermu l\'as a allùghere.</string>
     <string name="rendering_attr_highway_class_track_grade1_name">Gradu 1</string>
     <string name="rendering_attr_highway_class_track_grade2_name">Gradu 2</string>
     <string name="rendering_attr_highway_class_track_grade3_name">Gradu 3</string>
@@ -3485,7 +3485,7 @@
     <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
     <string name="sunset_at">Intrinada a sas %1$s</string>
     <string name="sunrise_at">Arbèschida a sas %1$s</string>
-    <string name="monitoring_min_accuracy_descr">Custu at a registrare petzi sos puntos medidos cun un\'acuradesa mìnima indicada (in metros/pees, comente benit sinnaladu dae Android pro su chipset tuo). S\'acuradesa si riferit a sa dispersione de movimentos torrados a repìtere, e no est ligada diretamente a sa pretzisione, chi definit canto sa medida tua est a curtzu a sa positzione bera tua.</string>
+    <string name="monitoring_min_accuracy_descr">Custu at a registrare petzi sos puntos medidos cun un\'acuradesa mìnima indicada (in metros/pees, comente benit sinnaladu dae Android pro su chipset tuo). S\'acuradesa est sa prossimidade de sas medidas a sa positzione bera tua, e no est ligara diretamente a sa pretzizione, chi est sa dispersione de movimentos torrados a repìtere.</string>
     <string name="reset_to_default_category_button_promo">\'Riprìstina sos valores predefinidos\' at a torrare a impostare s\'òrdine predefinidu de installatzione.</string>
     <string name="accessibility_mode_disabled">Sa modalidade de atzessibilidade est istudada in su sistema Android tuo.</string>
     <string name="use_system_screen_timeout">Imprea su tempus de isetu de s\'ischermu de su sistema</string>
@@ -3609,7 +3609,7 @@
     <string name="shared_string_octagon">Otàgonu</string>
     <string name="shared_string_square">Cuadradu</string>
     <string name="shared_string_min">Mìn</string>
-    <string name="replace_point_descr">Remplasa un\'àteru puntu cun custu</string>
+    <string name="replace_point_descr">Remplasa un\'àteru puntu cun custu.</string>
     <string name="app_mode_ski_touring">Iscì-alpinismu</string>
     <string name="app_mode_ski_snowmobile">Motoislita</string>
     <string name="custom_osmand_plugin">Estensione de OsmAnd personalizada</string>
@@ -3640,7 +3640,7 @@
     <string name="move_inside_category">Podes mòere elementos in intro de custa categoria ebbia.</string>
     <string name="developer_plugin">Estensione pro sos isvilupadores</string>
     <string name="shared_string_items">Elementos</string>
-    <string name="select_wikipedia_article_langs">Issèbera sa limba in sa cale sos artìculos de Wikipedia ant a aparire in sa mapa. Podes colare dae una limba a s\'àtera cando ses leghende s\'artìculu.</string>
+    <string name="select_wikipedia_article_langs">Issèbera sa limba pro sos artìculos de Wikipedia in sa mapa. Cola dae una limba disponìbile a s\'àtera cando ses leghende s\'artìculu.</string>
     <string name="some_articles_may_not_available_in_lang">Unos cantos artìculos de Wikipedia diant pòdere no èssere a disponimentu in sa limba tua.</string>
     <string name="lang_zhyue">Cantonesu</string>
     <string name="lang_zhminnan">Min meridionale</string>
@@ -3728,13 +3728,60 @@
     <string name="profiles_for_action_not_found">Impossìbile a agatare custos profilos.</string>
     <string name="index_item_world_basemap_detailed">Mapa mundiale generale (a sa minuda)</string>
     <string name="unsupported_type_error">Casta non suportada</string>
-    <string name="tiles_storage_descr">Issèbera comente sos tasseddos iscarrigados ant a èssere sarvados.</string>
+    <string name="tiles_storage_descr">Issèbera comente sarvare sos tasseddos iscarrigados.</string>
     <string name="export_import_quick_actions_with_profiles_promo">Podes esportare o importare atziones lestras cun profilos de s\'aplicatzione.</string>
     <string name="shared_string_delete_all_q">Iscantzellare totu\?</string>
     <string name="delete_all_actions_message_q">Ses seguru de chèrrere iscantzellare definitivamente %d atziones lestras\?</string>
     <string name="shared_string_all_time">Totu su tempus</string>
     <string name="shared_string_meters">metros</string>
-    <string name="details_dialog_decr">Controlla sa visibilidade de delàllios additzionales ammustrados in sa mapa</string>
+    <string name="details_dialog_decr">Ammustra o cua sos detàllios additzionales in sa mapa</string>
     <string name="shared_string_night_map">Mapa noturna</string>
     <string name="shared_string_tones">sonerias</string>
+    <string name="map_source_zoom_levels_descr">Custos paràmetros ant a influentzare sa vista cando benit impreados comente mapa o istradu superiore/inferiore.
+\n
+\n%1$s: Sa mapa at a èssere limitada a s\'intervallu de ismanniamentu ischertadu. 
+\n
+\n%2$s sunt sos livellos de ismanniamentu pro sos cales sos tasseddos originales ant a èssere visìbiles. In foras de custos valores b\'at a èssere s\'ismanniamentu o sa minimadura de iscala.</string>
+    <string name="width_limit_description">Inserta sa largària de su veìculu tuo, ca unas cantas restritziones si diat pòdere aplicare pro veìculos largos ebbia.</string>
+    <string name="height_limit_description">Inserta s\'artària de su veìculu tuo, ca unas cantas restritziones si diat pòdere aplicare pro veìculos artos ebbia.</string>
+    <string name="weight_limit_description">Inserta su pesu de su veìculu tuo, ca unas cantas restritziones si diat pòdere aplicare pro veìculos pesantes ebbia.</string>
+    <string name="gpx_parse_error">Su GPX de OsmAnd no est fraigadu bene, pro praghere cuntata s\'iscuadra de suportu pro investigare prus a fundu.</string>
+    <string name="system_screen_timeout_descr">Istudat s\'ischermu sighende sas impostatziones de sistema.</string>
+    <string name="system_screen_timeout">Imprea su tempus de istudadura de sistema</string>
+    <string name="turn_screen_on_descr">Ischerta sas optziones de allughidura de s\'ischermu (assegura·ti chi OsmAnd siat in primu pranu cando ses blochende su dispositivu):</string>
+    <string name="turn_screen_on_navigation_instructions_descr">Cada indicatzione de navigatzione at a allùghere s\'ischermu.</string>
+    <string name="turn_screen_on_navigation_instructions">Indicatziones de navigatzione</string>
+    <string name="turn_screen_on_power_button_disabled">Disabilitadu. Tenet bisòngiu de \'Mantene s\'ischermu allutu\' in suta de \'Tempus de allughidura\'.</string>
+    <string name="turn_screen_on_power_button_descr">Incarchende su butone de allughidura de su dispositivu as a allùghere s\'ischermu cun OsmAnd in subra a s\'ischermada de blocu.</string>
+    <string name="turn_screen_on_wake_time_descr">Issèbera sa longària de istudadura de s\'ischermu a pustis de s\'allughidura. (\"%1$s\" non ponet tempus perunu.)</string>
+    <string name="map_source_zoom_levels">Imposta unu livellu de ismanniamentu mìnimu e unu màssimu pro ammustrare o carrigare sa mapa in lìnia.</string>
+    <string name="expire_time_descr">Sos tasseddos ant a èssere torrados a carrigare a pustis de su nùmeru de minutos dillindados. Lassa custu campu bòidu pro no annoare mai sos tasseddos pro custa mitza. 
+\n
+\nUna die sunt 1440 minutos.
+\nUna chida sunt is 10 080 minutos.
+\nUnu mese sunt 43 829 minutos.</string>
+    <string name="shared_string_always">Semper</string>
+    <string name="screen_control">Controllu de s\'ischermu</string>
+    <string name="turn_screen_on_power_button">Butone de allughidura</string>
+    <string name="turn_screen_on_proximity_sensor">Sensore de prossimidade</string>
+    <string name="keep_screen_on">Mantene s\'ischermu allutu</string>
+    <string name="keep_screen_off">Mantene s\'ischermu istudadu</string>
+    <string name="pseudo_mercator_projection">Projetzione de psèudo-Mercadore</string>
+    <string name="one_image_per_tile">Unu documentu de immàgine pro tasseddu</string>
+    <string name="sqlite_db_file">Documentu SQLiteDB</string>
+    <string name="online_map_name_helper_text">Fruni unu nùmene pro sa mitza de sa mapa in lìnia.</string>
+    <string name="online_map_url_helper_text">Inserta o incolla s\'URL pro sa mitza in lìnia.</string>
+    <string name="edit_online_source">Modìfica sa mitza in lìnia</string>
+    <string name="expire_time">Tempus de iscadida</string>
+    <string name="mercator_projection">Projetzione de Mercatore</string>
+    <string name="storage_format">Formadu de sarvamentu</string>
+    <string name="screen_timeout">Tempus de su blocu de s\'ischermu</string>
+    <string name="screen_timeout_descr">Si \"%1$s\" est allutu, su tempus de atividade at a dipèndere dae issu.</string>
+    <string name="default_screen_timeout">Tempus de blocu de s\'ischermu predefinidu</string>
+    <string name="add_online_source">Annanghe una mitza in lìnia</string>
+    <string name="clear_tiles_warning">Aplichende custas modìficas as a isboidare sa memòria temporànea pro custa mitza de tasseddos</string>
+    <string name="vessel_height_warning_link">Imposta s\'artària de sa barca</string>
+    <string name="vessel_height_warning">Podes impostare s\'artària de sa barca pro evitare sos pontes bassos. Ammenta·ti chi, si su ponte est mòbile, amus a impreare s\'artària sua de cando est abertu.</string>
+    <string name="vessel_height_limit_description">Imposta s\'artària de sa barca pro evitare sos pontes bassos. Ammenta·ti chi, si su ponte est mòbile, amus a impreare s\'artària sua de cando est abertu.</string>
+    <string name="vessel_width_limit_description">Imposta sa largària de sa barca pro evitare pontes astrintos</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -992,15 +992,15 @@
     <string name="about_version">Verzia:</string>
     <string name="shared_string_about">O programe</string>
     <string name="about_settings_descr">Informácie o verzii, licencie, členovia projektu</string>
-    <string name="local_index_tile_data_zooms">Stiahnuté priblíženia: %1$s</string>
+    <string name="local_index_tile_data_zooms">Stiahnuté úrovne priblíženia: %1$s</string>
     <string name="local_index_tile_data_downloadable">Stiahnuteľné: %1$s</string>
-    <string name="local_index_tile_data_expire">Vypršanie (v minútach): %1$s</string>
+    <string name="local_index_tile_data_expire">Čas exspirácie (v minútach): %1$s</string>
     <string name="local_index_tile_data_maxzoom">Maximálne priblíženie: %1$s</string>
     <string name="local_index_tile_data_minzoom">Minimálne priblíženie: %1$s</string>
     <string name="local_index_tile_data_name">Údaje dlaždíc: %1$s</string>
-    <string name="edit_tilesource_successfully">Zdroj dlaždíc %1$s bol uložený</string>
+    <string name="edit_tilesource_successfully">Zdroj dlaždíc %1$s uložený</string>
     <string name="edit_tilesource_maxzoom">Maximálne priblíženie</string>
-    <string name="edit_tilesource_expiration_time">Vypršanie (v minútach)</string>
+    <string name="edit_tilesource_expiration_time">Čas exspirácie (v minútach)</string>
     <string name="edit_tilesource_minzoom">Minimálne priblíženie</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Zvoliť existujúci…</string>
@@ -1029,7 +1029,7 @@
     <string name="av_camera_focus_continuous">Fotoaparát sa bude pokúšať ostriť priebežne</string>
     <string name="av_photo_play_sound">Prehrať zvuk pri zachytení snímky</string>
     <string name="av_photo_play_sound_descr">Nastaviť zvuk či ticho pri odfotografovaní snímky.</string>
-    <string name="edit_tilesource_elliptic_tile">Eliptický mercator</string>
+    <string name="edit_tilesource_elliptic_tile">Eliptické Mercatove zobrazenie</string>
     <string name="base_world_map">Základná mapa sveta</string>
     <string name="map_magnifier">Zväčšenie mapy</string>
     <string name="auto_zoom_none">Žiadne automatické približovanie</string>
@@ -2213,7 +2213,7 @@
     <string name="route_points_category_name">Zákruty potrebné na tejto trase</string>
     <string name="track_points_category_name">Waypointy, body záujmu, pomenované objekty</string>
     <string name="add_new_folder">Pridať nový priečinok</string>
-    <string name="shared_string_slope">Svah</string>
+    <string name="shared_string_slope">Sklon svahu</string>
     <string name="lang_ber">Berbersky</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">Pahorkatý</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Menej pahorkatý</string>
@@ -3574,22 +3574,22 @@
     <string name="shared_string_import_complete">Import ukončený</string>
     <string name="import_complete_description">Všetky údaje z %1$s sú naimportované, môžete použiť tlačidlá nižšie pre otvorenie príslušnej časti aplikácie pre ich správu.</string>
     <string name="shared_string_terrain">Terén</string>
-    <string name="hillshade_description">Tieňované svahy používajú tmavé odtiene pre vyjadrenie svahov, vrcholov a nížin.</string>
+    <string name="hillshade_description">Tieňované svahy používajú tmavé odtiene pre vyjadrenie sklonov svahov, vrcholov a nížin.</string>
-    <string name="slope_description">Svahy používajú farby na vizualizáciu strmosti terénu.</string>
+    <string name="slope_description">Sklony svahov používajú farby na vizualizáciu strmosti terénu.</string>
     <string name="terrain_slider_description">Nastavte minimálnu a maximálnu úroveň priblíženia kedy bude vrstva zobrazená.</string>
     <string name="hillshade_download_description">Pre zobrazenie tieňovaných svahov sú potrebné ďalšie mapy.</string>
-    <string name="slope_download_description">Pre zobrazenie svahov sú potrebné ďalšie mapy.</string>
+    <string name="slope_download_description">Pre zobrazenie sklonov svahov sú potrebné ďalšie mapy.</string>
-    <string name="slope_read_more">Môžete si prečítať viac o svahoch na %1$s.</string>
+    <string name="slope_read_more">Môžete si prečítať viac o sklonoch svahov na %1$s.</string>
     <string name="shared_string_transparency">Priehľadnosť</string>
     <string name="shared_string_zoom_levels">Úrovne priblíženia</string>
     <string name="shared_string_legend">Legenda</string>
-    <string name="terrain_empty_state_text">Zapnite pre zobrazenie mapy tieňovaných svahov alebo svahov. O týchto typoch máp sa dozviete viac na našej stránke.</string>
+    <string name="terrain_empty_state_text">Zapnite pre zobrazenie mapy tieňovaných svahov alebo sklonov svahov. O týchto typoch máp sa dozviete viac na našej stránke.</string>
     <string name="shared_string_hillshade">Tieňované svahy</string>
     <string name="recalculate_route_in_deviation">Prepočítať trasu v prípade odchýlenia</string>
     <string name="select_distance_route_will_recalc">Zvoľte vzdialenosť, po ktorej bude trasa prepočítaná.</string>
     <string name="recalculate_route_distance_promo">Trasa bude prepočítaná ak vzdialenosť od trasy k aktuálnej polohe je väčšia ako zvolená hodnota.</string>
     <string name="n_items_of_z">%1$s z %2$s</string>
-    <string name="download_slope_maps">Svahy</string>
+    <string name="download_slope_maps">Sklony svahov</string>
     <string name="quick_action_show_hide_terrain">Zobraziť / skryť terén</string>
     <string name="quick_action_terrain_hide">Skryť terén</string>
     <string name="quick_action_terrain_show">Zobraziť terén</string>
@@ -3606,7 +3606,7 @@
     <string name="app_mode_ski_touring">Lyžiarske okruhy</string>
     <string name="app_mode_ski_snowmobile">Snežný skúter</string>
     <string name="custom_osmand_plugin">Vlastný modul pre OsmAnd</string>
-    <string name="replace_point_descr">Nahradiť iný bod týmto</string>
+    <string name="replace_point_descr">Nahradiť iný bod týmto.</string>
     <string name="changes_applied_to_profile">Zmeny boli použité na profil \"%1$s\".</string>
     <string name="settings_item_read_error">Nepodarilo sa prečítať z \"%1$s\".</string>
     <string name="settings_item_write_error">Nepodarilo sa zapísať do \"%1$s\".</string>
@@ -3639,7 +3639,7 @@
     <string name="custom_color">Vlastná farba</string>
     <string name="extra_maps_menu_group">Ďalšie mapy</string>
     <string name="download_unsupported_action">Nepodporovaná akcia %1$s</string>
-    <string name="select_wikipedia_article_langs">Zvoľte jazyky, v ktorých sa zobrazia články Wikipedia na mape. Počas čítania článku môžete prepnúť medzi všetkými dostupnými jazykmi.</string>
+    <string name="select_wikipedia_article_langs">Zvoľte jazyky článkov Wikipedia na mape. Počas čítania článku môžete prepnúť medzi všetkými dostupnými jazykmi.</string>
     <string name="some_articles_may_not_available_in_lang">Niektoré články Wikipedia nemusia byť dostupné vo vašom jazyku.</string>
     <string name="lang_zhyue">Kantonsky</string>
     <string name="lang_zhminnan">Južnominsky</string>
@@ -3688,7 +3688,7 @@
     <string name="osmand_purchases_item">Nákupy v OsmAnd</string>
     <string name="legend_item_description">Sprievodca symbolmi na mape.</string>
     <string name="navigation_profiles_item">Navigačné profily</string>
-    <string name="release_3_7">• Nové offline mapy svahov
+    <string name="release_3_7">• Nové offline mapy sklonov svahov
 \n 
 \n • Plné prispôsobenie Obľúbených a bodov GPX – vlastné farby, ikony a tvary 
 \n 
@@ -3725,7 +3725,7 @@
     <string name="unsupported_type_error">Nepodporovaný typ</string>
     <string name="shared_string_always">Vždy</string>
     <string name="turn_screen_on_descr">Vyberte možnosti prebudenia obrazovky (pri uzamknutí zariadenia sa uistite, že je OsmAnd v popredí):</string>
-    <string name="screen_timeout_descr">Ak je voľba \"%1$s\" zapnutá, čas aktivity bude na nej závisieť.</string>
+    <string name="screen_timeout_descr">Ak je \"%1$s\" zapnuté, čas aktivity bude na tom závisieť.</string>
     <string name="one_image_per_tile">Jeden obrazový súbor na dlaždicu</string>
     <string name="system_screen_timeout">Použiť systémový časový limit obrazovky</string>
     <string name="turn_screen_on_options_descr">Možnosti prebudenia obrazovky:</string>
@@ -3742,7 +3742,7 @@
     <string name="edit_online_source">Upraviť online zdroj</string>
     <string name="expire_time">Čas vypršania platnosti</string>
     <string name="storage_format">Formát úložiska</string>
-    <string name="map_source_zoom_levels">Nastavte minimálnu a maximálnu úroveň priblíženia, pri ktorej sa zobrazí alebo načíta online mapa.</string>
+    <string name="map_source_zoom_levels">Nastavte minimálnu a maximálnu úroveň priblíženia, kedy sa zobrazí alebo načíta online mapa.</string>
     <string name="tiles_storage_descr">Vyberte spôsob uloženia prevzatých dlaždíc.</string>
     <string name="gpx_parse_error">GPX OsmAndu nemá správny tvar, prosím kontaktuje tím podpory pre bližšie preverenie.</string>
     <string name="screen_control">Ovládanie obrazovky</string>
@@ -3750,12 +3750,12 @@
     <string name="turn_screen_on_navigation_instructions_descr">Každý navigačný pokyn zapne obrazovku.</string>
     <string name="pseudo_mercator_projection">Pseudo-Mercatorovo zobrazenie</string>
     <string name="mercator_projection">Mercatorovo zobrazenie</string>
-    <string name="map_source_zoom_levels_descr">Tieto parametre ovplyvňujú zobrazenie keď sa použije ako mapa alebo podkladová/prekryvná vrstva. 
+    <string name="map_source_zoom_levels_descr">Ovplyvňuje zobrazenie keď sa použije ako mapa alebo podkladová/prekryvná vrstva. 
 \n 
-\n%1$s: Mapa bude obmedzená na zvolené priblíženia. 
+\n%1$s: Mapa je obmedzená na zvolený rozsah priblížení. 
 \n 
-\n%2$s: Úrovne priblíženia, pri ktorých budú viditeľné pôvodné dlaždice. Mimo týchto hodnôt nastane prepočítanie bodov obrázkov.</string>
+\n%2$s sú úrovňami priblíženia, pri ktorých budú viditeľné pôvodné dlaždice. Mimo týchto hodnôt nastane prepočítanie bodov obrázkov.</string>
-    <string name="expire_time_descr">Doba platnosti v minútach. Uložené dlaždice budú znovu načítané z Internetu po tomto čase. Ponechajte toto pole prázdne ak sa pre tento zdroj nemajú dlaždice nikdy obnovovať. 
+    <string name="expire_time_descr">Uložené dlaždice budú znovu načítané z Internetu po zadanom počte minút. Ponechajte toto pole prázdne ak sa pre tento zdroj nemajú dlaždice nikdy obnovovať. 
 \n 
 \nJeden deň je 1440 minút. 
 \nJeden týždeň je 10 080 minút. 
@@ -3770,8 +3770,14 @@
     <string name="weight_limit_description">Zadajte hmotnosť vášho vozidla, pretože na trase môžu byť obmedzenia pre ťažké vozidlá.</string>
     <string name="shared_string_tones">tony</string>
     <string name="shared_string_meters">metre</string>
-    <string name="details_dialog_decr">Ovládajte viditeľnosť ďalších detailov zobrazených na mape</string>
+    <string name="details_dialog_decr">Zobraziť alebo skryť ďalšie detaily na mape</string>
     <string name="shared_string_night_map">Nočná mapa</string>
     <string name="shared_string_all_time">Vždy</string>
     <string name="turn_screen_on_power_button_disabled">Vypnuté. Vyžaduje \"Nechať obrazovku zapnutú\" pod \"Časový limit obrazovky po prebudení\".</string>
+    <string name="add_online_source">Pridať online zdroj</string>
+    <string name="clear_tiles_warning">Aplikovaním týchto zmien sa vymažú uložené dlaždice pre tento zdroj</string>
+    <string name="vessel_height_warning_link">Nastaviť výšku plavidla</string>
+    <string name="vessel_height_warning">Môžete nastaviť výšku plavidla, aby sa dalo vyhnúť nízkym mostom. Pamätajte, že pri sklápacích alebo posuvných mostoch sa zohľadní výška v otvorenom stave.</string>
+    <string name="vessel_height_limit_description">Nastavte výšku plavidla, aby sa dalo vyhnúť nízkym mostom. Pamätajte, že pri sklápacích alebo posuvných mostoch sa zohľadní výška v otvorenom stave.</string>
+    <string name="vessel_width_limit_description">Nastavte šírku plavidla, aby sa dalo vyhnúť úzkym mostom</string>
 </resources>

OsmAnd/res/values-sr/phrases.xml

@@ -163,7 +163,7 @@
     <string name="poi_musical_instrument">Музички инструменти</string>
     <string name="poi_newsagent">Новинарница</string>
     <string name="poi_optician">Оптометрија</string>
-    <string name="poi_organic">Органска храна</string>
+    <string name="poi_organic">Органски производ</string>
     <string name="poi_paint">Продавница боја</string>
     <string name="poi_pet">Продавница кућних љубимаца</string>
     <string name="poi_photo">Фото радња</string>
@@ -2731,4 +2731,9 @@
     <string name="poi_bath_open_air">На отвореном</string>
     <string name="poi_agrarian">Пољопривредна радња</string>
     <string name="poi_meadow_agricultural">Тип: пољопривредно</string>
+    <string name="poi_fire_hydrant_pressure_filter">Притисак</string>
+    <string name="poi_video_telephone">Видео</string>
+    <string name="poi_sms">СМС</string>
+    <string name="poi_volcano_status">Статус</string>
+    <string name="poi_volcano_type">Тип</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -3593,4 +3593,71 @@
     <string name="back_to_editing">Повратак уређивању</string>
     <string name="shared_string_add_profile">Додај профил</string>
     <string name="change_application_profile">Промени профил апликације</string>
+    <string name="extra_maps_menu_group">Додатне карте</string>
+    <string name="download_unsupported_action">Неподржана радња %1$s</string>
+    <string name="tracker_item">OsmAnd пратилац</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Брзе радње</string>
+    <string name="radius_ruler_item">Лењир пречника</string>
+    <string name="measure_distance_item">Измери удаљеност</string>
+    <string name="travel_item">Путовање (Wikivoyage и Википедија)</string>
+    <string name="favorites_item">Омиљени</string>
+    <string name="subscription_osmandlive_item">Претплата - OsmAnd уживо</string>
+    <string name="osmand_purchases_item">OsmAnd куповине</string>
+    <string name="legend_item_description">Упутство за легенду карте.</string>
+    <string name="navigation_profiles_item">Профили навођења</string>
+    <string name="quick_action_transport_hide">Сакриј јавни превоз</string>
+    <string name="quick_action_transport_show">Прикажи јавни превоз</string>
+    <string name="quick_action_show_hide_transport">Прикажи/сакриј јавни превоз</string>
+    <string name="quick_action_transport_descr">Дугме које приказује или скрива јавни превоз на карти.</string>
+    <string name="parking_positions">Паркинг позиције</string>
+    <string name="reset_deafult_order">Поврати подразумевани поредак ставки</string>
+    <string name="quick_action_switch_profile_descr">Акционо дугме мења између изабраних профила.</string>
+    <string name="unsupported_type_error">Неподржани тип</string>
+    <string name="width_limit_description">Унесите ширину возила, нека ограничења пута могу бити примењена за широка возила.</string>
+    <string name="height_limit_description">Унесите висину возила, нека ограничења пута могу бити примењена за висока возила.</string>
+    <string name="weight_limit_description">Унесите тежину возила, нека ограничења пута могу бити примењена за тешка возила.</string>
+    <string name="system_screen_timeout_descr">Искључи екран према системском времену закључавања.</string>
+    <string name="shared_string_always">Увек&gt;</string>
+    <string name="screen_control">Контрола екрана</string>
+    <string name="system_screen_timeout">Користи системско време закључавања екрана</string>
+    <string name="turn_screen_on_descr">Одаберите опције паљења екрана (OsmAnd треба да буде иу предњем плану када се уређај закључа):</string>
+    <string name="turn_screen_on_navigation_instructions_descr">Свака инструкција навођења ће упалити екран.</string>
+    <string name="turn_screen_on_navigation_instructions">Инструкције навођења</string>
+    <string name="turn_screen_on_power_button_descr">Притискањем дугмета за гашење уређаја ћете упалити екран са OsmAnd-ом преко закључаног екрана.</string>
+    <string name="turn_screen_on_power_button">Дугме за гашење</string>
+    <string name="turn_screen_on_proximity_sensor">Сензор близине</string>
+    <string name="keep_screen_on">Држи екран упаљеним</string>
+    <string name="keep_screen_off">Држи екран угашеним</string>
+    <string name="pseudo_mercator_projection">Псеудо-Меркатор пројекција</string>
+    <string name="one_image_per_tile">Један фајл по сличици</string>
+    <string name="sqlite_db_file">SQLiteDB фајл</string>
+    <string name="online_map_name_helper_text">Унесите име за овај мрежни извор карте.</string>
+    <string name="online_map_url_helper_text">Унесите или налепите адресу мрежног извора.</string>
+    <string name="edit_online_source">Измени мрежни извор</string>
+    <string name="expire_time">Време истека</string>
+    <string name="mercator_projection">Меркатор пројекција</string>
+    <string name="storage_format">Формат складишта</string>
+    <string name="map_source_zoom_levels">Поставите минимални и максимални ниво увеличавања који приказује или учитава мрежну карту.</string>
+    <string name="expire_time_descr">Искеширане сличице ће бити поново преузете после задатог броја минута. Оставите празно да никад не освежавате сличице из овог извора.
+\n
+\nЈедан дан је 1440 минута.
+\nНедељу дана је 10 080 минута.
+\nМесец дана је 43829 минута.</string>
+    <string name="tiles_storage_descr">Одаберите како да складиштите преузете сличице.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Можете извозити или увозити брзе радње са апликативним профилима.</string>
+    <string name="shared_string_delete_all_q">Обриши све\?</string>
+    <string name="delete_all_actions_message_q">Да ли желите бесповратно да обришете %d брзих радњи\?</string>
+    <string name="screen_timeout">Време иксључивања екрана</string>
+    <string name="default_screen_timeout">Подразумевано време иксључивања екрана</string>
+    <string name="shared_string_tones">тона</string>
+    <string name="shared_string_meters">метара</string>
+    <string name="details_dialog_decr">Прикажи или сакриј додатне детаље карте</string>
+    <string name="shared_string_night_map">Ноћна карта</string>
+    <string name="add_online_source">Додај мрежни извор</string>
+    <string name="clear_tiles_warning">Применом ових измена ћете очистити искеширане податке за овај извор сличица</string>
+    <string name="vessel_height_warning_link">Подеси висину пловила</string>
+    <string name="vessel_height_warning">Можете подесити висину пловила да избегнете ниске мостове. Имајте на уму да, уколико мост може да се помера, користићемо његову висину када је отворен.</string>
+    <string name="vessel_height_limit_description">Подесите висину пловила да избегнете ниске мостове. Имајте на уму да, уколико мост може да се помера, користићемо његову висину када је отворен.</string>
+    <string name="vessel_width_limit_description">Подесите ширину пловила и избегните уске мостове</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -724,12 +724,12 @@
     <string name="about_version">Sürüm :</string>
     <string name="shared_string_about">Hakkında</string>
     <string name="about_settings_descr">Sürüm bilgisi, lisanslar, proje üyeleri</string>
-    <string name="local_index_tile_data_expire">Sona erecek (dakika): %1$s</string>
+    <string name="local_index_tile_data_expire">Sona erme süresi (dakika): %1$s</string>
     <string name="local_index_tile_data_downloadable">İndirilebilir: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Azami yakınlaştırma: %1$s</string>
     <string name="local_index_tile_data_minzoom">Asgari yakınlaştırma: %1$s</string>
-    <string name="edit_tilesource_elliptic_tile">Eliptik izdüşümü</string>
+    <string name="edit_tilesource_elliptic_tile">Eliptik Merkatör projeksiyonu</string>
-    <string name="edit_tilesource_expiration_time">Sona erecek (dakika)</string>
+    <string name="edit_tilesource_expiration_time">Sona erme süresi (dakika)</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Mevcut olanı seç…</string>
     <string name="maps_define_edit">Tanımla/Düzenle…</string>
@@ -1003,7 +1003,7 @@
     <string name="auto_zoom_farthest">Uzun mesafeli görüntüye</string>
     <string name="map_magnifier">Harita büyüteci</string>
     <string name="base_world_map">Dünya temel haritası</string>
-    <string name="local_index_tile_data_zooms">Zvmhay indirildi : %1$s</string>
+    <string name="local_index_tile_data_zooms">İndirilen yakınlaştırma seviyeleri: %1$s</string>
     <string name="local_index_tile_data_name">Döşeme verisi : %1$s</string>
     <string name="edit_tilesource_successfully">Tilesource %1$s kaydedildi</string>
     <string name="edit_tilesource_maxzoom">En fazla yakınlaştırma</string>
@@ -3081,7 +3081,7 @@
 \n • Doğrudan uygulamadan GPX yollarını OSM\'ye yükleyin 
 \n • POI ekleyin ve onları doğrudan (veya çevrim dışıysanız daha sonra) OSM’ye yükleyin
 \n</string>
-    <string name="osmand_extended_description_part8">OsmAnd aktif olarak geliştirilen açık kaynaklı bir yazılımdır. Herkes hataları bildirerek, çevirileri iyileştirerek veya yeni özellikler kodlayarak uygulamaya katkıda bulunabilir. Ek olarak, proje kodlama ve yeni işlevselliklerin test edilmesine fon sağlama konusunda finansal katkılara dayanmaktadır.
+    <string name="osmand_extended_description_part8">OsmAnd aktif olarak geliştirilen açık kaynaklı bir yazılımdır. Herkes hataları bildirerek, çevirileri iyileştirerek veya yeni özellikler kodlayarak uygulamaya katkıda bulunabilir. Ek olarak proje, kodlama ve yeni işlevselliklerin test edilmesine fon sağlama konusunda finansal katkılara dayanmaktadır.
 \n Yaklaşık harita kapsamı ve kalitesi:
 \n • Batı Avrupa: ****
 \n • Doğu Avrupa: ***
@@ -3150,7 +3150,7 @@
 \n • Orta Doğu: **
 \n • Afrika: **
 \n • Antarktika: *
-\n Dünya üzerindeki çoğu ülke indirme olarak mevcut
+\n Dünyadaki çoğu ülke indirmeye hazır
 \n Afganistan\'dan Zimbabve\'ye, Avustralya\'dan ABD\'ye. Arjantin, Brezilya, Kanada, Fransa, Almanya, Meksika, İngiltere, İspanya, …
 \n</string>
     <string name="save_poi_too_many_uppercase">İsim çok fazla büyük harf içermektedir. Devam et\?</string>
@@ -3561,7 +3561,7 @@
     <string name="shared_string_octagon">Sekizgen</string>
     <string name="shared_string_square">Kare</string>
     <string name="shared_string_min">Min</string>
-    <string name="replace_point_descr">Başka bir noktayı bununla değiştirin</string>
+    <string name="replace_point_descr">Başka bir noktayı bununla değiştirin.</string>
     <string name="app_mode_ski_touring">Kayak turu</string>
     <string name="app_mode_ski_snowmobile">Kar arabası</string>
     <string name="custom_osmand_plugin">Özel OsmAnd eklentisi</string>
@@ -3592,7 +3592,7 @@
     <string name="main_actions">Ana eylemler</string>
     <string name="move_inside_category">Ögeleri yalnızca bu kategorinin içine taşıyabilirsiniz.</string>
     <string name="developer_plugin">Geliştirici Eklentisi</string>
-    <string name="select_wikipedia_article_langs">Wikipedia makalelerinin haritada görüneceği dilleri seçin. Makaleyi okurken kullanılabilir bütün diller arasında geçiş yapabilirsiniz.</string>
+    <string name="select_wikipedia_article_langs">Haritadaki Wikipedia makalelerinin dillerini seçin. Makaleyi okurken kullanılabilir herhangi bir dile geçiş yapın.</string>
     <string name="some_articles_may_not_available_in_lang">Bazı Wikipedia makaleleri sizin dilinizde mevcut olmayabilir.</string>
     <string name="lang_zhyue">Kantonca</string>
     <string name="lang_zhminnan">Güney Min</string>
@@ -3683,7 +3683,7 @@
     <string name="gpx_parse_error">OsmAnd GPX doğru biçimlendirilmemiş, daha derinlemesine incelemek için lütfen destek ekibiyle iletişime geçin.</string>
     <string name="shared_string_always">Her zaman</string>
     <string name="screen_control">Ekran denetimi</string>
-    <string name="system_screen_timeout_descr">Sistemin ekran zaman aşımından sonra ekranı kapatır.</string>
+    <string name="system_screen_timeout_descr">Sistemin ekran zaman aşımına göre ekranı kapatır.</string>
     <string name="system_screen_timeout">Sistemin ekran zaman aşımını kullan</string>
     <string name="turn_screen_on_options_descr">Ekran uyandırma seçenekleri:</string>
     <string name="turn_screen_on_descr">Ekran uyandırma seçeneklerini seçin (aygıt kilitlenirken OsmAnd\'ın ön planda olduğundan emin olun):</string>
@@ -3695,7 +3695,7 @@
     <string name="turn_screen_on_wake_time_descr">Uyandıktan sonra ekran zaman aşımını seçin. (\"%1$s\" zaman aşımı uygulamaz.)</string>
     <string name="keep_screen_on">Ekranı açık tut</string>
     <string name="keep_screen_off">Ekranı kapalı tut</string>
-    <string name="screen_timeout_descr">\"%1$s\" seçeneği etkinleştirilirse, etkinlik süresi buna bağlı olacaktır.</string>
+    <string name="screen_timeout_descr">\"%1$s\" açıksa, etkinlik süresi buna bağlı olacaktır.</string>
     <string name="pseudo_mercator_projection">Pseudo-Mercator projeksiyon</string>
     <string name="one_image_per_tile">Döşeme başına bir görüntü dosyası</string>
     <string name="sqlite_db_file">SQLiteDB dosyası</string>
@@ -3703,15 +3703,15 @@
     <string name="online_map_url_helper_text">Çevrim içi kaynağın URL\'sini girin veya yapıştırın.</string>
     <string name="edit_online_source">Çevrim içi kaynağı düzenle</string>
     <string name="expire_time">Sona erme zamanı</string>
-    <string name="mercator_projection">Mercator Projeksiyonu</string>
+    <string name="mercator_projection">Mercator projeksiyonu</string>
     <string name="storage_format">Depolama biçimi</string>
-    <string name="map_source_zoom_levels">Çevrim içi haritanın görüntüleneceği veya yükleneceği en düşük ve en yüksek yakınlaştırma seviyelerini ayarlayın.</string>
+    <string name="map_source_zoom_levels">Çevrim içi haritayı göstermek veya yüklemek için en düşük ve en yüksek yakınlaştırma seviyesini ayarlayın.</string>
-    <string name="map_source_zoom_levels_descr">Bu parametreler, harita veya üst/alt katman olarak kullanıldığında görüntüyü etkileyecektir.
+    <string name="map_source_zoom_levels_descr">Harita veya üst/alt katman olarak kullanıldığında ekranı etkiler. 
 \n 
-\n%1$s: Harita seçilen yakınlaştırmalarla sınırlı olacaktır.
+\n%1$s: Harita seçilen yakınlaştırma seviyesi aralığıyla sınırlıdır. 
 \n 
-\n%2$s: Orijinal döşemelerin görüneceği yakınlaştırma seviyeleri. Ölçeği arttırma veya azaltma, bu değerlerin dışında meydana gelecektir.</string>
+\n%2$s, orijinal döşemelerin görüneceği seviyelerdir, ölçeği arttırma veya azaltma, bu değerlerin dışında gerçekleşecektir.</string>
-    <string name="expire_time_descr">Dakika cinsinden geçerliliğin sona erme süresi. Önbelleğe alınan döşemeler belirtilen süreden sonra yeniden yüklenecektir. Bu kaynak için döşemeleri hiçbir zaman yeniden yüklememek için bu alanı boş bırakın.
+    <string name="expire_time_descr">Önbelleğe alınan döşemeler belirtilen dakika kadar süreden sonra yeniden indirilecektir. Bu kaynak için döşemeleri hiçbir zaman yeniden yüklememek için bu alanı boş bırakın. 
 \n 
 \nBir gün 1440 dakikadır. 
 \nBir hafta 10 080 dakikadır. 
@@ -3726,9 +3726,15 @@
     <string name="height_limit_description">Aracınızın yüksekliğini belirtin, yüksek araçlar için bazı güzergah kısıtlamaları geçerli olabilir.</string>
     <string name="weight_limit_description">Aracınızın ağırlığını belirtin, ağır araçlar için bazı güzergah kısıtlamaları geçerli olabilir.</string>
     <string name="shared_string_meters">metre</string>
-    <string name="details_dialog_decr">Haritada gösterilen ek ayrıntıların görünürlüğünü denetleyin</string>
+    <string name="details_dialog_decr">Ek harita ayrıntılarını göster veya gizle</string>
     <string name="shared_string_night_map">Gece haritası</string>
     <string name="shared_string_all_time">Her zaman</string>
     <string name="shared_string_tones">ton</string>
     <string name="turn_screen_on_power_button_disabled">Devre dışı. \'Uyandıktan sonra zaman aşımı\' altındaki \'Ekranı açık tut\' seçeneği gerekir.</string>
+    <string name="add_online_source">Çevrim içi kaynak ekle</string>
+    <string name="clear_tiles_warning">Bu değişiklikleri uygulamak, bu döşeme kaynağı için önbelleğe alınan verileri temizleyecektir</string>
+    <string name="vessel_height_warning_link">Gemi yüksekliğini ayarla</string>
+    <string name="vessel_height_warning">Alçak köprülerden kaçınmak için gemi yüksekliğini ayarlayabilirsiniz. Köprü hareket edebiliyorsa, açık durumdaki yüksekliğini kullanacağımızı unutmayın.</string>
+    <string name="vessel_height_limit_description">Alçak köprülerden kaçınmak için gemi yüksekliğini ayarlayın. Köprü hareket edebiliyorsa, açık durumdaki yüksekliğini kullanacağımızı unutmayın.</string>
+    <string name="vessel_width_limit_description">Dar köprülerden kaçınmak için gemi genişliğini ayarlayın</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -34,7 +34,7 @@
     <string name="index_settings_descr">Завантаження, перегляд подробиць та керування локальними мапами.</string>
     <string name="map_online_plugin_is_not_installed">Увімкніть втулок \'Мережеві мапи\', щоб вибирати різні джерела мап</string>
     <string name="map_online_data">Мережеві мапи (растрові)</string>
-    <string name="map_online_data_descr">Використовувати мережеві мапи (завантажити та кешувати плитки на карті пам\'яті).</string>
+    <string name="map_online_data_descr">Використовувати мережеві мапи (завантажити та кешувати тайли на карті пам\'яті).</string>
     <string name="shared_string_online_maps">Мережеві мапи</string>
     <string name="online_map_settings_descr">Оберіть мережеві або кешовані джерела (тайлів) мап.</string>
     <string name="osmand_rastermaps_plugin_description">Цей втулок надає можливість отримати доступ до багатьох видів мережевих (так званих растрових) мап які Ви хочете, від попередньо створених квадратів OpenStreetMap (на зразок стилю Mapnik) до супутникових знімків та особливих шарів, як-от погодні, кліматичні та землезнавчі (геологічні) мапи, шари рельєфу тощо. 
@@ -289,7 +289,7 @@
     <string name="map_overlay">Верхній шар</string>
     <string name="map_overlay_descr">Виберіть накладку для основної мапи</string>
     <string name="tile_source_already_installed">Мапа вже встановлена, \'Налаштування\' будуть оновлені.</string>
-    <string name="select_tile_source_to_install">Виберіть (плиткові) мапи для встановлення або оновлення.</string>
+    <string name="select_tile_source_to_install">Виберіть (тайлові) мапи для встановлення або оновлення.</string>
     <string name="internet_not_available">Неможливо виконати операцію без підключення до Інтернету.</string>
     <string name="install_more">Завантажити ще…</string>
     <string name="level_to_switch_vector_raster_descr">Використовувати растрові мапи для будь-чого поза цим рівнем.</string>
@@ -404,7 +404,7 @@
     <string name="phone">телефон</string>
     <string name="download_type_to_filter">фільтрувати</string>
     <string name="use_high_res_maps">Дисплей високої роздільної здатності</string>
-    <string name="use_high_res_maps_descr">Не розтягувати (із розмиттям) плитки мап на дисплеях з високою роздільною здатністю.</string>
+    <string name="use_high_res_maps_descr">Не розтягувати (із розмиттям) тайли мап на дисплеях з високою роздільною здатністю.</string>
     <string name="context_menu_item_search_transport">Шукати громадський транспорт</string>
     <string name="transport_searching_transport">Пошук транспорту (нема цілі):</string>
     <string name="transport_searching_route">Пошук транспорту ({0} до цілі):</string>
@@ -621,7 +621,7 @@
     <string name="use_internet">Використовувати Інтернет</string>
     <string name="show_location">Показати Ваше місцерозташування</string>
     <string name="show_gps_coordinates_text">Показати GPS-координати на мапі</string>
-    <string name="use_internet_to_download_tile">Завантажити відсутні плитки мапи</string>
+    <string name="use_internet_to_download_tile">Завантажити відсутні тайли мапи</string>
     <string name="app_description">Навігаційна програма</string>
     <string name="shared_string_exit">Вихід</string>
     <string name="search_button">Пошук</string>
@@ -739,7 +739,7 @@
     <string name="continue_follow_previous_route_auto">Продовжити рух попереднім незавершеним маршрутом? (%1$s секунд)</string>
     <string name="show_cameras">Камери детектування швидкості</string>
     <string name="show_traffic_warnings">Попередження про дорожній рух</string>
-    <string name="avoid_toll_roads">Без платних доріг</string>
+    <string name="avoid_toll_roads">Уник. платних доріг</string>
     <string name="map_widget_top_text">Назва вулиці</string>
     <string name="map_widget_config">Налаштування екрана</string>
     <string name="map_widget_back_to_loc">Де я</string>
@@ -885,7 +885,7 @@
     <string name="poi_filter_emergency">Аварійні служби</string>
     <string name="non_optimal_route_calculation">Швидка побудова маршруту (можливо неоптимальна)</string>
     <string name="show_warnings_descr">Налаштування попередження про дорожній рух (обмеження швидкості, вимушені зупинки, штучні нерівності, тунелі), попередження про камери контролю швидкості, відомості про смуги руху.</string>
-    <string name="avoid_motorway">Без автомагістралей</string>
+    <string name="avoid_motorway">Уник. автомагістралей</string>
     <string name="snap_to_road_descr">Прив\'язуватися до доріг під час навігації.</string>
     <string name="snap_to_road">Прив’язуватися до доріг</string>
     <string name="osmand_short_description_80_chars">Перегляд та навігація в автономному та мережевому режимах мапами OSM</string>
@@ -903,7 +903,7 @@
     <string name="layer_map_appearance">Налаштувати екран</string>
     <string name="show_lanes">Смуги руху</string>
     <string name="avoid_unpaved">Лише асфальтовані дороги</string>
-    <string name="avoid_ferries">Без поромів</string>
+    <string name="avoid_ferries">Уник. поромів</string>
     <string name="avoid_in_routing_title">Уникати…</string>
     <string name="map_widget_fluorescent">Флуоресцентні маршрути</string>
     <string name="map_widget_show_ruler">Лінійка</string>
@@ -1050,19 +1050,19 @@
     <string name="driving_region_us">США</string>
     <string name="driving_region_canada">Канада</string>
     <string name="driving_region_europe_asia">Європа, Азія, Латинська Америка та подібні</string>
-    <string name="driving_region_uk">Великобританія, Індія &amp; схожі</string>
+    <string name="driving_region_uk">Великобританія, Індія та подібні</string>
     <string name="map_widget_fps_info">FPS-відомості</string>
     <string name="about_version">Версія:</string>
     <string name="shared_string_about">Про застосунок</string>
     <string name="about_settings_descr">Версія, ліцензії, учасники проєкту</string>
-    <string name="local_index_tile_data_zooms">Завантажені масштаби: %1$s</string>
+    <string name="local_index_tile_data_zooms">Завантажені рівні масштабування: %1$s</string>
     <string name="local_index_tile_data_expire">Строк дії (у хвилинах): %1$s</string>
     <string name="local_index_tile_data_downloadable">Завантажувані: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Максимальний масштаб: %1$s</string>
     <string name="local_index_tile_data_minzoom">Мінімальний масштаб: %1$s</string>
     <string name="local_index_tile_data_name">Дата квадрату: %1$s</string>
-    <string name="edit_tilesource_successfully">Джерело квадратів мапи %1$s збережене</string>
+    <string name="edit_tilesource_successfully">Джерело квадратів мапи %1$s збережено</string>
-    <string name="edit_tilesource_elliptic_tile">Еліптичний Меркатор</string>
+    <string name="edit_tilesource_elliptic_tile">Еліптична проєкція Меркатора</string>
     <string name="edit_tilesource_maxzoom">Максимальне збільшення</string>
     <string name="edit_tilesource_expiration_time">Строк дії (в хвилинах)</string>
     <string name="edit_tilesource_minzoom">Мінімальне збільшення</string>
@@ -1226,13 +1226,13 @@
     <string name="route_info">Відомості про маршрут</string>
     <string name="routing_attr_prefer_motorway_name">Надавати перевагу автомагістралям</string>
     <string name="routing_attr_prefer_motorway_description">Надавати перевагу автомагістралям</string>
-    <string name="routing_attr_avoid_toll_name">Без платних доріг</string>
+    <string name="routing_attr_avoid_toll_name">Уник. платних доріг</string>
     <string name="routing_attr_avoid_toll_description">Уникати платних доріг</string>
-    <string name="routing_attr_avoid_unpaved_name">Лише неасфальтовані дороги</string>
+    <string name="routing_attr_avoid_unpaved_name">Уник. ґрунтових доріг</string>
     <string name="routing_attr_avoid_unpaved_description">Уникати ґрунтових доріг</string>
-    <string name="routing_attr_avoid_ferries_name">Без поромних переправ</string>
+    <string name="routing_attr_avoid_ferries_name">Уник. поромних переправ</string>
     <string name="routing_attr_avoid_ferries_description">Уникати поромних переправ</string>
-    <string name="routing_attr_avoid_motorway_name">Без автомагістралей</string>
+    <string name="routing_attr_avoid_motorway_name">Уник. автомагістралей</string>
     <string name="routing_attr_avoid_motorway_description">Уникати автомагістралей</string>
     <string name="routing_attr_weight_name">Обмеження по вазі</string>
     <string name="routing_attr_weight_description">Вказати дозволений ліміт ваги автомобіля на маршрутах.</string>
@@ -1496,7 +1496,7 @@
     <string name="rendering_attr_OSMMapperAssistant_name">Помічник мапера OSM</string>
     <string name="agps_info">Відомості A-GPS</string>
     <string name="shared_string_manage">Керування</string>
-    <string name="shared_string_edit">Правити</string>
+    <string name="shared_string_edit">Редагувати</string>
     <string name="shared_string_places">Місця</string>
     <string name="shared_string_search">Пошук</string>
     <string name="shared_string_show_description">Показати опис.</string>
@@ -1701,7 +1701,7 @@
     <string name="looking_up_address">Пошук адреси</string>
     <string name="av_locations">Місця</string>
     <string name="plugin_settings">Плагіни</string>
-    <string name="routing_attr_avoid_shuttle_train_name">Без приміських поїздів</string>
+    <string name="routing_attr_avoid_shuttle_train_name">Уник. приміських поїздів</string>
     <string name="routing_attr_avoid_shuttle_train_description">Уникати приміських поїздів</string>
     <string name="traffic_warning_hazard">Небезпека</string>
     <string name="rendering_value_boldOutline_name">Жирний контур</string>
@@ -1711,9 +1711,9 @@
     <string name="rendering_attr_currentTrackWidth_description">Товщина GPX</string>
     <string name="shared_string_wikipedia">Вікіпедія</string>
     <string name="rendering_attr_roadStyle_description">Стиль доріг</string>
-    <string name="routing_attr_avoid_stairs_name">Без сходів</string>
+    <string name="routing_attr_avoid_stairs_name">Уник. сходів</string>
     <string name="routing_attr_avoid_stairs_description">Уникати сходів</string>
-    <string name="routing_attr_avoid_borders_name">Без перетину кордону</string>
+    <string name="routing_attr_avoid_borders_name">Уник. перетину кордону</string>
     <string name="shared_string_others">Інші</string>
     <string name="favourites_context_menu_add">Додати Закладку</string>
     <string name="poi_action_delete">видалити</string>
@@ -2725,10 +2725,10 @@
     <string name="travel_card_download_descr">Завантажте путівники Вікімандрів, щоб переглянути статті про місця в усьому світі без підключення до Інтернету.</string>
     <string name="update_is_available">Доступне оновлення</string>
     <string name="download_file">Завантажити файл</string>
-    <string name="start_editing_card_image_text">Безкоштовний всесвітній путівник, який може редагувати кожен.</string>
+    <string name="start_editing_card_image_text">Безплатний всесвітній путівник, який може правити кожен.</string>
     <string name="welcome_to_open_beta_description">Туристичні путівники, в цей час, засновані на Вікімандрах. Перевірте усі функції безплатно під час відкритого бета-тестування. Потім, путівники будуть доступні передплатникам OsmAnd Unlimited і власникам OsmAnd+.</string>
-    <string name="start_editing_card_description">Вам можна і слід редагувати будь-яку статтю на Вікімандрах. Діліться знаннями, досвідом, талантом і Вашої увагою.</string>
+    <string name="start_editing_card_description">Вам можна і слід правити будь-яку статтю на Вікімандрах. Діліться знаннями, досвідом, талантом і Вашої увагою.</string>
-    <string name="start_editing">Розпочати редагування</string>
+    <string name="start_editing">Розпочати правку</string>
     <string name="get_unlimited_access">Отримати необмежений доступ</string>
     <string name="welcome_to_open_beta">Ласкаво просимо на відкрите бета-тестування</string>
     <string name="wikivoyage_travel_guide">Туристичні путівники</string>
@@ -2930,7 +2930,7 @@
     <string name="rendering_attr_surface_paved_name">Тверда</string>
     <string name="rendering_attr_surface_concrete_name">Бетон</string>
     <string name="rendering_attr_surface_sett_name">Бруківка</string>
-    <string name="rendering_attr_surface_paving_stones_name">Тротуарна плитка</string>
+    <string name="rendering_attr_surface_paving_stones_name">Бруківка</string>
     <string name="rendering_attr_surface_pebblestone_name">Галька</string>
     <string name="rendering_attr_surface_stone_name">Камінь</string>
     <string name="rendering_attr_surface_metal_name">Ковань</string>
@@ -2960,9 +2960,9 @@
     <string name="routing_attr_avoid_bus_description">Уникати автобусів і тролейбусів</string>
     <string name="routing_attr_avoid_share_taxi_name">Уникати маршрутних таксі</string>
     <string name="routing_attr_avoid_share_taxi_description">Уникати маршрутних таксі</string>
-    <string name="routing_attr_avoid_train_name">Без потягів</string>
+    <string name="routing_attr_avoid_train_name">Уник. потягів</string>
     <string name="routing_attr_avoid_train_description">Уникати потягів</string>
-    <string name="routing_attr_avoid_subway_name">Без метро</string>
+    <string name="routing_attr_avoid_subway_name">Уник. метро</string>
     <string name="routing_attr_avoid_subway_description">Уникати метро та легкого рейкового траспорту</string>
     <string name="routing_attr_avoid_ferry_name">Уникати поромних переправ</string>
     <string name="routing_attr_avoid_ferry_description">Уникати поромних переправ</string>
@@ -3014,7 +3014,7 @@
     <string name="choose_track_file_to_follow">Оберіть файл треку для слідування</string>
     <string name="quick_action_switch_day_night_descr">Перемикач для режимів дня та ночі OsmAnd.</string>
     <string name="run_full_osmand_msg">Ви використовуєте {0} мапу, надану OsmAnd. Хочете запустити повну версію OsmAnd\?</string>
-    <string name="routing_attr_avoid_sett_name">Без мостових та бруківки</string>
+    <string name="routing_attr_avoid_sett_name">Уник. мостових та бруківки</string>
     <string name="routing_attr_avoid_sett_description">Уникати мостові та бруківку</string>
     <string name="send_log">Надіслати журнал</string>
     <string name="files_moved">Переміщено %1$d файлів (%2$s).</string>
@@ -3442,7 +3442,7 @@
     <string name="accessibility_announce">Оголошення</string>
     <string name="login_and_pass">Ім\'я користувача і пароль</string>
     <string name="plugin_global_prefs_info">Ці налаштування стосуються всіх профілів.</string>
-    <string name="osm_editing">OSM-редагування</string>
+    <string name="osm_editing">OSM-правлення</string>
     <string name="osm_edits_view_descr">Ви можете переглянути всі не завантажені зміни або помилки в OSM в %1$s. Завантажені точки не відображаються в OsmAnd.</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Значок відображається під час навігації чи переміщення.</string>
@@ -3602,7 +3602,7 @@
     <string name="shared_string_rhomb">Ромб</string>
     <string name="shared_string_square">Площа</string>
     <string name="shared_string_octagon">Восьмикутник</string>
-    <string name="replace_point_descr">Замінити іншу точку цією</string>
+    <string name="replace_point_descr">Замінити іншу точку цією.</string>
     <string name="app_mode_ski_touring">Гірськолижний туризм</string>
     <string name="app_mode_ski_snowmobile">Снігохід</string>
     <string name="custom_osmand_plugin">Користувацький втулок OsmAnd</string>
@@ -3633,7 +3633,7 @@
     <string name="move_inside_category">Ви можете переміщувати елементи лише всередині цієї категорії.</string>
     <string name="developer_plugin">Втулок розробника</string>
     <string name="shared_string_items">Елементи</string>
-    <string name="select_wikipedia_article_langs">Виберіть мови, якими статті на Вікіпедії з’являться на мапі. Під час читання статті ви можете перемикатися між усіма доступними мовами.</string>
+    <string name="select_wikipedia_article_langs">Виберіть мови статей Вікіпедії на мапі. Перемикайтеся між усіма доступними мовами під час читання статті.</string>
     <string name="some_articles_may_not_available_in_lang">Деякі статті у Вікіпедії можуть бути недоступними вашою мовою.</string>
     <string name="lang_zhyue">Кантонська</string>
     <string name="lang_zhminnan">Південний Мін</string>
@@ -3710,7 +3710,7 @@
     <string name="quick_action_show_hide_transport">Показати/приховати громадський транспорт</string>
     <string name="quick_action_transport_descr">Кнопка показу або приховування громадського транспорту на мапі.</string>
     <string name="create_edit_poi">Створити / змінити POI</string>
-    <string name="add_edit_favorite">Додати / редагувати вибране</string>
+    <string name="add_edit_favorite">Додати / правити вибране</string>
     <string name="reset_deafult_order">Відновити типовий порядок елементів</string>
     <string name="back_to_editing">Повернутися до редагування</string>
     <string name="additional_actions_descr">Ви можете отримати доступ до цих дій, торкнувшись кнопки “%1$s”.</string>
@@ -3724,13 +3724,11 @@
     <string name="gpx_parse_error">OsmAnd GPX недостатньо сформований. Зверніться до служби підтримки для подальшого дослідження.</string>
     <string name="shared_string_always">Завжди</string>
     <string name="screen_control">Керування екраном</string>
-    <string name="system_screen_timeout_descr">Екран буде вимикатися після певного періоду бездіяльності, зазначеного в системних налаштуваннях пристрою.</string>
+    <string name="system_screen_timeout_descr">Вимикає екран відповідно до часу очікування екрана системи.</string>
     <string name="system_screen_timeout">Використовувати системний час очікування</string>
     <string name="turn_screen_on_options_descr">Параметри увімкнення екрана</string>
     <string name="turn_screen_on_descr">Параметри увімкнення екрану (переконайтесь, що OsmAnd стоїть на передньому плані, коли пристрій заблоковано):</string>
-    <string name="turn_screen_on_navigation_instructions_descr">Екран увімкнеться автоматично за кілька секунд до вказівки щодо навігації за визначений час у опції «Час пробудження».
+    <string name="turn_screen_on_navigation_instructions_descr">Екран увімкнеться під час вказівки щодо навігації.</string>
-\n
-\nПрацює лише під час навігації.</string>
     <string name="turn_screen_on_navigation_instructions">Вказівки з навігації</string>
     <string name="turn_screen_on_power_button_descr">Натисніть кнопку живлення пристрою, щоб увімкнути екран на передньому плані з OsmAnd.</string>
     <string name="turn_screen_on_power_button">Кнопка живлення</string>
@@ -3738,23 +3736,23 @@
     <string name="turn_screen_on_wake_time_descr">Час очікування екрану після увімкнення. («%1$s» вимикає вимкнення екрану.)</string>
     <string name="keep_screen_on">Тримати екран увімкненим</string>
     <string name="keep_screen_off">Тримати екран вимкненим</string>
-    <string name="screen_timeout_descr">Якщо функцію \"%1$s\" увімкнено, час роботи залежатиме від неї.</string>
+    <string name="screen_timeout_descr">Якщо параметр \"%1$s\" увімкнено, час роботи залежатиме від нього.</string>
     <string name="pseudo_mercator_projection">Псевдопроєкція Меркатора</string>
-    <string name="one_image_per_tile">Один файл зображення на плитку</string>
+    <string name="one_image_per_tile">Один файл зображення на тайл</string>
     <string name="sqlite_db_file">Файл SQLiteDB</string>
     <string name="online_map_name_helper_text">Укажіть назву джерела мережевої мапи.</string>
     <string name="online_map_url_helper_text">Введіть або вставте URL-адресу для мережевого джерела.</string>
-    <string name="edit_online_source">Редагувати мережеве джерело</string>
+    <string name="edit_online_source">Змінити мережеве джерело</string>
     <string name="expire_time">Строк дії</string>
     <string name="mercator_projection">Проєкція Меркатора</string>
     <string name="storage_format">Формат зберігання</string>
-    <string name="map_source_zoom_levels">Встановіть щонайменший та щонайбільший рівень масштабування, при якому мережева мапа буде відображатися або завантажуватися.</string>
+    <string name="map_source_zoom_levels">Встановіть найменший та найбільший рівень масштабування для відображення або завантаження мережевої мапи.</string>
-    <string name="map_source_zoom_levels_descr">Ці параметри впливатимуть на дисплей як мапи або накладки/підкладки.
+    <string name="map_source_zoom_levels_descr">Впливає на екран, коли використовується як мапа чи накладка/підкладка.
 \n
-\n%1$s: мапа буде обмежена вибраними масштабами.
+\n%1$s: мапа обмежена вибраним проміжком масштабування.
 \n
-\n%2$s: рівні масштабу, на яких будуть видні первинні плитки. Масштабування буде відбуватися поза цими значеннями.</string>
+\n%2$s: рівні масштабування, за яких буде видно первинні тайли; збільшення і зменшення масштабу може відбуватися поза цими значенями.</string>
-    <string name="expire_time_descr">Час дії в хвилинах. Кешована плитка буде завантажена через визначений час. Залиште це поле порожнім, щоб ніколи не оновлювати плитки для цього джерела.
+    <string name="expire_time_descr">Кешовані тайли буде повторно завантажено через вказану кількість хвилин. Залиште це поле порожнім, щоб ніколи не оновлювати плитки для цього джерела.
 \n 
 \nОдин день - 1440 хвилин. 
 \nОдин тиждень - 10 080 хвилин. 
@@ -3765,12 +3763,18 @@
     <string name="shared_string_delete_all_q">Видалити все\?</string>
     <string name="delete_all_actions_message_q">Ви дійсно бажаєте безповоротно видалити %d швидких дій\?</string>
     <string name="screen_timeout">Час очікування екрана</string>
-    <string name="weight_limit_description">Вкажіть вагу транспортного засобу, для важких транспортних засобів можуть застосовуватися деякі обмеження на маршрути.</string>
+    <string name="weight_limit_description">Вкажіть вагу транспортного засобу, для важких транспортних засобів можуть застосовуватися деякі маршрутні обмеження.</string>
     <string name="shared_string_tones">тонни</string>
     <string name="shared_string_meters">метри</string>
-    <string name="details_dialog_decr">Керування відображенням додаткових деталей на мапі</string>
+    <string name="details_dialog_decr">Показати або приховати додаткові деталі на мапі</string>
     <string name="shared_string_night_map">Нічна мапа</string>
     <string name="width_limit_description">Вкажіть ширину автомобіля, для великих транспортних засобів можуть застосовуватися обмеження на деяких маршрутах.</string>
     <string name="height_limit_description">Вкажіть висоту автомобіля, для великих транспортних засобів можуть застосовуватися обмеження на деяких маршрутах.</string>
     <string name="turn_screen_on_power_button_disabled">Вимкнено. Потребує \'Тримати екран увімкненим\' у розділі \'Час очікування після пробудження\'.</string>
+    <string name="add_online_source">Додати мережеве джерело</string>
+    <string name="clear_tiles_warning">Застосування цих змін очистить кешовані дані для цього джерела плиток</string>
+    <string name="vessel_height_warning_link">Встановити висоту судна</string>
+    <string name="vessel_height_warning">Ви можете встановити висоту судна, щоб уникнути низьких мостів. Майте на увазі, якщо міст рухомий, використовуватиметься його висота у відкритому стані.</string>
+    <string name="vessel_height_limit_description">Встановіть висоту судна, щоб уникнути низьких мостів. Майте на увазі, якщо міст рухомий, використовуватиметься його висота у відкритому стані.</string>
+    <string name="vessel_width_limit_description">Встановіть ширину судна, щоб уникнути вузьких мостів</string>
 </resources>

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

@@ -1017,12 +1017,12 @@
     <string name="driving_region_japan">日本</string>
     <string name="driving_region_us">美國</string>
     <string name="driving_region_canada">加拿大</string>
-    <string name="driving_region_europe_asia">歐洲、亞洲、拉丁美洲和同類的</string>
+    <string name="driving_region_europe_asia">歐洲、亞洲、拉丁美洲與類似地區</string>
-    <string name="driving_region_uk">英國、印度和同類的</string>
+    <string name="driving_region_uk">英國、印度與類似地區</string>
     <string name="driving_region">駕駛區域</string>
     <string name="map_widget_fps_info">FPS 除錯資訊</string>
-    <string name="local_index_tile_data_zooms">縮放已下載：%1$s</string>
+    <string name="local_index_tile_data_zooms">縮放等級已下載：%1$s</string>
-    <string name="local_index_tile_data_expire">有效時間(分鐘)：%1$s</string>
+    <string name="local_index_tile_data_expire">有效時間（分鐘）：%1$s</string>
     <string name="local_index_tile_data_downloadable">可下載：%1$s</string>
     <string name="local_index_tile_data_maxzoom">最大縮放比：%1$s</string>
     <string name="local_index_tile_data_minzoom">最小縮放比：%1$s</string>
@@ -1031,7 +1031,7 @@
     <string name="edit_tilesource_elliptic_tile">橢圓麥卡托投影</string>
     <string name="edit_tilesource_maxzoom">最大縮放比</string>
     <string name="edit_tilesource_minzoom">最小縮放比</string>
-    <string name="edit_tilesource_expiration_time">有效時間(分鐘)</string>
+    <string name="edit_tilesource_expiration_time">有效時間（分鐘）</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">選取既有的……</string>
     <string name="maps_define_edit">定義/編輯…</string>
@@ -2262,7 +2262,7 @@
 \n• 北美洲： *** 
 \n• 南美洲： ** 
 \n• 亞洲：** 
-\n• 日本和韓國： ***
+\n• 日本與韓國： *** 
 \n• 中東： ** 
 \n• 非洲： ** 
 \n• 南極洲： * 
@@ -2353,7 +2353,7 @@
 \n• 北美洲： *** 
 \n• 南美洲： ** 
 \n• 亞洲： ** 
-\n• 日本和韓國： *** 
+\n• 日本與韓國： *** 
 \n• 中東： ** 
 \n• 非洲： ** 
 \n• 南極洲： * 
@@ -3604,7 +3604,7 @@
     <string name="app_mode_ski_touring">滑雪旅遊</string>
     <string name="app_mode_ski_snowmobile">雪地摩托車</string>
     <string name="custom_osmand_plugin">自訂 OsmAnd 外掛程式</string>
-    <string name="replace_point_descr">以此取代另一點</string>
+    <string name="replace_point_descr">以此取代另一點。</string>
     <string name="changes_applied_to_profile">變更已套用至「%1$s」設定檔。</string>
     <string name="settings_item_read_error">無法從「%1$s」讀取。</string>
     <string name="settings_item_write_error">無法寫入至「%1$s」。</string>
@@ -3632,7 +3632,7 @@
     <string name="move_inside_category">您只能在此分類中移動項目。</string>
     <string name="developer_plugin">開發者外掛程式</string>
     <string name="shared_string_items">項目</string>
-    <string name="select_wikipedia_article_langs">選取維基百科的文章在地圖上顯示時的語言。您可以在閱讀文章時在所有可用的語言間切換。</string>
+    <string name="select_wikipedia_article_langs">選取維基百科文章在地圖上顯示的語言。在閱讀文章時可切換至任何可用的語言。</string>
     <string name="some_articles_may_not_available_in_lang">某些維基百科的文章可能無法以您的語言提供。</string>
     <string name="lang_zhyue">粵語</string>
     <string name="lang_zhminnan">閩南語</string>
@@ -3723,7 +3723,7 @@
     <string name="gpx_parse_error">OsmAnd GPX 格式不正確，請聯絡支援團隊以進一步調查。</string>
     <string name="shared_string_always">總是</string>
     <string name="screen_control">螢幕控制</string>
-    <string name="system_screen_timeout_descr">在系統螢幕逾時後關閉螢幕。</string>
+    <string name="system_screen_timeout_descr">根據系統的螢幕逾時關閉螢幕。</string>
     <string name="system_screen_timeout">使用系統螢幕逾時</string>
     <string name="turn_screen_on_options_descr">螢幕喚醒選項：</string>
     <string name="turn_screen_on_descr">選取螢幕喚醒選項（確保裝置鎖定時，OsmAnd 在前景）：</string>
@@ -3735,7 +3735,7 @@
     <string name="turn_screen_on_wake_time_descr">選取喚醒後的螢幕逾時。（「%1$s」不適用逾時。）</string>
     <string name="keep_screen_on">保持螢幕開啟</string>
     <string name="keep_screen_off">保持螢幕關閉</string>
-    <string name="screen_timeout_descr">如果「%1$s」選項已啟用，則活動時間將取決於它。</string>
+    <string name="screen_timeout_descr">若「%1$s」開啟，則活動時間將取決於它。</string>
     <string name="pseudo_mercator_projection">偽麥卡托投影</string>
     <string name="mercator_projection">麥卡托投影</string>
     <string name="one_image_per_tile">每個圖磚一個圖片檔案</string>
@@ -3746,12 +3746,12 @@
     <string name="expire_time">過期時間</string>
     <string name="storage_format">儲存格式</string>
     <string name="map_source_zoom_levels">設定線上地圖顯示或載入的最小與最大縮放等級。</string>
-    <string name="map_source_zoom_levels_descr">當用於地圖或覆蓋層／底圖時，這些參數將會影響其顯示。
+    <string name="map_source_zoom_levels_descr">會在用於地圖或覆蓋層／底圖時生效。 
 \n 
-\n%1$s：地圖將會受限於選定的區域。
+\n%1$s：地圖會受限於選定的縮放等級。 
 \n 
-\n%2$s：可見的原始圖磚縮放等級。在這些值以外的將會升降縮放等級。</string>
+\n%2$s 是可見的原始圖磚縮放等級。在這些值以外的將會升降縮放等級。</string>
-    <string name="expire_time_descr">到期時間（以分鐘為單位）。快取圖磚將會在指定的時間後重新載入。將此欄留空就不會從此來源重新整理圖磚。
+    <string name="expire_time_descr">在指定的分鐘數後重新下載快取圖磚。將此欄留空就不會從此來源重新整理圖磚。 
 \n 
 \n一天是1440分鐘。 
 \n一週是10080分鐘。 
@@ -3767,8 +3767,14 @@
     <string name="weight_limit_description">提供您的車輛重量，某些路線的限制可能適用於重型車輛。</string>
     <string name="shared_string_tones">色調</string>
     <string name="shared_string_meters">公尺</string>
-    <string name="details_dialog_decr">控制地圖上顯示的額外詳細資訊可見程度</string>
+    <string name="details_dialog_decr">顯示或隱藏額外的地圖詳細資訊</string>
     <string name="shared_string_night_map">夜晚地圖</string>
     <string name="shared_string_all_time">全部時間</string>
     <string name="turn_screen_on_power_button_disabled">已停用。需要「喚醒後逾時」的「保持螢幕開啟」。</string>
+    <string name="add_online_source">新增線上來源</string>
+    <string name="clear_tiles_warning">套用這些變更將會清除這個圖磚來源的快取資料</string>
+    <string name="vessel_height_warning_link">設定船艦高度</string>
+    <string name="vessel_height_warning">您可以設定船艦高度以避免矮橋。請記住，如果橋是可動式的，我們將會使用其在開啟狀態的高度。</string>
+    <string name="vessel_height_limit_description">設定船艦高度以避免矮橋。請記住，如果橋是可動式的，我們將會使用其開啟狀態的高度。</string>
+    <string name="vessel_width_limit_description">設定船艦寬度以避免窄橋</string>
 </resources>

OsmAnd/res/values/integer.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <integer name="app_bar_elevation_anim_duration" tools:override="true">0</integer>
+</resources>

OsmAnd/res/values/phrases.xml

@@ -134,6 +134,8 @@
 	<string name="poi_sms">SMS</string>
 	<string name="poi_video_telephone">Video</string>
 	<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>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -1539,7 +1541,7 @@
 	<string name="poi_tactile_paving_yes">Yes</string>
 	<string name="poi_tactile_paving_no">Without tactile paving</string>
 	<string name="poi_traffic_signals_sound_yes">Yes</string>
-	<string name="poi_traffic_signals_sound_no">No</string>
+	<string name="poi_traffic_signals_sound_no">Sound: no</string>
 	<string name="poi_traffic_signals_sound_walk">Only when walking is allowed</string>
 
 	<string name="poi_rescue_station">Rescue station</string>
@@ -4229,5 +4231,8 @@
 	<string name="poi_osmand_fire_hydrant_pressure_suction">Suction</string>
 
 	<string name="poi_pump_status_missing_beam">Pump status: missing beam</string>
+	<string name="poi_traffic_signals_vibration_no">Vibration: no</string>
+	<string name="poi_traffic_signals_vibration_yes">Yes</string>
+	<string name="poi_traffic_signals_arrow_yes">Yes</string>
 
 </resources>

OsmAnd/res/values/strings.xml

@@ -11,13 +11,23 @@
 	Thx - Hardy
 
 -->
+    <string name="quick_action_showhide_mapillary_descr">A toggle to show or hide the Mapillary layer on the map.</string>
+    <string name="quick_action_mapillary_show">Show Mapillary</string>
+    <string name="quick_action_mapillary_hide">Hide Mapillary</string>
+    <string name="quick_action_showhide_mapillary_title">Show/hide Mapillary</string>
+    <string name="vessel_width_limit_description">Set vessel width to avoid narrow bridges</string>
+    <string name="vessel_height_limit_description">Set vessel height to avoid low bridges. Keep in mind, if the bridge is movable, we will use its height in the open state.</string>
+    <string name="vessel_height_warning">You can set vessel height to avoid low bridges. Keep in mind, if the bridge is movable, we will use its height in the open state.</string>
+    <string name="vessel_height_warning_link">Set vessel height</string>
+    <string name="clear_tiles_warning">Applying these changes will clear the cached data for this tile source</string>
+    <string name="add_online_source">Add online source</string>
     <!-- string name="shared_string_all_time">All time</string -->
     <string name="shared_string_night_map">Night map</string>
-    <string name="details_dialog_decr">Control visibility of additional details shown on the map</string>
+    <string name="details_dialog_decr">Show or hide additional map details</string>
     <string name="shared_string_meters">meters</string>
     <string name="shared_string_tones">tones</string>
     <string name="default_screen_timeout">Default screen timeout</string>
-    <string name="screen_timeout_descr">If the \"%1$s\" option is enabled, the activity time will depend on it.</string>
+    <string name="screen_timeout_descr">If \"%1$s\" is on, the activity time will depend on it.</string>
     <string name="speed_cameras_alert">Speed cameras alerts in some countries is prohibited by the law.</string>
     <string name="shared_string_uninstall">Uninstall</string>
     <string name="keep_active">Keep active</string>
@@ -31,17 +41,17 @@
     <string name="screen_timeout">Screen timeout</string>
     <string name="delete_all_actions_message_q">Are you sure you want to irrevocably delete %d quick actions?</string>
     <string name="shared_string_delete_all_q">Delete all?</string>
-    <string name="export_import_quick_actions_with_profiles_promo">You can Export or Import quick actions with application profiles.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">You can export or import quick actions with app profiles.</string>
-    <string name="tiles_storage_descr">Choose how downloaded tiles will be stored.</string>
+    <string name="tiles_storage_descr">Choose how to store downloaded tiles.</string>
-    <string name="expire_time_descr">Expiration time in minutes. Cached tiles will be reloaded after specified time.
+    <string name="expire_time_descr">Cached tiles will be re-downloaded after the specified number of minutes.
         Leave this field empty to never refresh tiles for this source.
         \n\nOne day is 1440 minutes.\nOne week is 10 080 minutes.\nOne month is 43 829 minutes.</string>
-    <string name="map_source_zoom_levels_descr">These parameters will affect the display when used as map or overlay/underlay.
+    <string name="map_source_zoom_levels_descr">Affects the screen when used as map or overlay/underlay.
-        \n\n%1$s: The map will be limited to the selected zooms. \n\n%2$s: Zoom levels at which
+        \n\n%1$s: The map is limited to the zoom level range selected.
-        the original tiles will be visible. Upscaling or downscaling will occur outside these values.</string>
+        \n\n%2$s are the levels at which the original tiles will be visible, upscaling or downscaling will occur outside these values.</string>
-    <string name="map_source_zoom_levels">Set the minimum and maximum zoom level at which the online map will be displayed or loaded.</string>
+    <string name="map_source_zoom_levels">Set a minimum and maximum zoom level to show or load the online map.</string>
     <string name="storage_format">Storage format</string>
-    <string name="mercator_projection">Mercator Projection</string>
+    <string name="mercator_projection">Mercator projection</string>
     <string name="expire_time">Expiry time</string>
     <string name="edit_online_source">Edit online source</string>
     <string name="online_map_url_helper_text">Enter or paste the URL for the online source.</string>
@@ -61,13 +71,13 @@
     <string name="turn_screen_on_descr">Select screen wake-up options (make sure OsmAnd is in the foreground when the device is being locked):</string>
     <!--string name="turn_screen_on_options_descr">Screen wake-up options:</string-->
     <string name="system_screen_timeout">Use system screen timeout</string>
-    <string name="system_screen_timeout_descr">Turns the screen off after the system\'s screen timeout.</string>
+    <string name="system_screen_timeout_descr">Turns the screen off as per the system\'s screen timeout.</string>
     <string name="screen_control">Screen control</string>
     <string name="shared_string_always">Always</string>
     <string name="gpx_parse_error">OsmAnd GPX is not well formed, please contact the support team to investigate further.</string>
-    <string name="weight_limit_description">Provide your vehicle weight, some routes restrictions may be applied for heavy vehicles.</string>
+    <string name="weight_limit_description">Provide your vehicle weight, some route restrictions may apply for heavy vehicles.</string>
-    <string name="height_limit_description">Provide your vehicle height, some routes restrictions may apply for high vehicles.</string>
+    <string name="height_limit_description">Provide your vehicle height, some route restrictions may apply for high vehicles.</string>
-    <string name="width_limit_description">Provide your vehicle width some routes restrictions may be applied for wide vehicles.</string>
+    <string name="width_limit_description">Provide your vehicle width some route restrictions may apply for wide vehicles.</string>
     <string name="unsupported_type_error">Unsupported type</string>
     <string name="index_item_world_basemap_detailed">World overview map (detailed)</string>
     <string name="profiles_for_action_not_found">Could not find any such profiles.</string>
@@ -140,7 +150,7 @@
     <string name="lang_zhminnan">Southern Min</string>
     <string name="lang_zhyue">Cantonese</string>
     <string name="some_articles_may_not_available_in_lang">Some Wikipedia articles may not be available in your language.</string>
-    <string name="select_wikipedia_article_langs">Select the languages ​​in which Wikipedia articles will appear on the map. You can switch between all available languages​​ while reading the article.</string>
+    <string name="select_wikipedia_article_langs">Select the languages for ​​Wikipedia articles on the map.​​ Switch to any available language while reading the article.</string>
     <string name="wiki_menu_download_descr">Additional maps are needed to view Wikipedia POIs on the map.</string>
     <string name="shared_string_all_languages">All languages</string>
     <string name="shared_string_language">Language</string>
@@ -154,7 +164,7 @@
     <string name="custom_osmand_plugin">Custom OsmAnd plugin</string>
     <string name="app_mode_ski_snowmobile">Snowmobile</string>
     <string name="app_mode_ski_touring">Ski touring</string>
-    <string name="replace_point_descr">Replace another point with this</string>
+    <string name="replace_point_descr">Replace another point with this.</string>
     <string name="developer_plugin">Developer Plugin</string>
     <string name="move_inside_category">You can move items only inside this category.</string>
     <string name="additional_actions_descr">You can access these actions by tapping the “%1$s” button.</string>
@@ -2370,16 +2380,16 @@
     <string name="about_version">Version:</string>
     <string name="shared_string_about">About</string>
     <string name="about_settings_descr">Version info, licenses, project members</string>
-    <string name="local_index_tile_data_zooms">Zooms downloaded: %1$s</string>
+    <string name="local_index_tile_data_zooms">Zoom levels downloaded: %1$s</string>
-    <string name="local_index_tile_data_expire">Expire (minutes): %1$s</string>
+    <string name="local_index_tile_data_expire">Expiration time (minutes): %1$s</string>
     <string name="local_index_tile_data_downloadable">Downloadable: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Maximum zoom: %1$s</string>
     <string name="local_index_tile_data_minzoom">Minimum zoom: %1$s</string>
     <string name="local_index_tile_data_name">Tile data: %1$s</string>
-    <string name="edit_tilesource_successfully">Tilesource %1$s was saved</string>
+    <string name="edit_tilesource_successfully">Tilesource %1$s saved</string>
-    <string name="edit_tilesource_elliptic_tile">Elliptic mercator</string>
+    <string name="edit_tilesource_elliptic_tile">Elliptic Mercator projection</string>
     <string name="edit_tilesource_maxzoom">Maximum zoom</string>
-    <string name="edit_tilesource_expiration_time">Expire (minutes)</string>
+    <string name="edit_tilesource_expiration_time">Expiration time (minutes)</string>
     <string name="edit_tilesource_minzoom">Minimum zoom</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Select existing…</string>
@@ -2390,8 +2400,8 @@
     <string name="driving_region_japan">Japan</string>
     <string name="driving_region_us">United States</string>
     <string name="driving_region_canada">Canada</string>
-    <string name="driving_region_europe_asia">Europe, Asia, Latin America, &amp; similar</string>
+    <string name="driving_region_europe_asia">Europe, Asia, Latin America, and similar</string>
-    <string name="driving_region_uk">UK, India, &amp; similar</string>
+    <string name="driving_region_uk">UK, India, and similar</string>
     <string name="driving_region_australia">Australia</string>
     <string name="speak_title">Announce…</string>
     <string name="speak_descr">Set up announcement of street names, traffic warnings (forced stops, speed bumps), speed camera warnings, and speed limits.</string>
@@ -2693,7 +2703,7 @@
         • North America: ***\n
         • South America: **\n
         • Asia: **\n
-        • Japan &amp; Korea: ***\n
+        • Japan and Korea: ***\n
         • Middle East: **\n
         • Africa: **\n
         • Antarctica: *\n
@@ -2791,7 +2801,7 @@
         • North America: ***\n
         • South America: **\n
         • Asia: **\n
-        • Japan &amp; Korea: ***\n
+        • Japan and Korea: ***\n
         • Middle East: **\n
         • Africa: **\n
         • Antarctica: *\n

OsmAnd/res/values/styles.xml

@@ -155,6 +155,7 @@
         <item name="bg_map_context_menu">@drawable/bg_map_context_menu_light</item>
         <item name="bottom_menu_view_bg">@drawable/bg_bottom_menu_light</item>
         <item name="left_menu_view_bg">@drawable/bg_left_menu_light</item>
+        <item name="right_menu_view_bg">@drawable/bg_right_menu_light</item>
         <item name="bg_point_editor_view">@drawable/bg_point_editor_view_light</item>
         <item name="dashboard_divider">@color/divider_color_light</item>
         <item name="divider_color">@color/divider_color</item>

OsmAnd/src/net/osmand/AndroidUtils.java

@@ -425,6 +425,17 @@ public class AndroidUtils {
 				: ctx.getResources().getColor(R.color.text_color_secondary_light));
 	}
 
+	public static int getTextMaxWidth(float textSize, List<String> titles) {
+		int width = 0;
+		for (String title : titles) {
+			int titleWidth = getTextWidth(textSize, title);
+			if (titleWidth > width) {
+				width = titleWidth;
+			}
+		}
+		return width;
+	}
+
 	public static int getTextWidth(float textSize, String text) {
 		Paint paint = new Paint();
 		paint.setTextSize(textSize);

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

@@ -29,6 +29,7 @@ public class PointDescription {
 
 	public static final String POINT_TYPE_FAVORITE = "favorite";
 	public static final String POINT_TYPE_WPT = "wpt";
+	public static final String POINT_TYPE_GPX = "gpx";
 	public static final String POINT_TYPE_RTE = "rte";
 	public static final String POINT_TYPE_POI = "poi";
 	public static final String POINT_TYPE_ADDRESS = "address";

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

@@ -0,0 +1,80 @@
+package net.osmand.plus;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import static net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
+
+import java.util.List;
+
+public class SimplePopUpMenuItemAdapter
+		extends ArrayAdapter<SimplePopUpMenuItem> {
+
+	private List<SimplePopUpMenuItem> items;
+
+	public SimplePopUpMenuItemAdapter(@NonNull Context context, int resource,
+	                                  List<SimplePopUpMenuItem> items) {
+		super(context, resource);
+		this.items = items;
+	}
+
+	@Override
+	public int getCount() {
+		return items.size();
+	}
+
+	@NonNull
+	@Override
+	public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+		LayoutInflater inflater = LayoutInflater.from(getContext());
+		if (convertView == null) {
+			convertView = inflater.inflate(R.layout.popup_menu_item, parent, false);
+		}
+		SimplePopUpMenuItem item = getItem(position);
+		if (item != null) {
+			TextView tvTitle = convertView.findViewById(R.id.title);
+			tvTitle.setText(item.title);
+			ImageView ivIcon = convertView.findViewById(R.id.icon);
+			Drawable icon = item.icon;
+			if (icon != null) {
+				ivIcon.setImageDrawable(icon);
+			} else {
+				ivIcon.setVisibility(View.GONE);
+			}
+		}
+		return convertView;
+	}
+
+	@Nullable
+	@Override
+	public SimplePopUpMenuItem getItem(int position) {
+		return items.get(position);
+	}
+
+	public static class SimplePopUpMenuItem {
+		private CharSequence title;
+		private Drawable icon;
+
+		public SimplePopUpMenuItem(CharSequence title, Drawable icon) {
+			this.title = title;
+			this.icon = icon;
+		}
+
+		public CharSequence getTitle() {
+			return title;
+		}
+
+		public Drawable getIcon() {
+			return icon;
+		}
+	}
+}

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

@@ -24,6 +24,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.WindowManager;
+import android.widget.AdapterView;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -36,6 +37,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.ListPopupWindow;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
@@ -43,6 +45,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.TintableCompoundButton;
 
+import com.google.android.material.slider.RangeSlider;
 import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.android.material.slider.Slider;
 import com.google.android.material.snackbar.Snackbar;
@@ -60,10 +63,15 @@ import net.osmand.plus.widgets.style.CustomTypefaceSpan;
 
 import org.apache.commons.logging.Log;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import java.lang.ref.WeakReference;
 
 import gnu.trove.map.hash.TLongObjectHashMap;
 
+import static net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
+
 public class UiUtilities {
 
 	private static final Log LOG = PlatformUtil.getLog(UiUtilities.class);
@@ -534,29 +542,63 @@ public class UiUtilities {
 			activeColor = AndroidUtils.getColorFromAttr(ctx, R.attr.active_color_basic);
 		}
 		int activeDisableColor = getColorWithAlpha(activeColor, 0.25f);
-		ColorStateList activeCsl = new ColorStateList(states,
+		ColorStateList activeCsl = new ColorStateList(states, new int[] {activeColor, activeDisableColor});
-				new int[] {activeColor, activeDisableColor});
+		int inactiveColor = ContextCompat.getColor(ctx, nightMode ? R.color.icon_color_default_dark : R.color.icon_color_secondary_light);
-		int inactiveColor = ContextCompat.getColor(ctx,
+		ColorStateList inactiveCsl = new ColorStateList(states, new int[] {inactiveColor, inactiveColor});
-				nightMode ? R.color.icon_color_default_dark : R.color.icon_color_secondary_light);
+		slider.setTrackActiveTintList(activeCsl);
-		ColorStateList inactiveCsl = new ColorStateList(states,
+		slider.setTrackInactiveTintList(inactiveCsl);
-				new int[] {inactiveColor, inactiveColor});
+		slider.setHaloTintList(activeCsl);
-		slider.setTrackColorActive(activeCsl);
+		slider.setThumbTintList(activeCsl);
-		slider.setTrackColorInactive(inactiveCsl);
-		slider.setHaloColor(activeCsl);
-		slider.setThumbColor(activeCsl);
 		int colorBlack = ContextCompat.getColor(ctx, R.color.color_black);
 		int ticksColor = showTicks ?
 				(nightMode ? colorBlack : getColorWithAlpha(colorBlack, 0.5f)) :
 				Color.TRANSPARENT;
-		slider.setTickColor(new ColorStateList(states, new int[] {ticksColor, ticksColor}));
+		slider.setTickTintList(new ColorStateList(states, new int[] {ticksColor, ticksColor}));
 
 		// sizes
-		int thumbRadius = ctx.getResources().getDimensionPixelSize(R.dimen.slider_thumb_size);
+		slider.setThumbRadius(ctx.getResources().getDimensionPixelSize(R.dimen.slider_thumb_size));
-		int haloRadius = ctx.getResources().getDimensionPixelSize(R.dimen.slider_thumb_halo_size);
+		slider.setHaloRadius(ctx.getResources().getDimensionPixelSize(R.dimen.slider_thumb_halo_size));
-		int trackHeight = ctx.getResources().getDimensionPixelSize(R.dimen.slider_track_height);
+		slider.setTrackHeight(ctx.getResources().getDimensionPixelSize(R.dimen.slider_track_height));
-		slider.setThumbRadius(thumbRadius);
+
-		slider.setHaloRadius(haloRadius);
+		// label behavior
-		slider.setTrackHeight(trackHeight);
+		slider.setLabelBehavior(Slider.LABEL_GONE);
+	}
+
+	public static void setupSlider(RangeSlider slider, boolean nightMode,
+								   @ColorInt Integer activeColor, boolean showTicks) {
+		Context ctx = slider.getContext();
+		if (ctx == null) {
+			return;
+		}
+		int themeId = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
+		ctx = new ContextThemeWrapper(ctx, themeId);
+
+		// colors
+		int[][] states = new int[][] {
+				new int[] {android.R.attr.state_enabled},
+				new int[] {-android.R.attr.state_enabled}
+		};
+		if (activeColor == null) {
+			activeColor = AndroidUtils.getColorFromAttr(ctx, R.attr.active_color_basic);
+		}
+		int activeDisableColor = getColorWithAlpha(activeColor, 0.25f);
+		ColorStateList activeCsl = new ColorStateList(states, new int[] {activeColor, activeDisableColor});
+		int inactiveColor = ContextCompat.getColor(ctx, nightMode ? R.color.icon_color_default_dark : R.color.icon_color_secondary_light);
+		ColorStateList inactiveCsl = new ColorStateList(states, new int[] {inactiveColor, inactiveColor});
+		slider.setTrackActiveTintList(activeCsl);
+		slider.setTrackInactiveTintList(inactiveCsl);
+		slider.setHaloTintList(activeCsl);
+		slider.setThumbTintList(activeCsl);
+		int colorBlack = ContextCompat.getColor(ctx, R.color.color_black);
+		int ticksColor = showTicks ?
+				(nightMode ? colorBlack : getColorWithAlpha(colorBlack, 0.5f)) :
+				Color.TRANSPARENT;
+		slider.setTickTintList(new ColorStateList(states, new int[] {ticksColor, ticksColor}));
+
+		// sizes
+		slider.setThumbRadius(ctx.getResources().getDimensionPixelSize(R.dimen.slider_thumb_size));
+		slider.setHaloRadius(ctx.getResources().getDimensionPixelSize(R.dimen.slider_thumb_halo_size));
+		slider.setTrackHeight(ctx.getResources().getDimensionPixelSize(R.dimen.slider_track_height));
 
 		// label behavior
 		slider.setLabelBehavior(Slider.LABEL_GONE);
@@ -668,4 +710,39 @@ public class UiUtilities {
 		}
 		return spannable;
 	}
+
+	public static ListPopupWindow createListPopupWindow(Context themedCtx,
+	                                                    View v, int minWidth,
+	                                                    List<SimplePopUpMenuItem> items,
+	                                                    final AdapterView.OnItemClickListener listener) {
+		int contentPadding = themedCtx.getResources().getDimensionPixelSize(R.dimen.content_padding);
+		int contentPaddingHalf = themedCtx.getResources().getDimensionPixelSize(R.dimen.content_padding_half);
+		int defaultListTextSize = themedCtx.getResources().getDimensionPixelSize(R.dimen.default_list_text_size);
+
+		List<String> titles = new ArrayList<>();
+		for (SimplePopUpMenuItem item : items) {
+			titles.add(String.valueOf(item.getTitle()));
+		}
+		float itemWidth = AndroidUtils.getTextMaxWidth(defaultListTextSize, titles) + contentPadding;
+
+		SimplePopUpMenuItemAdapter adapter =
+				new SimplePopUpMenuItemAdapter(themedCtx, R.layout.popup_menu_item, items);
+		final ListPopupWindow listPopupWindow = new ListPopupWindow(themedCtx);
+		listPopupWindow.setAnchorView(v);
+		listPopupWindow.setContentWidth((int) (Math.max(itemWidth, minWidth)));
+		listPopupWindow.setDropDownGravity(Gravity.END | Gravity.TOP);
+		listPopupWindow.setVerticalOffset(-v.getHeight() + contentPaddingHalf);
+		listPopupWindow.setModal(true);
+		listPopupWindow.setAdapter(adapter);
+		listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				if (listener != null) {
+					listener.onItemClick(parent, view, position, id);
+				}
+				listPopupWindow.dismiss();
+			}
+		});
+		return listPopupWindow;
+	}
 }

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

@@ -3,6 +3,7 @@ package net.osmand.plus.activities;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
@@ -197,8 +198,12 @@ public class EditFavoriteGroupDialogFragment extends MenuBottomSheetDialogFragme
 					.create();
 			items.add(markersGroupItem);
 
+			Drawable shareIcon = getContentIcon(R.drawable.ic_action_gshare_dark);
+			if (shareIcon != null) {
+				shareIcon = AndroidUtils.getDrawableForDirection(app, shareIcon);
+			}
 			BaseBottomSheetItem shareItem = new SimpleBottomSheetItem.Builder()
-					.setIcon(getContentIcon(R.drawable.ic_action_gshare_dark))
+					.setIcon(shareIcon)
 					.setTitle(getString(R.string.shared_string_share))
 					.setLayoutId(R.layout.bottom_sheet_item_simple)
 					.setOnClickListener(new View.OnClickListener() {

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

@@ -454,7 +454,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 
 		if (!MenuItemCompat.isActionViewExpanded(mi)) {
 			createMenuItem(menu, IMPORT_FAVOURITES_ID, R.string.shared_string_add_to_favorites, R.drawable.ic_action_plus, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS, true);
 			createMenuItem(menu, SELECT_MAP_MARKERS_ID, R.string.select_map_markers, R.drawable.ic_action_flag, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 			createMenuItem(menu, DELETE_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 		}

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

@@ -214,10 +214,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 					if (!data.get(f).isEmpty()) {
 						WptPt pt = data.get(f).findPointToShow();
 						String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time)); //$NON-NLS-1$
-						Integer track_storage_directory = ctx.getSettings().TRACK_STORAGE_DIRECTORY.get();
+						Integer trackStorageDirectory = ctx.getSettings().TRACK_STORAGE_DIRECTORY.get();
-						if (track_storage_directory != OsmandSettings.REC_DIRECTORY) {
+						if (!OsmandSettings.REC_DIRECTORY.equals(trackStorageDirectory)) {
-							SimpleDateFormat dateDirFormat = new SimpleDateFormat("yyyy-MM");
+							SimpleDateFormat dateDirFormat = new SimpleDateFormat("yyyy-MM", Locale.US);
-//							if (track_storage_directory == OsmandSettings.DAILY_DIRECTORY) {
+//							if (trackStorageDirectory == OsmandSettings.DAILY_DIRECTORY) {
 //								dateDirFormat = new SimpleDateFormat("yyyy-MM-dd");
 //							}
 							String dateDirName = dateDirFormat.format(new Date(pt.time));
@@ -369,7 +369,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 					if(!newInterval) {
 						segment.points.add(pt);
 					}
-					String date = DateFormat.format("yyyy-MM-dd", time).toString(); //$NON-NLS-1$
+					String date = new SimpleDateFormat("yyyy-MM-dd", Locale.US).format(new Date(time));;  //$NON-NLS-1$
 					if (dataTracks.containsKey(date)) {
 						GPXFile gpx = dataTracks.get(date);
 						gpx.tracks.add(track);

OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteMenuController.java

@@ -71,7 +71,7 @@ public class AudioVideoNoteMenuController extends MenuController {
 				}
 			};
 			rightTitleButtonController.caption = mapActivity.getString(R.string.shared_string_delete);
-			rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+			rightTitleButtonController.startIconId = R.drawable.ic_action_delete_dark;
 		}
 
 		updateData();
@@ -164,7 +164,7 @@ public class AudioVideoNoteMenuController extends MenuController {
 		if (!mRecording.isPhoto()) {
 			if (mPlugin.isPlaying(mRecording)) {
 				leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_control_stop);
-				leftTitleButtonController.leftIconId = R.drawable.ic_action_rec_stop;
+				leftTitleButtonController.startIconId = R.drawable.ic_action_rec_stop;
 				int pos = mPlugin.getPlayingPosition();
 				String durationStr;
 				if (pos == -1) {
@@ -177,14 +177,14 @@ public class AudioVideoNoteMenuController extends MenuController {
 				rightTitleButtonController.visible = false;
 			} else {
 				leftTitleButtonController.caption = mapActivity.getString(R.string.recording_context_menu_play);
-				leftTitleButtonController.leftIconId = R.drawable.ic_play_dark;
+				leftTitleButtonController.startIconId = R.drawable.ic_play_dark;
 				String durationStr = mRecording.getPlainDuration(accessibilityEnabled);
 				leftTitleButtonController.needRightText = true;
 				leftTitleButtonController.rightTextCaption = "— " + durationStr;
 			}
 		} else {
 			leftTitleButtonController.caption = mapActivity.getString(R.string.recording_context_menu_show);
-			leftTitleButtonController.leftIconId = R.drawable.ic_action_view;
+			leftTitleButtonController.startIconId = R.drawable.ic_action_view;
 		}
 	}
 

OsmAnd/src/net/osmand/plus/audionotes/ItemMenuBottomSheetDialogFragment.java

@@ -1,8 +1,10 @@
 package net.osmand.plus.audionotes;
 
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.View;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
@@ -49,8 +51,12 @@ public class ItemMenuBottomSheetDialogFragment extends MenuBottomSheetDialogFrag
 					.create();
 			items.add(playItem);
 
+			Drawable shareIcon = getContentIcon(R.drawable.ic_action_gshare_dark);
+			if (shareIcon != null) {
+				AndroidUtils.getDrawableForDirection(requireContext(), shareIcon);
+			}
 			BaseBottomSheetItem shareItem = new SimpleBottomSheetItem.Builder()
-					.setIcon(getContentIcon(R.drawable.ic_action_gshare_dark))
+					.setIcon(shareIcon)
 					.setTitle(getString(R.string.shared_string_share))
 					.setLayoutId(R.layout.bottom_sheet_item_simple)
 					.setOnClickListener(new View.OnClickListener() {

OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java

@@ -3,6 +3,7 @@ package net.osmand.plus.audionotes;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.Build;
@@ -21,10 +22,12 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import net.osmand.AndroidUtils;
@@ -33,6 +36,7 @@ import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.WptPt;
 import net.osmand.PlatformUtil;
 import net.osmand.data.PointDescription;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings.NotesSortByMode;
 import net.osmand.plus.R;
@@ -163,14 +167,18 @@ public class NotesFragment extends OsmAndListFragment implements FavoritesFragme
 	}
 
 	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-		menu.clear();
+		FragmentActivity activity = getActivity();
-		if (AndroidUiHelper.isOrientationPortrait(getActivity())) {
+		if (activity == null) {
-			menu = ((ActionBarProgressActivity) getActivity()).getClearToolbar(true).getMenu();
+			return;
-		} else {
-			((ActionBarProgressActivity) getActivity()).getClearToolbar(false);
 		}
-		((ActionBarProgressActivity) getActivity()).updateListViewFooter(footerView);
+		menu.clear();
+		if (AndroidUiHelper.isOrientationPortrait(activity)) {
+			menu = ((ActionBarProgressActivity) activity).getClearToolbar(true).getMenu();
+		} else {
+			((ActionBarProgressActivity) activity).getClearToolbar(false);
+		}
+		((ActionBarProgressActivity) activity).updateListViewFooter(footerView);
 
 		MenuItem item = menu.add(R.string.shared_string_sort).setIcon(R.drawable.ic_action_list_sort);
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@@ -182,7 +190,9 @@ public class NotesFragment extends OsmAndListFragment implements FavoritesFragme
 		});
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
-		item = menu.add(R.string.shared_string_share).setIcon(R.drawable.ic_action_gshare_dark);
+		Drawable shareIcon = AndroidUtils.getDrawableForDirection(activity,
+				getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_gshare_dark));
+		item = menu.add(R.string.shared_string_share).setIcon(shareIcon);
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -377,13 +387,16 @@ public class NotesFragment extends OsmAndListFragment implements FavoritesFragme
 			@Override
 			public boolean onCreateActionMode(final ActionMode mode, Menu menu) {
 				LOG.debug("onCreateActionMode");
+				OsmandApplication app = getMyApplication();
 				if (type == MODE_SHARE) {
 					listAdapter.insert(SHARE_LOCATION_FILE, 0);
 				}
 				switchSelectionMode(true);
 				int titleRes = type == MODE_DELETE ? R.string.shared_string_delete_all : R.string.shared_string_share;
 				int iconRes = type == MODE_DELETE ? R.drawable.ic_action_delete_dark : R.drawable.ic_action_gshare_dark;
-				MenuItem item = menu.add(titleRes).setIcon(iconRes);
+				Drawable icon = AndroidUtils.getDrawableForDirection(app,
+						app.getUIUtilities().getIcon(iconRes));
+				MenuItem item = menu.add(titleRes).setIcon(icon);
 				item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 					@Override
 					public boolean onMenuItemClick(MenuItem item) {

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

@@ -15,6 +15,7 @@ import android.widget.ExpandableListView.OnChildClickListener;
 import androidx.annotation.NonNull;
 import androidx.core.view.MenuItemCompat;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandActionBarActivity;
@@ -83,10 +84,20 @@ public abstract class OsmandExpandableListFragment extends BaseOsmAndFragment
 	}
 
 	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconId, int menuItemType) {
-		Drawable d = iconId == 0 ? null : requireMyApplication().getUIUtilities().getIcon(iconId,
+		return createMenuItem(m, id, titleRes, iconId, menuItemType, false);
-				isLightActionBar() ? R.color.active_buttons_and_links_text_light : R.color.active_buttons_and_links_text_dark);
+	}
+
+	public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconId, int menuItemType,
+	                               boolean flipIconForRtl) {
+		OsmandApplication app = requireMyApplication();
+		Drawable d = iconId == 0 ? null : app.getUIUtilities().getIcon(iconId, isLightActionBar() ?
+				R.color.active_buttons_and_links_text_light :
+				R.color.active_buttons_and_links_text_dark);
 		MenuItem menuItem = m.add(0, id, 0, titleRes);
 		if (d != null) {
+			if (flipIconForRtl) {
+				d = AndroidUtils.getDrawableForDirection(app, d);
+			}
 			menuItem.setIcon(d);
 		}
 		menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {

OsmAnd/src/net/osmand/plus/development/LogcatActivity.java

@@ -1,5 +1,6 @@
 package net.osmand.plus.development;
 
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.Gravity;
@@ -15,6 +16,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -94,8 +96,10 @@ public class LogcatActivity extends ActionBarProgressActivity {
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
+		OsmandApplication app = getMyApplication();
+		Drawable shareIcon = app.getUIUtilities().getIcon(R.drawable.ic_action_gshare_dark);
 		MenuItem share = menu.add(0, SHARE_ID, 0, R.string.shared_string_export);
-		share.setIcon(R.drawable.ic_action_gshare_dark);
+		share.setIcon(AndroidUtils.getDrawableForDirection(app, shareIcon));
 		share.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
 

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

@@ -3,11 +3,16 @@ package net.osmand.plus.dialogs;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.util.TypedValue;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 
 import net.osmand.plus.ContextMenuAdapter;
@@ -15,12 +20,12 @@ import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTwoChoicesButton;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTwoChoicesButton.OnBottomBtnClickListener;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
-import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
+import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
 import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
 import net.osmand.render.RenderingRuleProperty;
@@ -46,6 +51,9 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 	private ArrayAdapter<?> arrayAdapter;
 	private ContextMenuAdapter adapter;
 	private int position;
+	private int padding;
+	private int paddingSmall;
+	private int paddingHalf;
 
 	public static void showInstance(@NonNull FragmentManager fm,
 									List<RenderingRuleProperty> properties,
@@ -67,6 +75,9 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		padding = (int) getResources().getDimension(R.dimen.content_padding);
+		paddingSmall = (int) getResources().getDimension(R.dimen.content_padding_small);
+		paddingHalf = (int) getResources().getDimension(R.dimen.content_padding_half);
 		app = requiredMyApplication();
 		if (properties == null || preferences == null) {
 			properties = new ArrayList<>();
@@ -87,10 +98,27 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 	@Override
 	public void createMenuItems(Bundle savedInstanceState) {
 		int selectedProfileColorRes = app.getSettings().APPLICATION_MODE.get().getIconColorInfo().getColor(nightMode);
-		TitleItem titleItem = new TitleItem(getString(R.string.rendering_category_details));
+		float spacing = getResources().getDimension(R.dimen.line_spacing_extra_description);
-		items.add(titleItem);
+		LinearLayout linearLayout = new LinearLayout(app);
-		ShortDescriptionItem descriptionItem = new ShortDescriptionItem(getString(R.string.details_dialog_decr));
+		linearLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		items.add(descriptionItem);
+		linearLayout.setOrientation(LinearLayout.VERTICAL);
+
+		TextView title = new TextView(app);
+		title.setPadding(padding, paddingHalf, padding, 0);
+		title.setTypeface(FontCache.getRobotoMedium(app));
+		title.setText(R.string.rendering_category_details);
+		title.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen.default_list_text_size));
+		title.setTextColor(nightMode ? ContextCompat.getColor(app, R.color.text_color_primary_dark) : ContextCompat.getColor(app, R.color.text_color_primary_light));
+
+		TextView description = new TextView(app);
+		description.setLineSpacing(spacing, 1.0f);
+		description.setPadding(padding, 0, padding, paddingSmall);
+		description.setText(R.string.details_dialog_decr);
+		description.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen.default_desc_text_size));
+		description.setTextColor(nightMode ? ContextCompat.getColor(app, R.color.text_color_secondary_dark) : ContextCompat.getColor(app, R.color.text_color_secondary_light));
+		linearLayout.addView(title);
+		linearLayout.addView(description);
+		items.add(new BaseBottomSheetItem.Builder().setCustomView(linearLayout).create());
 		if (preferences != null && properties != null) {
 			RenderingRuleProperty streetLightNightProp = getStreetLightNightProp();
 			for (int i = 0; i < properties.size(); i++) {
@@ -122,6 +150,7 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 									streetLightsNightPref.set(false);
 									item[0].setChecked(checked);
 									item[0].setIsLeftBtnSelected(true);
+									setupHeightAndBackground(getView());
 								}
 							})
 							.create();
@@ -148,7 +177,9 @@ public class DetailsBottomSheet extends BasePreferenceBottomSheet {
 				String attrName = property.getAttrName();
 				if (MORE_DETAILED.equals(attrName) || SHOW_SURFACE_GRADE.equals(attrName)
 						|| COLORED_BUILDINGS.equals(attrName) || STREET_LIGHTING.equals(attrName)) {
-					items.add(new DividerItem(app));
+					DividerItem divider = new DividerItem(app);
+					divider.setMargins(padding, 0, 0, 0);
+					items.add(divider);
 				}
 			}
 		}

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

@@ -616,7 +616,8 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
 			return;
 		}
 		IndexItem worldMap = getDownloadThread().getIndexes().getWorldBaseMapItem();
-		if (!SUGGESTED_TO_DOWNLOAD_BASEMAP && worldMap != null && (!worldMap.isDownloaded() || worldMap.isOutdated()) &&
+		// (!worldMap.isDownloaded() || worldMap.isOutdated()) - now suggest to download if downloaded 
+		if (!SUGGESTED_TO_DOWNLOAD_BASEMAP && worldMap != null && worldMap.isDownloaded() && worldMap.isOutdated() &&
 				!getDownloadThread().isDownloading(worldMap)) {
 			SUGGESTED_TO_DOWNLOAD_BASEMAP = true;
 			AskMapDownloadFragment fragment = new AskMapDownloadFragment();

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

@@ -1141,15 +1141,17 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 				}
 			});
 		}
-		item = optionsMenu.getMenu().add(R.string.shared_string_rename)
+		if (info.getType() != LocalIndexType.TILES_DATA) {
-				.setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_edit_dark));
+			item = optionsMenu.getMenu().add(R.string.shared_string_rename)
-		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+					.setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_edit_dark));
-			@Override
+			item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-			public boolean onMenuItemClick(MenuItem item) {
+				@Override
-				performBasicOperation(R.string.shared_string_rename, info);
+				public boolean onMenuItemClick(MenuItem item) {
-				return true;
+					performBasicOperation(R.string.shared_string_rename, info);
-			}
+					return true;
-		});
+				}
+			});
+		}
 		if (info.getType() == LocalIndexType.TILES_DATA
 				&& ((info.getAttachedObject() instanceof TileSourceManager.TileSourceTemplate)
 				|| ((info.getAttachedObject() instanceof SQLiteTileSource)

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

@@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -67,7 +68,8 @@ public abstract class BaseMenuController {
 
 	public int getSlideInAnimation() {
 		if (isLandscapeLayout()) {
-			return R.anim.slide_in_left;
+			return AndroidUtils.isLayoutRtl(getMapActivity())
+					? R.anim.slide_in_right : R.anim.slide_in_left;
 		} else {
 			return R.anim.slide_in_bottom;
 		}
@@ -75,7 +77,8 @@ public abstract class BaseMenuController {
 
 	public int getSlideOutAnimation() {
 		if (isLandscapeLayout()) {
-			return R.anim.slide_out_left;
+			return AndroidUtils.isLayoutRtl(getMapActivity())
+					? R.anim.slide_out_right : R.anim.slide_out_left;
 		} else {
 			return R.anim.slide_out_bottom;
 		}

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

@@ -628,7 +628,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		}
 		Drawable drawable = getIcon(iconResId, bottomButtonsColor);
 		directionsButton.setTextColor(ContextCompat.getColor(mapActivity, bottomButtonsColor));
-		AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(directionsButton, null, null, drawable, null);
+		AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+				directionsButton, null, null, drawable, null);
 		int contentPaddingHalf = (int) getResources().getDimension(R.dimen.content_padding_half);
 		directionsButton.setCompoundDrawablePadding(contentPaddingHalf);
 		directionsButton.setOnClickListener(new View.OnClickListener() {
@@ -1147,11 +1148,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				setupButton(leftTitleButtonView, leftTitleButtonController.enabled, title);
 				if (leftTitleButtonController.visible) {
 					leftTitleButtonView.setVisibility(View.VISIBLE);
-					Drawable leftIcon = leftTitleButtonController.getLeftIcon();
+					Drawable startIcon = leftTitleButtonController.getStartIcon();
-					Drawable rightIcon = leftTitleButtonController.getRightIcon();
+					Drawable endIcon = leftTitleButtonController.getEndIcon();
-					leftTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, rightIcon, null);
+					AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+							leftTitleButton, startIcon, null, endIcon, null);
 					leftTitleButton.setCompoundDrawablePadding(view.getResources().getDimensionPixelSize(R.dimen.content_padding_half));
-					((LinearLayout) leftTitleButtonView).setGravity(rightIcon != null ? Gravity.END : Gravity.START);
+					((LinearLayout) leftTitleButtonView).setGravity(endIcon != null ? Gravity.END : Gravity.START);
 				} else {
 					leftTitleButtonView.setVisibility(View.INVISIBLE);
 				}
@@ -1166,11 +1168,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				setupButton(rightTitleButtonView, rightTitleButtonController.enabled, rightTitleButtonController.caption);
 				rightTitleButtonView.setVisibility(rightTitleButtonController.visible ? View.VISIBLE : View.INVISIBLE);
 
-				Drawable leftIcon = rightTitleButtonController.getLeftIcon();
+				Drawable startIcon = rightTitleButtonController.getStartIcon();
-				Drawable rightIcon = rightTitleButtonController.getRightIcon();
+				Drawable endIcon = rightTitleButtonController.getEndIcon();
-				rightTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, rightIcon, null);
+				AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+						rightTitleButton, startIcon, null, endIcon, null);
 				rightTitleButton.setCompoundDrawablePadding(view.getResources().getDimensionPixelSize(R.dimen.content_padding_half));
-				((LinearLayout) rightTitleButtonView).setGravity(rightIcon != null ? Gravity.END : Gravity.START);
+				((LinearLayout) rightTitleButtonView).setGravity(endIcon != null ? Gravity.END : Gravity.START);
 			} else {
 				rightTitleButtonView.setVisibility(View.INVISIBLE);
 			}
@@ -1182,11 +1185,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				setupButton(bottomTitleButtonView, bottomTitleButtonController.enabled, bottomTitleButtonController.caption);
 				bottomTitleButtonView.setVisibility(bottomTitleButtonController.visible ? View.VISIBLE : View.GONE);
 
-				Drawable leftIcon = bottomTitleButtonController.getLeftIcon();
+				Drawable startIcon = bottomTitleButtonController.getStartIcon();
-				Drawable rightIcon = bottomTitleButtonController.getRightIcon();
+				Drawable endIcon = bottomTitleButtonController.getEndIcon();
-				bottomTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, rightIcon, null);
+				AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+						bottomTitleButton, startIcon, null, endIcon, null);
 				bottomTitleButton.setCompoundDrawablePadding(view.getResources().getDimensionPixelSize(R.dimen.content_padding_half));
-				((LinearLayout) bottomTitleButtonView).setGravity(rightIcon != null ? Gravity.END : Gravity.START);
+				((LinearLayout) bottomTitleButtonView).setGravity(endIcon != null ? Gravity.END : Gravity.START);
 			} else {
 				bottomTitleButtonView.setVisibility(View.GONE);
 			}
@@ -1206,11 +1210,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				setupButton(leftDownloadButtonView, leftDownloadButtonController.enabled, leftDownloadButtonController.caption);
 				leftDownloadButtonView.setVisibility(leftDownloadButtonController.visible ? View.VISIBLE : View.INVISIBLE);
 
-				Drawable leftIcon = leftDownloadButtonController.getLeftIcon();
+				Drawable startIcon = leftDownloadButtonController.getStartIcon();
-				Drawable rightIcon = leftDownloadButtonController.getRightIcon();
+				Drawable endIcon = leftDownloadButtonController.getEndIcon();
-				leftDownloadButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, rightIcon, null);
+				AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+						leftDownloadButton, startIcon, null, endIcon, null);
 				leftDownloadButton.setCompoundDrawablePadding(view.getResources().getDimensionPixelSize(R.dimen.content_padding_half));
-				((LinearLayout) leftDownloadButtonView).setGravity(rightIcon != null ? Gravity.END : Gravity.START);
+				((LinearLayout) leftDownloadButtonView).setGravity(endIcon != null ? Gravity.END : Gravity.START);
 			} else {
 				leftDownloadButtonView.setVisibility(View.INVISIBLE);
 			}
@@ -1222,11 +1227,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				setupButton(rightDownloadButtonView, rightDownloadButtonController.enabled, rightDownloadButtonController.caption);
 				rightDownloadButtonView.setVisibility(rightDownloadButtonController.visible ? View.VISIBLE : View.INVISIBLE);
 
-				Drawable leftIcon = rightDownloadButtonController.getLeftIcon();
+				Drawable startIcon = rightDownloadButtonController.getStartIcon();
-				Drawable rightIcon = rightDownloadButtonController.getRightIcon();
+				Drawable endIcon = rightDownloadButtonController.getEndIcon();
-				rightDownloadButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, rightIcon, null);
+				AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+						rightDownloadButton, startIcon, null, endIcon, null);
 				rightDownloadButton.setCompoundDrawablePadding(view.getResources().getDimensionPixelSize(R.dimen.content_padding_half));
-				((LinearLayout) rightDownloadButtonView).setGravity(rightIcon != null ? Gravity.END : Gravity.START);
+				((LinearLayout) rightDownloadButtonView).setGravity(endIcon != null ? Gravity.END : Gravity.START);
 			} else {
 				rightDownloadButtonView.setVisibility(View.INVISIBLE);
 			}
@@ -1292,11 +1298,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 			setupButton(buttonView, buttonController.enabled, buttonController.caption);
 			buttonView.setVisibility(buttonController.visible ? View.VISIBLE : View.INVISIBLE);
 
-			Drawable leftIcon = buttonController.getLeftIcon();
+			Drawable startIcon = buttonController.getStartIcon();
-			Drawable rightIcon = buttonController.getRightIcon();
+			Drawable endIcon = buttonController.getEndIcon();
-			buttonText.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, rightIcon, null);
+			AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+					buttonText, startIcon, null, endIcon, null);
 			buttonText.setCompoundDrawablePadding(view.getResources().getDimensionPixelSize(R.dimen.content_padding_half));
-			((LinearLayout) buttonView).setGravity(rightIcon != null ? Gravity.END : Gravity.START);
+			((LinearLayout) buttonView).setGravity(endIcon != null ? Gravity.END : Gravity.START);
 			buttonView.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -1805,7 +1812,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				if (!Algorithms.isEmpty(typeStr)) {
 					line2Str.append(typeStr);
 					Drawable icon = menu.getTypeIcon();
-					line2.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+					AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+							line2, icon, null, null, null);
 					line2.setCompoundDrawablePadding(dpToPx(5f));
 				}
 				if (!Algorithms.isEmpty(streetStr) && !menu.displayStreetNameInTitle()) {
@@ -1830,7 +1838,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				line3.setVisibility(View.VISIBLE);
 				line3.setText(subtypeStr);
 				Drawable icon = menu.getSubtypeIcon();
-				line3.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
+				AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(
+						line3, icon, null, null, null);
 				line3.setCompoundDrawablePadding(dpToPx(5f));
 			}
 

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

@@ -32,6 +32,7 @@ import net.osmand.data.TransportStop;
 import net.osmand.map.OsmandRegions;
 import net.osmand.map.WorldRegion;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
@@ -59,6 +60,7 @@ import net.osmand.plus.mapcontextmenu.controllers.MapMarkerMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.MyLocationMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.PointDescriptionMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.RenderedObjectMenuController;
+import net.osmand.plus.mapcontextmenu.controllers.SelectedGpxMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.TargetPointMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.TransportRouteController;
 import net.osmand.plus.mapcontextmenu.controllers.TransportStopController;
@@ -227,6 +229,8 @@ public abstract class MenuController extends BaseMenuController implements Colla
 				menuController = new RenderedObjectMenuController(mapActivity, pointDescription, (RenderedObject) object);
 			} else if (object instanceof MapillaryImage) {
 				menuController = new MapillaryMenuController(mapActivity, pointDescription, (MapillaryImage) object);
+			} else if (object instanceof SelectedGpxFile) {
+				menuController = new SelectedGpxMenuController(mapActivity, pointDescription, (SelectedGpxFile) object);
 			}
 		}
 		if (menuController == null) {
@@ -659,7 +663,7 @@ public abstract class MenuController extends BaseMenuController implements Colla
 			}
 
 			leftDownloadButtonController.visible = !downloaded;
-			leftDownloadButtonController.leftIconId = R.drawable.ic_action_import;
+			leftDownloadButtonController.startIconId = R.drawable.ic_action_import;
 
 			boolean internetConnectionAvailable =
 					mapActivity.getMyApplication().getSettings().isInternetConnectionAvailable();
@@ -712,33 +716,33 @@ public abstract class MenuController extends BaseMenuController implements Colla
 
 	public abstract class TitleButtonController {
 		public String caption = "";
-		public int leftIconId = 0;
+		public int startIconId = 0;
-		public int rightIconId = 0;
+		public int endIconId = 0;
 		public boolean needRightText = false;
 		public String rightTextCaption = "";
 		public boolean visible = true;
 		public boolean tintIcon = true;
-		public Drawable leftIcon;
+		public Drawable startIcon;
-		public Drawable rightIcon;
+		public Drawable endIcon;
 		public boolean enabled = true;
 
 		@Nullable
-		public Drawable getLeftIcon() {
+		public Drawable getStartIcon() {
 			return getIconDrawable(true);
 		}
 
 		@Nullable
-		public Drawable getRightIcon() {
+		public Drawable getEndIcon() {
 			return getIconDrawable(false);
 		}
 
 		@Nullable
-		private Drawable getIconDrawable(boolean left) {
+		private Drawable getIconDrawable(boolean start) {
-			Drawable drawable = left ? leftIcon : rightIcon;
+			Drawable drawable = start ? startIcon : endIcon;
 			if (drawable != null) {
 				return drawable;
 			}
-			int resId = left ? leftIconId : rightIconId;
+			int resId = start ? startIconId : endIconId;
 			if (resId != 0) {
 				if (tintIcon) {
 					return enabled ? getNormalIcon(resId) : getDisabledIcon(resId);
@@ -751,11 +755,11 @@ public abstract class MenuController extends BaseMenuController implements Colla
 
 		public void clearIcon(boolean left) {
 			if (left) {
-				leftIcon = null;
+				startIcon = null;
-				leftIconId = 0;
+				startIconId = 0;
 			} else {
-				rightIcon = null;
+				endIcon = null;
-				rightIconId = 0;
+				endIconId = 0;
 			}
 		}
 
@@ -893,7 +897,7 @@ public abstract class MenuController extends BaseMenuController implements Colla
 				};
 				leftDownloadButtonController.caption =
 						downloadRegion != null ? downloadRegion.getLocaleName() : mapActivity.getString(R.string.shared_string_download);
-				leftDownloadButtonController.leftIconId = R.drawable.ic_action_import;
+				leftDownloadButtonController.startIconId = R.drawable.ic_action_import;
 
 				titleProgressController = new TitleProgressController() {
 					@Override

OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java

@@ -278,7 +278,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
 					light ? R.color.ctx_menu_controller_button_text_color_light_n : R.color.ctx_menu_controller_button_text_color_dark_n);
 			Drawable pressed = app.getUIUtilities().getIcon(R.drawable.ic_action_read_text,
 					light ? R.color.ctx_menu_controller_button_text_color_light_p : R.color.ctx_menu_controller_button_text_color_dark_p);
-			button.setCompoundDrawablesWithIntrinsicBounds(Build.VERSION.SDK_INT >= 21
+			AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(button, Build.VERSION.SDK_INT >= 21
 					? AndroidUtils.createPressedStateListDrawable(normal, pressed) : normal, null, null, null);
 			button.setCompoundDrawablePadding(dpToPx(8f));
 			llText.addView(button);

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

@@ -201,8 +201,8 @@ public class AMapPointMenuController extends MenuController {
 		OsmandApplication app = mapActivity.getMyApplication();
 		titleButtonController.caption = contextMenuButton.getLeftTextCaption();
 		titleButtonController.rightTextCaption = contextMenuButton.getRightTextCaption();
-		titleButtonController.leftIconId = AndroidUtils.getDrawableId(app, contextMenuButton.getLeftIconName());
+		titleButtonController.startIconId = AndroidUtils.getDrawableId(app, contextMenuButton.getLeftIconName());
-		titleButtonController.rightIconId = AndroidUtils.getDrawableId(app, contextMenuButton.getRightIconName());
+		titleButtonController.endIconId = AndroidUtils.getDrawableId(app, contextMenuButton.getRightIconName());
 		titleButtonController.enabled = contextMenuButton.isEnabled();
 		titleButtonController.tintIcon = contextMenuButton.isTintIcon();
 

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

@@ -79,7 +79,7 @@ public class AmenityMenuController extends MenuController {
 				}
 			};
 			leftTitleButtonController.caption = mapActivity.getString(R.string.context_menu_read_article);
-			leftTitleButtonController.leftIconId = R.drawable.ic_action_read_text;
+			leftTitleButtonController.startIconId = R.drawable.ic_action_read_text;
 		}
 
 		openingHoursInfo = OpeningHoursParser.getInfo(amenity.getOpeningHours());

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

@@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.content.ContextCompat;
 
 import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmandApplication;
@@ -41,7 +40,7 @@ public class ImpassibleRoadsMenuController extends MenuController {
 			}
 		};
 		leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_remove);
-		leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+		leftTitleButtonController.startIconId = R.drawable.ic_action_delete_dark;
 	}
 
 	@Override

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

@@ -124,7 +124,7 @@ public class MapDataMenuController extends MenuController {
 			}
 		};
 		leftDownloadButtonController.caption = mapActivity.getString(R.string.shared_string_download);
-		leftDownloadButtonController.leftIconId = R.drawable.ic_action_import;
+		leftDownloadButtonController.startIconId = R.drawable.ic_action_import;
 
 		rightDownloadButtonController = new TitleButtonController() {
 			@Override
@@ -154,7 +154,7 @@ public class MapDataMenuController extends MenuController {
 			}
 		};
 		rightDownloadButtonController.caption = mapActivity.getString(R.string.download_select_map_types);
-		rightDownloadButtonController.leftIconId = R.drawable.ic_plugin_srtm;
+		rightDownloadButtonController.startIconId = R.drawable.ic_plugin_srtm;
 
 		bottomTitleButtonController = new TitleButtonController() {
 			@Override
@@ -171,7 +171,7 @@ public class MapDataMenuController extends MenuController {
 			}
 		};
 		bottomTitleButtonController.caption = mapActivity.getString(R.string.shared_string_delete);
-		bottomTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+		bottomTitleButtonController.startIconId = R.drawable.ic_action_delete_dark;
 
 		titleProgressController = new TitleProgressController() {
 			@Override
@@ -396,7 +396,7 @@ public class MapDataMenuController extends MenuController {
 		}
 
 		leftDownloadButtonController.visible = true;
-		leftDownloadButtonController.leftIconId = R.drawable.ic_action_import;
+		leftDownloadButtonController.startIconId = R.drawable.ic_action_import;
 		if (backuped) {
 			leftDownloadButtonController.caption = mapActivity.getString(R.string.local_index_mi_restore);
 		} else if (indexItem != null) {

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

@@ -48,7 +48,7 @@ public class MapMarkerMenuController extends MenuController {
 			}
 		};
 		leftTitleButtonController.caption = mapActivity.getString(mapMarker.history ? R.string.shared_string_restore : R.string.mark_passed);
-		leftTitleButtonController.leftIcon = createPassedIcon(getPassedIconBgNormalColorId());
+		leftTitleButtonController.startIcon = createPassedIcon(getPassedIconBgNormalColorId());
 
 		if (!mapMarker.history) {
 			rightTitleButtonController = new TitleButtonController() {
@@ -69,7 +69,7 @@ public class MapMarkerMenuController extends MenuController {
 				}
 			};
 			rightTitleButtonController.caption = mapActivity.getString(R.string.make_active);
-			rightTitleButtonController.leftIcon = createShowOnTopbarIcon(getDeviceTopNormalColorId());
+			rightTitleButtonController.startIcon = createShowOnTopbarIcon(getDeviceTopNormalColorId());
 		}
 	}
 

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

@@ -39,7 +39,7 @@ public class PointDescriptionMenuController extends MenuController {
 				}
 			};
 			leftTitleButtonController.caption = mapActivity.getString(R.string.avoid_road);
-			leftTitleButtonController.leftIconId = R.drawable.ic_action_road_works_dark;
+			leftTitleButtonController.startIconId = R.drawable.ic_action_road_works_dark;
 		}
 	}
 

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

@@ -0,0 +1,178 @@
+package net.osmand.plus.mapcontextmenu.controllers;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.GPXUtilities;
+import net.osmand.data.PointDescription;
+import net.osmand.plus.GpxSelectionHelper;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.TrackActivity;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.mapcontextmenu.MenuBuilder;
+import net.osmand.plus.mapcontextmenu.MenuController;
+import net.osmand.plus.settings.backend.OsmandSettings;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SelectedGpxMenuController extends MenuController {
+
+	private SelectedGpxFile item;
+
+	public SelectedGpxMenuController(@NonNull final MapActivity mapActivity, @NonNull PointDescription pointDescription, @NonNull final SelectedGpxFile item) {
+		super(new MenuBuilder(mapActivity), pointDescription, mapActivity);
+		this.item = item;
+
+		leftTitleButtonController = new TitleButtonController() {
+			@Override
+			public void buttonPressed() {
+				Intent intent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
+				intent.putExtra(TrackActivity.TRACK_FILE_NAME, item.getGpxFile().path);
+				intent.putExtra(TrackActivity.OPEN_TRACKS_LIST, true);
+				intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				mapActivity.startActivity(intent);
+			}
+		};
+		leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_open_track);
+		leftTitleButtonController.startIconId = R.drawable.ic_action_folder;
+
+		rightTitleButtonController = new TitleButtonController() {
+			@Override
+			public void buttonPressed() {
+				new OpenGpxDetailsTask(item).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+			}
+		};
+		rightTitleButtonController.caption = mapActivity.getString(R.string.analyze_on_map);
+		rightTitleButtonController.startIconId = R.drawable.ic_action_track_16;
+	}
+
+	private class OpenGpxDetailsTask extends AsyncTask<Void, Void, GpxSelectionHelper.GpxDisplayItem> {
+
+		private SelectedGpxFile item;
+		ProgressDialog progressDialog;
+
+		OpenGpxDetailsTask(SelectedGpxFile item) {
+			this.item = item;
+		}
+
+		@Override
+		protected void onPreExecute() {
+			if (item.getGpxFile().path != null) {
+				progressDialog = new ProgressDialog(getMapActivity());
+				progressDialog.setTitle("");
+				progressDialog.setMessage(getMapActivity().getResources().getString(R.string.loading_data));
+				progressDialog.setCancelable(false);
+				progressDialog.show();
+			}
+		}
+
+		@Override
+		protected GpxSelectionHelper.GpxDisplayItem doInBackground(Void... voids) {
+			GpxSelectionHelper.GpxDisplayGroup gpxDisplayGroup = null;
+			GPXUtilities.GPXFile gpxFile = null;
+			GPXUtilities.Track generalTrack = null;
+			if (item.getGpxFile().path != null) {
+				gpxFile = GPXUtilities.loadGPXFile(new File(item.getGpxFile().path));
+			}
+			if (gpxFile != null) {
+				generalTrack = gpxFile.getGeneralTrack();
+			}
+			OsmandApplication app = getMapActivity().getMyApplication();
+			if (generalTrack != null) {
+				gpxFile.addGeneralTrack();
+				gpxDisplayGroup = app.getSelectedGpxHelper().buildGeneralGpxDisplayGroup(gpxFile, generalTrack);
+			} else if (gpxFile != null && gpxFile.tracks.size() > 0) {
+				gpxDisplayGroup = app.getSelectedGpxHelper().buildGeneralGpxDisplayGroup(gpxFile, gpxFile.tracks.get(0));
+			}
+			List<GpxSelectionHelper.GpxDisplayItem> items = null;
+			if (gpxDisplayGroup != null) {
+				items = gpxDisplayGroup.getModifiableList();
+			}
+			if (items != null && items.size() > 0) {
+				return items.get(0);
+			}
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(GpxSelectionHelper.GpxDisplayItem gpxItem) {
+			if (progressDialog != null) {
+				progressDialog.dismiss();
+			}
+			if (gpxItem != null && gpxItem.analysis != null) {
+				ArrayList<GpxUiHelper.GPXDataSetType> list = new ArrayList<>();
+				if (gpxItem.analysis.hasElevationData) {
+					list.add(GpxUiHelper.GPXDataSetType.ALTITUDE);
+				}
+				if (gpxItem.analysis.hasSpeedData) {
+					list.add(GpxUiHelper.GPXDataSetType.SPEED);
+				} else if (gpxItem.analysis.hasElevationData) {
+					list.add(GpxUiHelper.GPXDataSetType.SLOPE);
+				}
+				if (list.size() > 0) {
+					gpxItem.chartTypes = list.toArray(new GpxUiHelper.GPXDataSetType[list.size()]);
+				}
+
+				MapActivity mapActivity = getMapActivity();
+				OsmandApplication app = mapActivity.getMyApplication();
+				final OsmandSettings settings = app.getSettings();
+				settings.setMapLocationToShow(gpxItem.locationStart.lat, gpxItem.locationStart.lon,
+						settings.getLastKnownMapZoom(),
+						new PointDescription(PointDescription.POINT_TYPE_WPT, gpxItem.name),
+						false,
+						gpxItem);
+				mapActivity.getContextMenu().hide();
+				MapActivity.launchMapActivityMoveToTop(mapActivity);
+			}
+		}
+	}
+
+	@Override
+	protected void setObject(Object object) {
+		if (object instanceof SelectedGpxFile) {
+			this.item = (SelectedGpxFile) object;
+		}
+	}
+
+	@Override
+	protected Object getObject() {
+		return item;
+	}
+
+	@NonNull
+	@Override
+	public String getTypeStr() {
+		return getPointDescription().getTypeName();
+	}
+
+	@NonNull
+	@Override
+	public String getCommonTypeStr() {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			return mapActivity.getString(R.string.shared_string_gpx_track);
+		} else {
+			return "";
+		}
+	}
+
+	@Override
+	public boolean needStreetName() {
+		return false;
+	}
+
+	@Override
+	public Drawable getRightIcon() {
+		int color = isLight() ? R.color.active_color_primary_light : R.color.active_color_primary_dark;
+		return getIcon(R.drawable.ic_action_polygom_dark, color);
+	}
+}

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

@@ -52,10 +52,10 @@ public class TargetPointMenuController extends MenuController {
 		};
 		if (nav && intermediatePointsCount == 0 && !targetPoint.start) {
 			leftTitleButtonController.caption = mapActivity.getString(R.string.cancel_navigation);
-			leftTitleButtonController.leftIconId = R.drawable.ic_action_remove_dark;
+			leftTitleButtonController.startIconId = R.drawable.ic_action_remove_dark;
 		} else {
 			leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_remove);
-			leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+			leftTitleButtonController.startIconId = R.drawable.ic_action_delete_dark;
 		}
 	}
 

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

@@ -82,11 +82,11 @@ public class TransportRouteController extends MenuController {
 		rightTitleButtonController.caption = mapActivity.getString(R.string.shared_string_next);
 
 		if (AndroidUtils.isLayoutRtl(mapActivity)) {
-			leftTitleButtonController.rightIconId = R.drawable.ic_arrow_forward;
+			leftTitleButtonController.endIconId = R.drawable.ic_arrow_forward;
-			rightTitleButtonController.leftIconId = R.drawable.ic_arrow_back;
+			rightTitleButtonController.startIconId = R.drawable.ic_arrow_back;
 		} else {
-			leftTitleButtonController.leftIconId = R.drawable.ic_arrow_back;
+			leftTitleButtonController.startIconId = R.drawable.ic_arrow_back;
-			rightTitleButtonController.rightIconId = R.drawable.ic_arrow_forward;
+			rightTitleButtonController.endIconId = R.drawable.ic_arrow_forward;
 		}
 	}
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
@@ -87,6 +88,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 	private OsmandApplication app;
 	private View descriptionCaption;
 	private EditText descriptionEdit;
+	private int layoutHeightPrevious = 0;
 
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
@@ -281,10 +283,29 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 				return false;
 			}
 		});
-
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			view.getViewTreeObserver().addOnGlobalLayoutListener(getOnGlobalLayoutListener());
+		}
 		return view;
 	}
 
+	private ViewTreeObserver.OnGlobalLayoutListener getOnGlobalLayoutListener() {
+		return new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override
+			public void onGlobalLayout() {
+				Rect visibleDisplayFrame = new Rect();
+				view.getWindowVisibleDisplayFrame(visibleDisplayFrame);
+				int layoutHeight = visibleDisplayFrame.bottom;
+				if (layoutHeight != layoutHeightPrevious) {
+					FrameLayout.LayoutParams rootViewLayout = (FrameLayout.LayoutParams) view.getLayoutParams();
+					rootViewLayout.height = layoutHeight;
+					view.requestLayout();
+					layoutHeightPrevious = layoutHeight;
+				}
+			}
+		};
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();

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

@@ -2,15 +2,14 @@ package net.osmand.plus.mapcontextmenu.other;
 
 import android.content.Context;
 import android.graphics.Matrix;
-import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.PopupMenu;
 
 import com.github.mikephil.charting.charts.LineChart;
 import com.github.mikephil.charting.data.Entry;
@@ -35,7 +34,6 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType;
@@ -49,6 +47,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import static net.osmand.plus.SimplePopUpMenuItemAdapter.SimplePopUpMenuItem;
+
 public class TrackDetailsMenu {
 
 	@Nullable
@@ -172,6 +172,8 @@ public class TrackDetailsMenu {
 						}
 					}
 				});
+				int navigationIconResId = AndroidUtils.getNavigationIconResId(mapActivity);
+				toolbarController.setBackBtnIconIds(navigationIconResId, navigationIconResId);
 				toolbarController.setOnCloseButtonClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
@@ -489,6 +491,9 @@ public class TrackDetailsMenu {
 		if (mapActivity == null || gpxItem == null) {
 			return;
 		}
+		final OsmandApplication app = mapActivity.getMyApplication();
+		final UiUtilities ic = app.getUIUtilities();
+		final boolean nightMode = app.getDaynightHelper().isNightModeForMapControls();
 		GPXTrackAnalysis analysis = gpxItem.analysis;
 		if (analysis == null || gpxItem.chartTypes == null) {
 			parentView.setVisibility(View.GONE);
@@ -575,9 +580,6 @@ public class TrackDetailsMenu {
 			}
 		});
 
-		final OsmandApplication app = mapActivity.getMyApplication();
-		final UiUtilities ic = app.getUIUtilities();
-
 		GpxUiHelper.setupGPXChart(app, chart, 4);
 
 		List<ILineDataSet> dataSets = new ArrayList<>();
@@ -651,23 +653,22 @@ public class TrackDetailsMenu {
 			yAxis.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					PopupMenu optionsMenu = new PopupMenu(v.getContext(), v);
+					Context themedContext = UiUtilities.getThemedContext(v.getContext(), nightMode);
-					DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
+					List<SimplePopUpMenuItem> items = new ArrayList<>();
-					for (final GPXDataSetType[] types : availableTypes) {
+					for (GPXDataSetType[] types : availableTypes) {
-						MenuItem menuItem = optionsMenu.getMenu()
+						items.add(new SimplePopUpMenuItem(
-								.add(GPXDataSetType.getName(app, types))
+								GPXDataSetType.getName(app, types),
-								.setIcon(GPXDataSetType.getImageDrawable(app, types));
+								GPXDataSetType.getImageDrawable(app, types)));
-						menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem mItem) {
-								GpxDisplayItem gpxItem = getGpxItem();
-								gpxItem.chartTypes = types;
-								update();
-								return true;
-							}
-						});
 					}
-					optionsMenu.show();
+					UiUtilities.createListPopupWindow(
+							themedContext, v, v.getWidth(), items, new AdapterView.OnItemClickListener() {
+						@Override
+						public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+							GpxDisplayItem gpxItem = getGpxItem();
+							gpxItem.chartTypes = availableTypes.get(position);
+							update();
+						}
+					}).show();
 				}
 			});
 			yAxisArrow.setVisibility(View.VISIBLE);
@@ -695,28 +696,25 @@ public class TrackDetailsMenu {
 			xAxis.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					final PopupMenu optionsMenu = new PopupMenu(v.getContext(), v);
+					Context themedContext = UiUtilities.getThemedContext(v.getContext(), nightMode);
-					DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
+					List<SimplePopUpMenuItem> items = new ArrayList<>();
-					for (final GPXDataSetAxisType type : GPXDataSetAxisType.values()) {
+					for (GPXDataSetAxisType type : GPXDataSetAxisType.values()) {
-						MenuItem menuItem = optionsMenu.getMenu()
+						items.add(new SimplePopUpMenuItem(
-								.add(type.getStringId()).setIcon(type.getImageDrawable(app));
+								app.getString(type.getStringId()), type.getImageDrawable(app)));
-						menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-							@Override
-							public boolean onMenuItemClick(MenuItem mItem) {
-								GpxDisplayItem gpxItem = getGpxItem();
-								if (gpxItem != null) {
-									gpxItem.chartAxisType = type;
-									gpxItem.chartHighlightPos = -1;
-									gpxItem.chartMatrix = null;
-									update();
-									return true;
-								} else {
-									return false;
-								}
-							}
-						});
 					}
-					optionsMenu.show();
+					UiUtilities.createListPopupWindow(themedContext,
+							v, v.getWidth(), items, new AdapterView.OnItemClickListener() {
+						@Override
+						public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+							GpxDisplayItem gpxItem = getGpxItem();
+							if (gpxItem != null) {
+								gpxItem.chartAxisType = GPXDataSetAxisType.values()[position];
+								gpxItem.chartHighlightPos = -1;
+								gpxItem.chartMatrix = null;
+								update();
+							}
+						}
+					}).show();
 				}
 			});
 			xAxisArrow.setVisibility(View.VISIBLE);

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

@@ -30,6 +30,7 @@ public class TrackDetailsMenuFragment extends BaseOsmAndFragment {
 	private TrackDetailsMenu menu;
 	private View mainView;
 	private boolean paused = true;
+	private boolean nightMode;
 
 	@Nullable
 	private MapActivity getMapActivity() {
@@ -46,7 +47,7 @@ public class TrackDetailsMenuFragment extends BaseOsmAndFragment {
 							 Bundle savedInstanceState) {
 		MapActivity mapActivity = requireMapActivity();
 		menu = mapActivity.getTrackDetailsMenu();
-		boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		ContextThemeWrapper context =
 				new ContextThemeWrapper(mapActivity, !nightMode ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme);
 		View view = LayoutInflater.from(context).inflate(R.layout.track_details, container, false);
@@ -192,7 +193,6 @@ public class TrackDetailsMenuFragment extends BaseOsmAndFragment {
 		if (ctx != null) {
 			boolean portraitMode = AndroidUiHelper.isOrientationPortrait(ctx);
 			boolean landscapeLayout = !portraitMode;
-			boolean nightMode = ctx.getMyApplication().getDaynightHelper().isNightModeForMapControls();
 			if (!landscapeLayout) {
 				AndroidUtils.setBackground(ctx, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 			} else {

OsmAnd/src/net/osmand/plus/mapsource/EditMapSourceDialogFragment.java

@@ -120,8 +120,11 @@ public class EditMapSourceDialogFragment extends BaseOsmAndDialogFragment
 			elliptic = savedInstanceState.getBoolean(ELLIPTIC_KEY);
 			sqliteDB = savedInstanceState.getBoolean(SQLITE_DB_KEY);
 		}
-		View root = UiUtilities.getMaterialInflater(app, nightMode).inflate(R.layout.fragment_edit_map_source, container, false);
+		View root = UiUtilities.getMaterialInflater(requireContext(), nightMode).inflate(R.layout.fragment_edit_map_source, container, false);
 		Toolbar toolbar = root.findViewById(R.id.toolbar);
+		toolbar.setBackgroundColor(ContextCompat.getColor(app, nightMode ? R.color.app_bar_color_dark : R.color.app_bar_color_light));
+		toolbar.setTitleTextColor(ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light));
+		toolbar.setTitle(editedLayerName == null ? R.string.add_online_source : R.string.edit_online_source);
 		ImageButton iconHelp = root.findViewById(R.id.toolbar_action);
 		Drawable closeDrawable = app.getUIUtilities().getIcon(AndroidUtils.getNavigationIconResId(app),
 				nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light);
@@ -145,6 +148,7 @@ public class EditMapSourceDialogFragment extends BaseOsmAndDialogFragment
 		int boxStrokeColor = nightMode
 				? ContextCompat.getColor(app, R.color.app_bar_color_light)
 				: ContextCompat.getColor(app, R.color.active_buttons_and_links_bg_pressed_dark);
+		int btnBgColorRes = nightMode ? R.color.list_background_color_dark : R.color.list_background_color_light;
 		TextInputLayout nameInputLayout = root.findViewById(R.id.name_input_layout);
 		nameInputLayout.setBoxStrokeColor(boxStrokeColor);
 		nameEditText = root.findViewById(R.id.name_edit_text);
@@ -155,7 +159,12 @@ public class EditMapSourceDialogFragment extends BaseOsmAndDialogFragment
 		urlEditText.addTextChangedListener(getTextWatcher());
 		contentContainer = root.findViewById(R.id.content_container);
 		saveBtn = root.findViewById(R.id.save_button);
+		saveBtn.setBackgroundResource(nightMode ? R.drawable.dlg_btn_primary_dark : R.drawable.dlg_btn_primary_light);
+		FrameLayout saveBtnBg = root.findViewById(R.id.save_button_bg);
+		saveBtnBg.setBackgroundColor(ContextCompat.getColor(app, btnBgColorRes));
 		saveBtnTitle = root.findViewById(R.id.save_button_title);
+		saveBtnTitle.setTextColor(ContextCompat.getColorStateList(app,
+				nightMode ? R.color.dlg_btn_primary_text_dark : R.color.dlg_btn_primary_text_light));
 		saveBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -270,19 +279,22 @@ public class EditMapSourceDialogFragment extends BaseOsmAndDialogFragment
 
 			@Override
 			public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-				String s = charSequence.toString();
+
-				if (Algorithms.isEmpty(s)) {
-					saveBtn.setEnabled(false);
-					saveBtnTitle.setEnabled(false);
-				} else {
-					saveBtn.setEnabled(true);
-					saveBtnTitle.setEnabled(true);
-				}
 			}
 
 			@Override
 			public void afterTextChanged(Editable editable) {
-
+				if (nameEditText.getText() != null && urlEditText.getText() != null) {
+					String name = nameEditText.getText().toString().trim();
+					String url = urlEditText.getText().toString().trim();
+					if (Algorithms.isEmpty(name) || Algorithms.isEmpty(url)) {
+						saveBtn.setEnabled(false);
+						saveBtnTitle.setEnabled(false);
+					} else {
+						saveBtn.setEnabled(true);
+						saveBtnTitle.setEnabled(true);
+					}
+				}
 			}
 		};
 	}
@@ -396,7 +408,7 @@ public class EditMapSourceDialogFragment extends BaseOsmAndDialogFragment
 							InputZoomLevelsBottomSheet.showInstance(
 									fm, EditMapSourceDialogFragment.this,
 									R.string.map_source_zoom_levels, R.string.map_source_zoom_levels_descr,
-									minZoom, maxZoom
+									minZoom, maxZoom, editedLayerName == null
 							);
 							break;
 						case EXPIRE_TIME:

OsmAnd/src/net/osmand/plus/mapsource/InputZoomLevelsBottomSheet.java

@@ -1,5 +1,7 @@
 package net.osmand.plus.mapsource;
 
+import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -11,11 +13,12 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.google.android.material.slider.Slider;
+import com.google.android.material.slider.RangeSlider;
 
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
@@ -39,6 +42,7 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 	private static final String MAX_ZOOM_KEY = "max_zoom_key";
 	private static final String SLIDER_DESCR_RES_KEY = "slider_descr_key";
 	private static final String DIALOG_DESCR_RES_KEY = "dialog_descr_key";
+	private static final String NEW_MAP_SOURCE = "new_map_source";
 	private static final int SLIDER_FROM = 1;
 	private static final int SLIDER_TO = 22;
 	@StringRes
@@ -47,19 +51,22 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 	private int dialogDescrRes;
 	private int minZoom;
 	private int maxZoom;
+	private boolean newMapSource;
 
 	public static void showInstance(@NonNull FragmentManager fm,
 									@Nullable Fragment targetFragment,
 									int sliderDescr,
 									int dialogDescr,
 									int minZoom,
-									int maxZoom) {
+									int maxZoom,
+									boolean newMapSource) {
 		InputZoomLevelsBottomSheet bottomSheet = new InputZoomLevelsBottomSheet();
 		bottomSheet.setTargetFragment(targetFragment, 0);
 		bottomSheet.setSliderDescrRes(sliderDescr);
 		bottomSheet.setDialogDescrRes(dialogDescr);
 		bottomSheet.setMinZoom(Math.max(minZoom, SLIDER_FROM));
 		bottomSheet.setMaxZoom(Math.min(maxZoom, SLIDER_TO));
+		bottomSheet.setNewMapSource(newMapSource);
 		bottomSheet.show(fm, TAG);
 	}
 
@@ -71,8 +78,9 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 			maxZoom = savedInstanceState.getInt(MAX_ZOOM_KEY);
 			dialogDescrRes = savedInstanceState.getInt(DIALOG_DESCR_RES_KEY);
 			sliderDescrRes = savedInstanceState.getInt(SLIDER_DESCR_RES_KEY);
+			newMapSource = savedInstanceState.getBoolean(NEW_MAP_SOURCE);
 		}
-		LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
+		LayoutInflater inflater = UiUtilities.getMaterialInflater(app, nightMode);
 		TitleItem titleItem = new TitleItem(getString(R.string.shared_string_zoom_levels));
 		items.add(titleItem);
 		final View sliderView = inflater.inflate(R.layout.zoom_levels_with_descr, null);
@@ -90,16 +98,16 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 		minZoomValue.setText(String.valueOf(minZoom));
 		final TextView maxZoomValue = sliderView.findViewById(R.id.zoom_value_max);
 		maxZoomValue.setText(String.valueOf(maxZoom));
-		Slider slider = sliderView.findViewById(R.id.zoom_slider);
+		RangeSlider slider = sliderView.findViewById(R.id.zoom_slider);
 		int colorProfileRes = app.getSettings().getApplicationMode().getIconColorInfo().getColor(nightMode);
 		int colorProfile = ContextCompat.getColor(app, colorProfileRes);
 		UiUtilities.setupSlider(slider, nightMode, colorProfile, true);
 		slider.setValueFrom(SLIDER_FROM);
 		slider.setValueTo(SLIDER_TO);
 		slider.setValues((float) minZoom, (float) maxZoom);
-		slider.addOnChangeListener(new Slider.OnChangeListener() {
+		slider.addOnChangeListener(new RangeSlider.OnChangeListener() {
 			@Override
-			public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) {
+			public void onValueChange(@NonNull RangeSlider slider, float value, boolean fromUser) {
 				List<Float> values = slider.getValues();
 				if (values.size() > 0) {
 					minZoomValue.setText(String.valueOf(values.get(0).intValue()));
@@ -107,14 +115,13 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 				}
 			}
 		});
-		slider.addOnSliderTouchListener(new Slider.OnSliderTouchListener() {
+		slider.addOnSliderTouchListener(new RangeSlider.OnSliderTouchListener() {
 			@Override
-			public void onStartTrackingTouch(@NonNull Slider slider) {
+			public void onStartTrackingTouch(@NonNull RangeSlider slider) {
-
 			}
 
 			@Override
-			public void onStopTrackingTouch(@NonNull Slider slider) {
+			public void onStopTrackingTouch(@NonNull RangeSlider slider) {
 				List<Float> values = slider.getValues();
 				if (values.size() > 0) {
 					minZoom = values.get(0).intValue();
@@ -134,16 +141,17 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 		outState.putInt(MAX_ZOOM_KEY, maxZoom);
 		outState.putInt(SLIDER_DESCR_RES_KEY, sliderDescrRes);
 		outState.putInt(DIALOG_DESCR_RES_KEY, dialogDescrRes);
+		outState.putBoolean(NEW_MAP_SOURCE, newMapSource);
 		super.onSaveInstanceState(outState);
 	}
 
 	@Override
 	protected void onRightBottomButtonClick() {
-		Fragment fragment = getTargetFragment();
+		if (!newMapSource) {
-		if (fragment instanceof OnZoomSetListener) {
+			showClearTilesWarningDialog();
-			((OnZoomSetListener) fragment).onZoomSet(minZoom, maxZoom);
+		} else {
+			applySelectedZooms();
 		}
-		dismiss();
 	}
 
 	@Override
@@ -156,6 +164,46 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 		return R.string.shared_string_apply;
 	}
 
+	private void showClearTilesWarningDialog() {
+		Context themedContext = UiUtilities.getThemedContext(getActivity(), nightMode);
+		AlertDialog.Builder dismissDialog = new AlertDialog.Builder(themedContext);
+		dismissDialog.setTitle(getString(R.string.osmand_parking_warning));
+		dismissDialog.setMessage(getString(R.string.clear_tiles_warning));
+		dismissDialog.setNegativeButton(R.string.shared_string_cancel, null);
+		dismissDialog.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				applySelectedZooms();
+			}
+		});
+		dismissDialog.show();
+	}
+
+	private void applySelectedZooms() {
+		Fragment fragment = getTargetFragment();
+		if (fragment instanceof OnZoomSetListener) {
+			((OnZoomSetListener) fragment).onZoomSet(minZoom, maxZoom);
+		}
+		dismiss();
+	}
+
+	private SpannableString createSpannableString(@NonNull String text, @NonNull String... textToStyle) {
+		SpannableString spannable = new SpannableString(text);
+		for (String t : textToStyle) {
+			try {
+				int startIndex = text.indexOf(t);
+				spannable.setSpan(
+						new CustomTypefaceSpan(FontCache.getRobotoMedium(requireContext())),
+						startIndex,
+						startIndex + t.length(),
+						Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+			} catch (RuntimeException e) {
+				LOG.error("Error trying to find index of " + t + " " + e);
+			}
+		}
+		return spannable;
+	}
+
 	private void setSliderDescrRes(int sliderDescrRes) {
 		this.sliderDescrRes = sliderDescrRes;
 	}
@@ -172,6 +220,10 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 		this.maxZoom = maxZoom;
 	}
 
+	public void setNewMapSource(boolean newMapSource) {
+		this.newMapSource = newMapSource;
+	}
+
 	public interface OnZoomSetListener {
 		void onZoomSet(int min, int max);
 	}

OsmAnd/src/net/osmand/plus/mapsource/MercatorProjectionBottomSheet.java

@@ -90,8 +90,10 @@ public class MercatorProjectionBottomSheet extends MenuBottomSheetDialogFragment
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
-					mercatorProjection = m;
+					if (mercatorProjection != m){
-					populateValuesList();
+						mercatorProjection = m;
+						dismiss();
+					}
 				}
 			});
 		}

OsmAnd/src/net/osmand/plus/mapsource/TileStorageFormatBottomSheet.java

@@ -90,8 +90,10 @@ public class TileStorageFormatBottomSheet extends MenuBottomSheetDialogFragment
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
-					tileStorageFormat = m;
+					if (tileStorageFormat != m) {
-					populateValuesList();
+						tileStorageFormat = m;
+						dismiss();
+					}
 				}
 			});
 		}

OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java

@@ -1492,8 +1492,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 				return true;
 			}
 		});
+		Drawable shareIcon = iconsCache.getThemedIcon((R.drawable.ic_action_gshare_dark));
 		item = optionsMenu.getMenu().add(R.string.shared_string_share)
-				.setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_gshare_dark));
+				.setIcon(AndroidUtils.getDrawableForDirection(app, shareIcon));
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {

OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java

@@ -393,7 +393,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
 
 		if (!mi.isActionViewExpanded()) {
 
-			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItem.SHOW_AS_ACTION_NEVER);
+			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItem.SHOW_AS_ACTION_NEVER, true);
 			GPXFile gpxFile = getGpx();
 			if (gpxFile != null && gpxFile.path != null) {
 				final MapMarkersHelper markersHelper = app.getMapMarkersHelper();

OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java

@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -152,7 +153,9 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 		GPXFile gpxFile = getGpx();
 		if (gpxFile != null) {
 			if (gpxFile.path != null && !gpxFile.showCurrentTrack) {
-				MenuItem item = menu.add(R.string.shared_string_share).setIcon(R.drawable.ic_action_gshare_dark)
+				Drawable shareIcon = app.getUIUtilities().getIcon((R.drawable.ic_action_gshare_dark));
+				MenuItem item = menu.add(R.string.shared_string_share)
+						.setIcon(AndroidUtils.getDrawableForDirection(app, shareIcon))
 						.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 							@Override
 							public boolean onMenuItemClick(MenuItem item) {

OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java

@@ -46,7 +46,7 @@ public class EditPOIMenuController extends MenuController {
 			}
 		};
 		leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_upload);
-		leftTitleButtonController.leftIconId = R.drawable.ic_action_export;
+		leftTitleButtonController.startIconId = R.drawable.ic_action_export;
 
 		rightTitleButtonController = new TitleButtonController() {
 			@Override
@@ -80,7 +80,7 @@ public class EditPOIMenuController extends MenuController {
 			}
 		};
 		rightTitleButtonController.caption = mapActivity.getString(R.string.shared_string_delete);
-		rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+		rightTitleButtonController.startIconId = R.drawable.ic_action_delete_dark;
 
 		categoryDescr = getCategoryDescr();
 

OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java

@@ -42,7 +42,7 @@ public class OsmBugMenuController extends MenuController {
 		} else {
 			leftTitleButtonController.caption = mapActivity.getString(R.string.poi_dialog_reopen);
 		}
-		leftTitleButtonController.leftIconId = R.drawable.ic_action_note_dark;
+		leftTitleButtonController.startIconId = R.drawable.ic_action_note_dark;
 
 		rightTitleButtonController = new TitleButtonController() {
 			@Override
@@ -54,7 +54,7 @@ public class OsmBugMenuController extends MenuController {
 			}
 		};
 		rightTitleButtonController.caption = mapActivity.getString(R.string.shared_string_close);
-		rightTitleButtonController.leftIconId = R.drawable.ic_action_remove_dark;
+		rightTitleButtonController.startIconId = R.drawable.ic_action_remove_dark;
 
 		updateData();
 	}

OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java

@@ -4,6 +4,7 @@ import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -248,7 +249,9 @@ public class OsmEditsFragment extends OsmAndListFragment implements SendPoiDialo
 		});
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
-		item = menu.add(R.string.shared_string_export).setIcon(R.drawable.ic_action_gshare_dark);
+		Drawable shareIcon = getMyApplication().getUIUtilities().getIcon((R.drawable.ic_action_gshare_dark));
+		item = menu.add(R.string.shared_string_export)
+				.setIcon(AndroidUtils.getDrawableForDirection(getMyApplication(), shareIcon));
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override

OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionMenuController.java

@@ -34,7 +34,7 @@ public class ParkingPositionMenuController extends MenuController {
 			}
 		};
 		leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_delete);
-		leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+		leftTitleButtonController.startIconId = R.drawable.ic_action_delete_dark;
 	}
 
 	private void buildParkingDescription(MapActivity mapActivity) {

OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java

@@ -15,6 +15,7 @@ import com.google.gson.reflect.TypeToken;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.quickaction.actions.ShowHideMapillaryAction;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.quickaction.actions.DayNightModeAction;
@@ -226,6 +227,7 @@ public class QuickActionRegistry {
 		quickActionTypes.add(MapStyleAction.TYPE);
 		quickActionTypes.add(DayNightModeAction.TYPE);
 		quickActionTypes.add(ShowHideTransportLinesAction.TYPE);
+		quickActionTypes.add(ShowHideMapillaryAction.TYPE);
 		// navigation
 		quickActionTypes.add(NavVoiceAction.TYPE);
 		quickActionTypes.add(NavDirectionsFromAction.TYPE);