string conflict resolved

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

@@ -2,6 +2,9 @@
 package net.osmand;
 
 
+import net.osmand.binary.StringBundle;
+import net.osmand.binary.StringBundleWriter;
+import net.osmand.binary.StringBundleXmlWriter;
 import net.osmand.data.QuadRect;
 import net.osmand.util.Algorithms;
 
@@ -13,7 +16,6 @@ import org.xmlpull.v1.XmlSerializer;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -315,6 +317,10 @@ public class GPXUtilities {
 			getExtensionsToWrite().put(PROFILE_TYPE_EXTENSION, profileType);
 		}
 
+		public void removeProfileType() {
+			getExtensionsToWrite().remove(PROFILE_TYPE_EXTENSION);
+		}
+
 		public int getTrkPtIndex() {
 			try {
 				return Integer.parseInt(getExtensionsToRead().get(TRKPT_INDEX_EXTENSION));
@@ -437,6 +443,44 @@ public class GPXUtilities {
 		public double maxlon;
 	}
 
+	public static class RouteSegment {
+		public String id;
+		public String length;
+		public String segmentTime;
+		public String speed;
+		public String turnType;
+		public String turnAngle;
+		public String types;
+		public String pointTypes;
+		public String names;
+
+		public StringBundle getStringBundle() {
+			StringBundle bundle = new StringBundle();
+			bundle.putString("id", id);
+			bundle.putString("length", length);
+			bundle.putString("segmentTime", segmentTime);
+			bundle.putString("speed", speed);
+			bundle.putString("turnType", turnType);
+			bundle.putString("turnAngle", turnAngle);
+			bundle.putString("types", types);
+			bundle.putString("pointTypes", pointTypes);
+			bundle.putString("names", names);
+			return bundle;
+		}
+	}
+
+	public static class RouteType {
+		public String tag;
+		public String value;
+
+		public StringBundle getStringBundle() {
+			StringBundle bundle = new StringBundle();
+			bundle.putString("t", tag);
+			bundle.putString("v", value);
+			return bundle;
+		}
+	}
+
 	public static class GPXTrackAnalysis {
 		public float totalDistance = 0;
 		public float totalDistanceWithoutGaps = 0;
@@ -1006,6 +1050,9 @@ public class GPXUtilities {
 		private List<WptPt> points = new ArrayList<>();
 		public List<Route> routes = new ArrayList<>();
 
+		public List<RouteSegment> routeSegments = new ArrayList<>();
+		public List<RouteType> routeTypes = new ArrayList<>();
+
 		public Exception error = null;
 		public String path = "";
 		public boolean showCurrentTrack;
@@ -1032,6 +1079,10 @@ public class GPXUtilities {
 			}
 		}
 
+		public boolean hasRoute() {
+			return !routeSegments.isEmpty() && !routeTypes.isEmpty();
+		}
+
 		public List<WptPt> getPoints() {
 			return Collections.unmodifiableList(points);
 		}
@@ -1744,6 +1795,7 @@ public class GPXUtilities {
 				serializer.endTag(null, "wpt"); //$NON-NLS-1$
 			}
 
+			assignRouteExtensionWriter(file);
 			writeExtensions(serializer, file);
 
 			serializer.endTag(null, "gpx"); //$NON-NLS-1$
@@ -1756,6 +1808,29 @@ public class GPXUtilities {
 		return null;
 	}
 
+	private static void assignRouteExtensionWriter(final GPXFile gpxFile) {
+		if (gpxFile.hasRoute() && gpxFile.getExtensionsWriter() == null) {
+			gpxFile.setExtensionsWriter(new GPXExtensionsWriter() {
+				@Override
+				public void writeExtensions(XmlSerializer serializer) {
+					StringBundle bundle = new StringBundle();
+					List<StringBundle> segmentsBundle = new ArrayList<>();
+					for (RouteSegment segment : gpxFile.routeSegments) {
+						segmentsBundle.add(segment.getStringBundle());
+					}
+					bundle.putBundleList("route", "segment", segmentsBundle);
+					List<StringBundle> typesBundle = new ArrayList<>();
+					for (RouteType routeType : gpxFile.routeTypes) {
+						typesBundle.add(routeType.getStringBundle());
+					}
+					bundle.putBundleList("types", "type", typesBundle);
+					StringBundleWriter bundleWriter = new StringBundleXmlWriter(bundle, serializer);
+					bundleWriter.writeBundle();
+				}
+			});
+		}
+	}
+
 	private static String getFilename(String path) {
 		if(path != null) {
 			int i = path.lastIndexOf('/');
@@ -1973,23 +2048,7 @@ public class GPXUtilities {
 	}
 
 	public static GPXFile loadGPXFile(InputStream f) {
-		return loadGPXFile(f, null, null);
-	}
-
-	public static GPXFile loadGPXFile(InputStream f, GPXFile gpxFile, GPXExtensionsReader extensionsReader) {
-		boolean readExtensionsOnly = false;
-		if (gpxFile == null) {
-			gpxFile = new GPXFile(null);
-		} else {
-			if (f == null) {
-				try {
-					f = new FileInputStream(new File(gpxFile.path));
-				} catch (FileNotFoundException e) {
-					return gpxFile;
-				}
-			}
-			readExtensionsOnly = extensionsReader != null;
-		}
+		GPXFile gpxFile = new GPXFile(null);
 		SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
 		format.setTimeZone(TimeZone.getTimeZone("UTC"));
 		SimpleDateFormat formatMillis = new SimpleDateFormat(GPX_TIME_FORMAT_MILLIS, Locale.US);
@@ -2003,6 +2062,10 @@ public class GPXUtilities {
 			Stack<GPXExtensions> parserState = new Stack<>();
 			boolean extensionReadMode = false;
 			boolean routePointExtension = false;
+			List<RouteSegment> routeSegments = gpxFile.routeSegments;
+			List<RouteType> routeTypes = gpxFile.routeTypes;
+			boolean routeExtension = false;
+			boolean typesExtension = false;
 			parserState.push(gpxFile);
 			int tok;
 			while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
@@ -2011,11 +2074,17 @@ public class GPXUtilities {
 					String tag = parser.getName();
 					if (extensionReadMode && parse != null && !routePointExtension) {
 						String tagName = tag.toLowerCase();
-						boolean extensionsRead = false;
-						if (extensionsReader != null) {
-							extensionsRead = extensionsReader.readExtensions(gpxFile, parser);
+						if (routeExtension) {
+							if (tagName.equals("segment")) {
+								RouteSegment segment = parseRouteSegmentAttributes(parser);
+								routeSegments.add(segment);
+							}
+						} else if (typesExtension) {
+							if (tagName.equals("type")) {
+								RouteType type = parseRouteTypeAttributes(parser);
+								routeTypes.add(type);
+							}
 						}
-						if (!readExtensionsOnly && !extensionsRead) {
 						switch (tagName) {
 							case "routepointextension":
 								routePointExtension = true;
@@ -2024,6 +2093,14 @@ public class GPXUtilities {
 								}
 								break;
 
+							case "route":
+								routeExtension = true;
+								break;
+
+							case "types":
+								typesExtension = true;
+								break;
+
 							default:
 								Map<String, String> values = readTextMap(parser, tag);
 								if (values.size() > 0) {
@@ -2042,7 +2119,6 @@ public class GPXUtilities {
 								}
 								break;
 						}
-						}
 					} else if (parse != null && tag.equals("extensions")) {
 						extensionReadMode = true;
 					} else if (routePointExtension) {
@@ -2051,7 +2127,7 @@ public class GPXUtilities {
 							routeTrackSegment.points.add(wptPt);
 							parserState.push(wptPt);
 						}
-					} else if (!readExtensionsOnly) {
+					} else {
 						if (parse instanceof GPXFile) {
 							if (tag.equals("gpx")) {
 								((GPXFile) parse).author = parser.getAttributeValue("", "creator");
@@ -2247,7 +2323,12 @@ public class GPXUtilities {
 					if (parse != null && tag.equals("extensions")) {
 						extensionReadMode = false;
 					}
-					if (readExtensionsOnly) {
+					if (extensionReadMode && tag.equals("route")) {
+						routeExtension = false;
+						continue;
+					}
+					if (extensionReadMode && tag.equals("types")) {
+						typesExtension = false;
 						continue;
 					}
 
@@ -2327,6 +2408,27 @@ public class GPXUtilities {
 		return wpt;
 	}
 
+	private static RouteSegment parseRouteSegmentAttributes(XmlPullParser parser) {
+		RouteSegment segment = new RouteSegment();
+		segment.id = parser.getAttributeValue("", "id");
+		segment.length = parser.getAttributeValue("", "length");
+		segment.segmentTime = parser.getAttributeValue("", "segmentTime");
+		segment.speed = parser.getAttributeValue("", "speed");
+		segment.turnType = parser.getAttributeValue("", "turnType");
+		segment.turnAngle = parser.getAttributeValue("", "turnAngle");
+		segment.types = parser.getAttributeValue("", "types");
+		segment.pointTypes = parser.getAttributeValue("", "pointTypes");
+		segment.names = parser.getAttributeValue("", "names");
+		return segment;
+	}
+
+	private static RouteType parseRouteTypeAttributes(XmlPullParser parser) {
+		RouteType type = new RouteType();
+		type.tag = parser.getAttributeValue("", "t");
+		type.value = parser.getAttributeValue("", "v");
+		return type;
+	}
+
 	private static Bounds parseBoundsAttributes(XmlPullParser parser) {
 		Bounds bounds = new Bounds();
 		try {

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

@@ -25,15 +25,15 @@ public class LocationsHolder {
 		this.locationType = resolveLocationType(locations);
 		switch (locationType) {
 			case LOCATION_TYPE_LATLON:
-				latLonList = (List<LatLon>) locations;
+				latLonList = new ArrayList<>((List<LatLon>) locations);
 				size = locations.size();
 				break;
 			case LOCATION_TYPE_LOCATION:
-				locationList = (List<Location>) locations;
+				locationList = new ArrayList<>((List<Location>) locations);
 				size = locations.size();
 				break;
 			case LOCATION_TYPE_WPTPT:
-				wptPtList = (List<WptPt>) locations;
+				wptPtList = new ArrayList<>((List<WptPt>) locations);
 				size = locations.size();
 				break;
 		}

OsmAnd-java/src/main/java/net/osmand/binary/StringBundle.java

@@ -21,7 +21,7 @@ public class StringBundle {
 	private static final DecimalFormat FIVE_DIGITS_FORMATTER = new DecimalFormat("#.#####");
 	private static final DecimalFormat SIX_DIGITS_FORMATTER = new DecimalFormat("#.######");
 
-	private Map<String, Item> map = new LinkedHashMap<>();
+	private Map<String, Item<?>> map = new LinkedHashMap<>();
 
 	public enum ItemType {
 		STRING,
@@ -32,7 +32,7 @@ public class StringBundle {
 	public StringBundle() {
 	}
 
-	protected StringBundle(Map<String, Item> map) {
+	protected StringBundle(Map<String, Item<?>> map) {
 		this.map = map;
 	}
 
@@ -156,16 +156,16 @@ public class StringBundle {
 		}
 	}
 
-	public static class StringListItem extends Item<List<Item>> {
+	public static class StringListItem extends Item<List<Item<?>>> {
 
-		private StringListItem(String name, List<Item> list) {
+		private StringListItem(String name, List<Item<?>> list) {
 			super(name, ItemType.LIST, list);
 		}
 	}
 
-	public static class StringMapItem extends Item<Map<String, Item>> {
+	public static class StringMapItem extends Item<Map<String, Item<?>>> {
 
-		private StringMapItem(String name, Map<String, Item> map) {
+		private StringMapItem(String name, Map<String, Item<?>> map) {
 			super(name, ItemType.MAP, map);
 		}
 	}
@@ -177,11 +177,11 @@ public class StringBundle {
 		}
 	}
 
-	public Map<String, Item> getMap() {
+	public Map<String, Item<?>> getMap() {
 		return Collections.unmodifiableMap(map);
 	}
 
-	public Item getItem(String key) {
+	public Item<?> getItem(String key) {
 		return map.get(key);
 	}
 
@@ -190,7 +190,7 @@ public class StringBundle {
 	}
 
 	public int getInt(String key, int defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asInt(defaultValue) : defaultValue;
 	}
 
@@ -199,7 +199,7 @@ public class StringBundle {
 	}
 
 	public long getLong(String key, long defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asLong(defaultValue) : defaultValue;
 	}
 
@@ -212,7 +212,7 @@ public class StringBundle {
 	}
 
 	public float getFloat(String key, float defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asFloat(defaultValue) : defaultValue;
 	}
 
@@ -221,7 +221,7 @@ public class StringBundle {
 	}
 
 	public boolean getBoolean(String key, boolean defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asBoolean(defaultValue) : defaultValue;
 	}
 
@@ -232,35 +232,13 @@ public class StringBundle {
 	}
 
 	public String getString(String key, String defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).getValue() : defaultValue;
 	}
 
-	public void putObject(String key, StringExternalizable object) {
-		if (object != null) {
-			StringBundle bundle = newInstance();
-			object.writeToBundle(bundle);
-			map.put(key, new StringBundleItem(key, bundle));
-		}
-	}
-
-	public void putList(String key, String itemName, List<? extends StringExternalizable> list) {
-		if (list != null) {
-			List<Item> itemList = new ArrayList<>();
-			for (StringExternalizable ex : list) {
-				if (ex != null) {
-					StringBundle bundle = newInstance();
-					ex.writeToBundle(bundle);
-					itemList.add(new StringBundleItem(itemName, bundle));
-				}
-			}
-			map.put(key, new StringListItem(key, itemList));
-		}
-	}
-
 	public void putBundleList(String key, String itemName, List<StringBundle> list) {
 		if (list != null) {
-			List<Item> itemList = new ArrayList<>();
+			List<Item<?>> itemList = new ArrayList<>();
 			for (StringBundle bundle : list) {
 				itemList.add(new StringBundleItem(itemName, bundle));
 			}
@@ -279,7 +257,7 @@ public class StringBundle {
 	}
 
 	public int[] getIntArray(String key, int[] defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asIntArray(defaultValue) : defaultValue;
 	}
 
@@ -290,7 +268,7 @@ public class StringBundle {
 	}
 
 	public int[][] getIntIntArray(String key, int[][] defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asIntIntArray(defaultValue) : defaultValue;
 	}
 

OsmAnd-java/src/main/java/net/osmand/binary/StringBundleWriter.java

@@ -16,10 +16,10 @@ public abstract class StringBundleWriter {
 		return bundle;
 	}
 
-	protected abstract void writeItem(String name, Item item);
+	protected abstract void writeItem(String name, Item<?> item);
 
 	public void writeBundle() {
-		for (Entry<String, Item> entry : bundle.getMap().entrySet()) {
+		for (Entry<String, Item<?>> entry : bundle.getMap().entrySet()) {
 			writeItem(entry.getKey(), entry.getValue());
 		}
 	}

OsmAnd-java/src/main/java/net/osmand/binary/StringBundleXmlWriter.java

@@ -25,7 +25,7 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 	}
 
 	@Override
-	protected void writeItem(String name, Item item) {
+	protected void writeItem(String name, Item<?> item) {
 		if (serializer != null) {
 			try {
 				writeItemImpl(name, item);
@@ -47,7 +47,7 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 		}
 	}
 
-	private void writeItemImpl(String name, Item item) throws IOException {
+	private void writeItemImpl(String name, Item<?> item) throws IOException {
 		if (serializer != null && item != null) {
 			switch (item.getType()) {
 				case STRING: {
@@ -58,13 +58,13 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 				case LIST: {
 					StringListItem listItem = (StringListItem) item;
 					serializer.startTag(null, name);
-					List<Item> list = listItem.getValue();
-					for (Item i : list) {
+					List<Item<?>> list = listItem.getValue();
+					for (Item<?> i : list) {
 						if (i.getType() == StringBundle.ItemType.STRING) {
 							writeItemImpl(i.getName(), i);
 						}
 					}
-					for (Item i : list) {
+					for (Item<?> i : list) {
 						if (i.getType() != StringBundle.ItemType.STRING) {
 							writeItemImpl(i.getName(), i);
 						}
@@ -75,14 +75,14 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 				case MAP: {
 					StringMapItem mapItem = (StringMapItem) item;
 					serializer.startTag(null, name);
-					for (Entry<String, Item> entry : mapItem.getValue().entrySet()) {
-						Item i = entry.getValue();
+					for (Entry<String, Item<?>> entry : mapItem.getValue().entrySet()) {
+						Item<?> i = entry.getValue();
 						if (i.getType() == StringBundle.ItemType.STRING) {
 							writeItemImpl(entry.getKey(), i);
 						}
 					}
-					for (Entry<String, Item> entry : mapItem.getValue().entrySet()) {
-						Item i = entry.getValue();
+					for (Entry<String, Item<?>> entry : mapItem.getValue().entrySet()) {
+						Item<?> i = entry.getValue();
 						if (i.getType() != StringBundle.ItemType.STRING) {
 							writeItemImpl(entry.getKey(), i);
 						}

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

@@ -556,6 +556,9 @@ public class OsmMapUtils {
         
         // take centroid as the first best guess
         Cell bestCell = getCentroidCell(rings);
+        if(bestCell == null) {
+        	 return new LatLon(minX, minY);
+        }
 
         // special case for rectangular polygons
         Cell bboxCell = new Cell(minX + width / 2, minY + height / 2, 0, rings);
@@ -607,6 +610,9 @@ public class OsmMapUtils {
         }
 
 		if (area == 0) {
+			if (points.size() == 0) {
+				return null;
+			}
 			LatLon p = points.get(0);
 			return new Cell(p.getLatitude(), p.getLongitude(), 0, rings);
 		}

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

@@ -1,8 +1,9 @@
 package net.osmand.router;
 
 import net.osmand.GPXUtilities;
-import net.osmand.GPXUtilities.GPXExtensionsReader;
 import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.GPXUtilities.RouteSegment;
+import net.osmand.GPXUtilities.RouteType;
 import net.osmand.GPXUtilities.WptPt;
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
@@ -10,11 +11,8 @@ import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
 import net.osmand.binary.RouteDataBundle;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.binary.StringBundle;
-import net.osmand.binary.StringBundleReader;
-import net.osmand.binary.StringBundleXmlReader;
 
 import org.apache.commons.logging.Log;
-import org.xmlpull.v1.XmlPullParser;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,6 +29,10 @@ public class RouteImporter {
 	private File file;
 	private GPXFile gpxFile;
 
+	private List<RouteSegmentResult> route = new ArrayList<>();
+	private RouteRegion region = new RouteRegion();
+	private RouteDataResources resources = new RouteDataResources();
+
 	public RouteImporter(File file) {
 		this.file = file;
 	}
@@ -40,90 +42,14 @@ public class RouteImporter {
 	}
 
 	public List<RouteSegmentResult> importRoute() {
-
-		final List<RouteSegmentResult> route = new ArrayList<>();
-		final RouteRegion region = new RouteRegion();
-		final RouteDataResources resources = new RouteDataResources();
-
-		GPXExtensionsReader extensionsReader = new GPXExtensionsReader() {
-			@Override
-			public boolean readExtensions(GPXFile res, XmlPullParser parser) throws Exception {
-				if (!resources.hasLocations()) {
-					List<Location> locations = resources.getLocations();
-					double lastElevation = HEIGHT_UNDEFINED;
-					if (res.tracks.size() > 0 && res.tracks.get(0).segments.size() > 0 && res.tracks.get(0).segments.get(0).points.size() > 0) {
-						for (WptPt point : res.tracks.get(0).segments.get(0).points) {
-							Location loc = new Location("", point.getLatitude(), point.getLongitude());
-							if (!Double.isNaN(point.ele)) {
-								loc.setAltitude(point.ele);
-								lastElevation = point.ele;
-							} else if (lastElevation != HEIGHT_UNDEFINED) {
-								loc.setAltitude(lastElevation);
-							}
-							locations.add(loc);
-						}
-					}
-				}
-				String tag = parser.getName();
-				if ("route".equals(tag)) {
-					int tok;
-					while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
-						if (tok == XmlPullParser.START_TAG) {
-							tag = parser.getName();
-							if ("segment".equals(tag)) {
-								StringBundleReader bundleReader = new StringBundleXmlReader(parser);
-								RouteDataObject object = new RouteDataObject(region);
-								RouteSegmentResult segment = new RouteSegmentResult(object);
-								bundleReader.readBundle();
-								segment.readFromBundle(new RouteDataBundle(resources, bundleReader.getBundle()));
-								route.add(segment);
-							}
-						} else if (tok == XmlPullParser.END_TAG) {
-							tag = parser.getName();
-							if ("route".equals(tag)) {
-								return true;
-							}
-						}
-					}
-				} else if ("types".equals(tag)) {
-					int tok;
-					int i = 0;
-					while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
-						if (tok == XmlPullParser.START_TAG) {
-							tag = parser.getName();
-							if ("type".equals(tag)) {
-								StringBundleReader bundleReader = new StringBundleXmlReader(parser);
-								bundleReader.readBundle();
-								StringBundle bundle = bundleReader.getBundle();
-								String t = bundle.getString("t", null);
-								String v = bundle.getString("v", null);
-								region.initRouteEncodingRule(i++, t, v);
-							}
-						} else if (tok == XmlPullParser.END_TAG) {
-							tag = parser.getName();
-							if ("types".equals(tag)) {
-								return true;
-							}
-						}
-					}
-				}
-				return false;
-			}
-		};
-
 		if (gpxFile != null) {
-			GPXUtilities.loadGPXFile(null, gpxFile, extensionsReader);
-			for (RouteSegmentResult segment : route) {
-				segment.fillNames(resources);
-			}
+			parseRoute();
 		} else if (file != null) {
 			FileInputStream fis = null;
 			try {
 				fis = new FileInputStream(file);
-				GPXFile gpxFile = GPXUtilities.loadGPXFile(fis, null, extensionsReader);
-				for (RouteSegmentResult segment : route) {
-					segment.fillNames(resources);
-				}
+				gpxFile = GPXUtilities.loadGPXFile(fis);
+				parseRoute();
 				gpxFile.path = file.getAbsolutePath();
 				gpxFile.modifiedTime = file.lastModified();
 			} catch (IOException e) {
@@ -139,7 +65,51 @@ public class RouteImporter {
 				}
 			}
 		}
-
 		return route;
 	}
+
+	private void parseRoute() {
+		collectLocations();
+		collectSegments();
+		collectTypes();
+		for (RouteSegmentResult segment : route) {
+			segment.fillNames(resources);
+		}
+	}
+
+	private void collectLocations() {
+		List<Location> locations = resources.getLocations();
+		double lastElevation = HEIGHT_UNDEFINED;
+		if (gpxFile.tracks.size() > 0 && gpxFile.tracks.get(0).segments.size() > 0 && gpxFile.tracks.get(0).segments.get(0).points.size() > 0) {
+			for (WptPt point : gpxFile.tracks.get(0).segments.get(0).points) {
+				Location loc = new Location("", point.getLatitude(), point.getLongitude());
+				if (!Double.isNaN(point.ele)) {
+					loc.setAltitude(point.ele);
+					lastElevation = point.ele;
+				} else if (lastElevation != HEIGHT_UNDEFINED) {
+					loc.setAltitude(lastElevation);
+				}
+				locations.add(loc);
+			}
+		}
+	}
+
+	private void collectSegments() {
+		for (RouteSegment segment : gpxFile.routeSegments) {
+			RouteDataObject object = new RouteDataObject(region);
+			RouteSegmentResult segmentResult = new RouteSegmentResult(object);
+			segmentResult.readFromBundle(new RouteDataBundle(resources, segment.getStringBundle()));
+			route.add(segmentResult);
+		}
+	}
+
+	private void collectTypes() {
+		int i = 0;
+		for (RouteType routeType : gpxFile.routeTypes) {
+			StringBundle bundle = routeType.getStringBundle();
+			String t = bundle.getString("t", null);
+			String v = bundle.getString("v", null);
+			region.initRouteEncodingRule(i++, t, v);
+		}
+	}
 }

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

@@ -4,6 +4,7 @@ package net.osmand.router;
 import net.osmand.LocationsHolder;
 import net.osmand.NativeLibrary;
 import net.osmand.PlatformUtil;
+import net.osmand.ResultMatcher;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.binary.BinaryMapRouteReaderAdapter;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
@@ -63,16 +64,28 @@ public class RoutePlannerFrontEnd {
 		public int routeGapDistance;
 		public int routeDistanceUnmatched;
 
+		public boolean calculationCancelled;
+		private boolean calculationDone;
+
 		public GpxRouteApproximation(RoutingContext ctx) {
 			this.ctx = ctx;
 		}
 		
+		public GpxRouteApproximation(GpxRouteApproximation gctx) {
+			this.ctx = gctx.ctx;
+			this.routeDistance = gctx.routeDistance;
+		}
+
 		@Override
 		public String toString() {
 			return String.format(">> GPX approximation (%d of %d m route calcs, %d route points searched) for %d m: %d m umatched",
 					routeCalculations, routeDistCalculations, routePointsSearched, routeDistance, routeDistanceUnmatched);
 		}
 
+		public boolean isCalculationDone() {
+			return calculationDone;
+		}
+
 		public double distFromLastPoint(LatLon startPoint) {
 			if (result.size() > 0) {
 				return MapUtils.getDistance(getLastPoint(), startPoint);
@@ -97,6 +110,15 @@ public class RoutePlannerFrontEnd {
 		public List<RouteSegmentResult> stepBackRoute;
 		public int targetInd = -1;
 		public boolean straightLine = false;
+
+		public GpxPoint() {
+		}
+
+		public GpxPoint(GpxPoint point) {
+			this.ind = point.ind;
+			this.loc = point.loc;
+			this.cumDist = point.cumDist;
+		}
 	}
 
 	public RoutingContext buildRoutingContext(RoutingConfiguration config, NativeLibrary nativeLibrary, BinaryMapIndexReader[] map, RouteCalculationMode rm) {
@@ -206,7 +228,6 @@ public class RoutePlannerFrontEnd {
 		return null;
 	}
 
-
 	public List<RouteSegmentResult> searchRoute(final RoutingContext ctx, LatLon start, LatLon end, List<LatLon> intermediates) throws IOException, InterruptedException {
 		return searchRoute(ctx, start, end, intermediates, null);
 	}
@@ -215,11 +236,8 @@ public class RoutePlannerFrontEnd {
 		useSmartRouteRecalculation = use;
 	}
 
-	public GpxRouteApproximation searchGpxRoute(GpxRouteApproximation gctx, List<GpxPoint> gpxPoints) throws IOException, InterruptedException {
+	public GpxRouteApproximation searchGpxRoute(GpxRouteApproximation gctx, List<GpxPoint> gpxPoints, ResultMatcher<GpxRouteApproximation> resultMatcher) throws IOException, InterruptedException {
 		long timeToCalculate = System.nanoTime();
-		if (gctx.ctx.calculationProgress == null) {
-			gctx.ctx.calculationProgress = new RouteCalculationProgress();
-		}
 		gctx.ctx.keepNativeRoutingContext = true;
 		GpxPoint start = null;
 		GpxPoint prev = null;
@@ -227,7 +245,7 @@ public class RoutePlannerFrontEnd {
 			gctx.ctx.calculationProgress.totalIterations = (int) (gpxPoints.get(gpxPoints.size() - 1).cumDist / gctx.MAXIMUM_STEP_APPROXIMATION + 1); 
 			start = gpxPoints.get(0); 
 		}
-		while (start != null) {
+		while (start != null && !gctx.calculationCancelled) {
 			double routeDist = gctx.MAXIMUM_STEP_APPROXIMATION;
 			GpxPoint next = findNextGpxPointWithin(gctx, gpxPoints, start, routeDist);
 			boolean routeFound = false;
@@ -287,10 +305,14 @@ public class RoutePlannerFrontEnd {
 		gctx.ctx.deleteNativeRoutingContext();
 		BinaryRoutePlanner.printDebugMemoryInformation(gctx.ctx);
 		calculateGpxRoute(gctx, gpxPoints);
-		if (!gctx.result.isEmpty()) {
+		if (!gctx.result.isEmpty() && !gctx.calculationCancelled) {
 			new RouteResultPreparation().printResults(gctx.ctx, gpxPoints.get(0).loc, gpxPoints.get(gpxPoints.size() - 1).loc, gctx.result);
 			System.out.println(gctx);
 		}
+		if (resultMatcher != null) {
+			resultMatcher.publish(gctx.calculationCancelled ? null : gctx);
+		}
+		gctx.calculationDone = true;
 		return gctx;
 	}
 
@@ -343,7 +365,7 @@ public class RoutePlannerFrontEnd {
 		reg.initRouteEncodingRule(0, "highway", RouteResultPreparation.UNMATCHED_HIGHWAY_TYPE);
 		List<LatLon> lastStraightLine = null;
 		GpxPoint straightPointStart = null;
-		for (int i = 0; i < gpxPoints.size(); ) {
+		for (int i = 0; i < gpxPoints.size() && !gctx.calculationCancelled; ) {
 			GpxPoint pnt = gpxPoints.get(i);
 			if (pnt.routeToTarget != null && !pnt.routeToTarget.isEmpty()) {
 				LatLon startPoint = pnt.routeToTarget.get(0).getStartPoint();
@@ -402,7 +424,7 @@ public class RoutePlannerFrontEnd {
 	private void cleanupResultAndAddTurns(GpxRouteApproximation gctx) {
 		// cleanup double joints
 		int LOOK_AHEAD = 4;
-		for(int i = 0; i < gctx.result.size(); i++) {
+		for(int i = 0; i < gctx.result.size() && !gctx.calculationCancelled; i++) {
 			RouteSegmentResult s = gctx.result.get(i);
 			for(int j = i + 2; j <= i + LOOK_AHEAD && j < gctx.result.size(); j++) {
 				RouteSegmentResult e = gctx.result.get(j);
@@ -419,8 +441,10 @@ public class RoutePlannerFrontEnd {
 			r.setTurnType(null);
 			r.setDescription("");
 		}
+		if (!gctx.calculationCancelled) {
 			preparation.prepareTurnResults(gctx.ctx, gctx.result);
 		}
+	}
 
 	private void addStraightLine(GpxRouteApproximation gctx, List<LatLon> lastStraightLine, GpxPoint strPnt, RouteRegion reg) {
 		RouteDataObject rdo = new RouteDataObject(reg);

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

@@ -67,7 +67,7 @@
     <string name="shared_string_apply">تطبيق</string>
     <string name="shared_string_enabled">مفعل</string>
     <string name="units_and_formats">الوحدات والأشكال</string>
-    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميل بحري.. إلخ.</string>
+    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميلٌ بحري.. إلخ.</string>
     <string name="unit_of_length">وحدات الطول</string>
     <string name="last_update_from_telegram_date">آخر تحديث من تيليجرام: %1$s</string>
     <string name="last_response_date">الرد الأخير:٪ 1 $ s</string>

OsmAnd/res/drawable/ic_action_apk.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,16L8.5,11H7.5L6,16H7L7.3,15H8.7L9,16H10ZM8.4,14L8,12.6667L7.6,14H8.4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16,11V13.3333L17,11H18L16.75,13.9167L18,16H17L16.1,14.5H16V16H15V11H16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,11H11V16H12V15H13C13.5523,15 14,14.5523 14,14V12C14,11.4477 13.5523,11 13,11ZM12,14H13V12H12V14Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.3167,6.3666C3.1084,6.7831 3,7.2425 3,7.7082V19C3,20.1046 3.8954,21 5,21H19C20.1046,21 21,20.1046 21,19V7.7082C21,7.2425 20.8916,6.7831 20.6833,6.3666L19.4472,3.8944C19.1731,3.3463 18.6129,3 18,3H6C5.3871,3 4.8269,3.3463 4.5528,3.8944L3.3167,6.3666ZM5,8L5,19H19V8H5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_description_16.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M13,3H3V5H13V3Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,7H3V9H13V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,13H7V11H13V13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,13H5V11H3V13Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_laptop.xml

@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,6H20V18H4V6Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M20,6H4V18H20V6ZM4,4C2.8954,4 2,4.8954 2,6V20H22V6C22,4.8954 21.1046,4 20,4H4Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M1,18H23V19C23,19.5523 22.5523,20 22,20H2C1.4477,20 1,19.5523 1,19V18Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,8H6V10H14V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,8H16V10H18V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6,12H9V14H6V12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,12H11V14H18V12Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_location_16.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,15C8,15 13,9.5714 13,6C13,3.1429 10.7614,1 8,1C5.2386,1 3,3.1429 3,6C3,9.5714 8,15 8,15ZM8,8C9.1046,8 10,7.1046 10,6C10,4.8954 9.1046,4 8,4C6.8954,4 6,4.8954 6,6C6,7.1046 6.8954,8 8,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8,15C8,15 13,9.5714 13,6C13,3.1429 10.7614,1 8,1C5.2386,1 3,3.1429 3,6C3,9.5714 8,15 8,15ZM8,8C9.1046,8 10,7.1046 10,6C10,4.8954 9.1046,4 8,4C6.8954,4 6,4.8954 6,6C6,7.1046 6.8954,8 8,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_minimal_distance.xml

@@ -4,17 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M10.5646,1.0929C11.0348,1.0316 11.514,1 12,1C12.486,1 12.9652,1.0316 13.4354,1.0929L13.1767,3.0761C12.7921,3.0259 12.3993,3 12,3C11.6007,3 11.2079,3.0259 10.8233,3.0761L10.5646,1.0929ZM16.2109,1.8351C17.1057,2.2061 17.9406,2.6917 18.6972,3.2731L17.4785,4.8589C16.8589,4.3828 16.176,3.9857 15.4448,3.6825L16.2109,1.8351ZM5.3028,3.2731C6.0595,2.6917 6.8942,2.2062 7.7891,1.8351L8.5552,3.6825C7.824,3.9857 7.1411,4.3828 6.5215,4.8589L5.3028,3.2731ZM20.7269,5.3028C21.3083,6.0595 21.7939,6.8942 22.1649,7.7891L20.3175,8.5552C20.0143,7.824 19.6172,7.1411 19.1411,6.5215L20.7269,5.3028ZM1.8351,7.7891C2.2061,6.8942 2.6917,6.0595 3.2731,5.3028L4.8589,6.5215C4.3828,7.1411 3.9857,7.824 3.6825,8.5552L1.8351,7.7891ZM22.9071,10.5646C22.9684,11.0348 23,11.514 23,12C23,12.486 22.9684,12.9652 22.9071,13.4354L20.9239,13.1767C20.9741,12.7921 21,12.3993 21,12C21,11.6007 20.9741,11.2079 20.9239,10.8233L22.9071,10.5646ZM1,12C1,11.514 1.0316,11.0348 1.0929,10.5646L3.0761,10.8233C3.0259,11.2079 3,11.6007 3,12C3,12.3993 3.0259,12.7921 3.0761,13.1767L1.0929,13.4354C1.0316,12.9652 1,12.486 1,12ZM22.1649,16.2109C21.7939,17.1057 21.3083,17.9406 20.7269,18.6972L19.1411,17.4785C19.6172,16.8589 20.0143,16.176 20.3175,15.4448L22.1649,16.2109ZM3.2731,18.6972C2.6917,17.9406 2.2062,17.1058 1.8351,16.2109L3.6825,15.4448C3.9857,16.176 4.3828,16.8589 4.8589,17.4785L3.2731,18.6972ZM7.7891,22.1649C6.8942,21.7939 6.0595,21.3083 5.3028,20.7269L6.5215,19.1411C7.1411,19.6172 7.824,20.0143 8.5552,20.3175L7.7891,22.1649ZM18.6972,20.7269C17.9406,21.3083 17.1058,21.7939 16.2109,22.1649L15.4448,20.3175C16.176,20.0143 16.8589,19.6172 17.4785,19.1411L18.6972,20.7269ZM12,23C11.514,23 11.0348,22.9684 10.5646,22.9071L10.8233,20.9239C11.2079,20.9741 11.6007,21 12,21C12.3993,21 12.7921,20.9741 13.1767,20.9239L13.4354,22.9071C12.9652,22.9684 12.486,23 12,23Z"
+      android:pathData="M10.5646,1.0929C11.0348,1.0316 11.514,1 12,1C12.486,1 12.9652,1.0316 13.4354,1.0929C13.9831,1.1644 14.3691,1.6662 14.2977,2.2139C14.2263,2.7615 13.7244,3.1476 13.1767,3.0761C12.7921,3.0259 12.3993,3 12,3C11.6007,3 11.2079,3.0259 10.8233,3.0761C10.2756,3.1476 9.7737,2.7615 9.7023,2.2139C9.6309,1.6662 10.0169,1.1644 10.5646,1.0929ZM17.2949,3.4567C17.6314,3.0188 18.2593,2.9366 18.6972,3.2731C19.4588,3.8584 20.1416,4.5412 20.7269,5.3028C21.0634,5.7407 20.9812,6.3686 20.5433,6.7051C20.1054,7.0416 19.4776,6.9594 19.1411,6.5215C18.6617,5.8976 18.1024,5.3383 17.4785,4.8589C17.0406,4.5224 16.9584,3.8946 17.2949,3.4567ZM6.7051,3.4567C7.0416,3.8946 6.9594,4.5224 6.5215,4.8589C5.8976,5.3383 5.3383,5.8976 4.8589,6.5215C4.5224,6.9594 3.8946,7.0416 3.4567,6.7051C3.0188,6.3686 2.9366,5.7407 3.2731,5.3028C3.8584,4.5412 4.5412,3.8584 5.3028,3.2731C5.7407,2.9366 6.3686,3.0188 6.7051,3.4567ZM21.7861,9.7023C22.3338,9.6309 22.8356,10.0169 22.9071,10.5646C22.9684,11.0348 23,11.514 23,12C23,12.486 22.9684,12.9652 22.9071,13.4354C22.8356,13.9831 22.3338,14.3691 21.7861,14.2977C21.2385,14.2263 20.8524,13.7244 20.9239,13.1767C20.9741,12.7921 21,12.3993 21,12C21,11.6007 20.9741,11.2079 20.9239,10.8233C20.8524,10.2756 21.2385,9.7737 21.7861,9.7023ZM2.2139,9.7023C2.7615,9.7737 3.1476,10.2756 3.0761,10.8233C3.0259,11.2079 3,11.6007 3,12C3,12.3993 3.0259,12.7921 3.0761,13.1767C3.1476,13.7244 2.7615,14.2263 2.2139,14.2977C1.6662,14.3691 1.1644,13.9831 1.0929,13.4354C1.0316,12.9652 1,12.486 1,12C1,11.514 1.0316,11.0348 1.0929,10.5646C1.1644,10.0169 1.6662,9.6309 2.2139,9.7023ZM20.5433,17.2949C20.9812,17.6314 21.0634,18.2593 20.7269,18.6972C20.1416,19.4588 19.4588,20.1416 18.6972,20.7269C18.2593,21.0634 17.6314,20.9812 17.2949,20.5433C16.9584,20.1054 17.0406,19.4776 17.4785,19.1411C18.1024,18.6617 18.6617,18.1024 19.1411,17.4785C19.4776,17.0406 20.1054,16.9584 20.5433,17.2949ZM3.4567,17.2949C3.8946,16.9584 4.5224,17.0406 4.8589,17.4785C5.3383,18.1024 5.8976,18.6617 6.5215,19.1411C6.9594,19.4776 7.0416,20.1054 6.7051,20.5433C6.3686,20.9812 5.7407,21.0634 5.3028,20.7269C4.5412,20.1416 3.8584,19.4588 3.2731,18.6972C2.9366,18.2593 3.0188,17.6314 3.4567,17.2949ZM9.7023,21.7861C9.7737,21.2385 10.2756,20.8524 10.8233,20.9239C11.2079,20.9741 11.6007,21 12,21C12.3993,21 12.7921,20.9741 13.1767,20.9239C13.7244,20.8524 14.2263,21.2385 14.2977,21.7861C14.3691,22.3338 13.9831,22.8356 13.4354,22.9071C12.9652,22.9684 12.486,23 12,23C11.514,23 11.0348,22.9684 10.5646,22.9071C10.0169,22.8356 9.6309,22.3338 9.7023,21.7861Z"
       android:strokeAlpha="0.3"
-      android:fillColor="#000000"
+      android:fillColor="#ffffff"
       android:fillType="evenOdd"
       android:fillAlpha="0.3"/>
   <path
-      android:pathData="M12,6L7,17L12,15V6Z"
-      android:fillColor="#727272"/>
+      android:pathData="M12,15L9.1325,15.9559C9.0447,15.9851 8.9529,16 8.8604,16H8.809C8.3622,16 8,15.6378 8,15.191C8,15.0654 8.0292,14.9415 8.0854,14.8292L11.2764,8.4472C11.4134,8.1731 11.6936,8 12,8C12.3064,8 12.5866,8.1732 12.7236,8.4472L15.9146,14.8292C15.9708,14.9415 16,15.0654 16,15.191C16,15.6378 15.6378,16 15.191,16H15.1396C15.0471,16 14.9553,15.9851 14.8675,15.9559L12,15Z"
+      android:fillColor="#ffffff"/>
   <path
-      android:pathData="M12,6V15L17,17L12,6Z"
-      android:strokeAlpha="0.7"
-      android:fillColor="#727272"
-      android:fillAlpha="0.7"/>
+      android:pathData="M9,2C9,0.8954 9.8954,0 11,0H13C14.1046,0 15,0.8954 15,2V22C15,23.1046 14.1046,24 13,24H11C9.8954,24 9,23.1046 9,22V2Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
 </vector>

OsmAnd/res/drawable/ic_action_reverse_direction.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.5,6L13,6C12.4477,6 12,5.5523 12,5C12,4.4477 12.4477,4 13,4L15.5001,4C17.9853,4.0001 20,6.0148 20,8.5C20,10.9853 17.9853,13 15.5,13H8.5C7.1193,13 6,14.1193 6,15.5C6,16.8807 7.1193,18 8.5,18H16.2676C16.6134,17.4022 17.2597,17 18,17C19.1046,17 20,17.8954 20,19C20,20.1046 19.1046,21 18,21C17.2597,21 16.6134,20.5978 16.2676,20H8.5C6.0147,20 4,17.9853 4,15.5C4,13.0147 6.0147,11 8.5,11H15.5C16.8807,11 18,9.8807 18,8.5C18,7.1193 16.8807,6 15.5,6Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M9.9999,5L10.9146,6.8292C10.9708,6.9415 11,7.0654 11,7.191C11,7.6378 10.6378,8 10.191,8H10.1666C10.0566,8 9.9476,7.9782 9.8461,7.9359L4.4622,5.6926C4.1823,5.576 3.9999,5.3025 3.9999,4.9992C3.9999,4.6967 4.1813,4.4238 4.4602,4.3066L9.7876,2.0682C9.8948,2.0232 10.0099,2 10.1261,2L10.191,2C10.6378,2 11,2.3622 11,2.8091C10.9999,2.9346 10.9707,3.0585 10.9145,3.1708L9.9999,5Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_save_as_new_file.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H14V6C14,7.1046 14.8954,8 16,8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM11,10H13V13H16V15H13V18H11V15H8V13H11V10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>

OsmAnd/res/drawable/ic_action_save_complete.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H14V6C14,7.1046 14.8954,8 16,8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM17.7071,11.7071L16.2929,10.2929L11,15.5858L8.7071,13.2929L7.2929,14.7071L11,18.4142L17.7071,11.7071Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>

OsmAnd/res/drawable/ic_action_save_to_file.xml

@@ -4,14 +4,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M14,2L16,4L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14,4H6V20H18V8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4C4,2.8954 4.8954,2 6,2H14V4Z"
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
       android:strokeAlpha="0.5"
       android:fillColor="#ffffff"
       android:fillAlpha="0.5"/>
   <path
-      android:pathData="M13,9H11V14H9L12,18L15,14H13V9Z"
-      android:fillColor="#ffffff"/>
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H14V6C14,7.1046 14.8954,8 16,8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM11,9H13V14H15L12,18L9,14H11V9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
 </vector>

OsmAnd/res/drawable/ic_action_search_16.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8.8957,10.31C8.202,10.7471 7.3805,11 6.5,11C4.0147,11 2,8.9853 2,6.5C2,4.0147 4.0147,2 6.5,2C8.9853,2 11,4.0147 11,6.5C11,7.3805 10.7471,8.202 10.31,8.8957L13.7071,12.2929L12.2929,13.7071L8.8957,10.31ZM9,6.5C9,7.8807 7.8807,9 6.5,9C5.1193,9 4,7.8807 4,6.5C4,5.1193 5.1193,4 6.5,4C7.8807,4 9,5.1193 9,6.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_trash_basket_16.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6,1H10V3H13V5H3V3H6V1Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,7H4V14C4,14.5523 4.4477,15 5,15H11C11.5523,15 12,14.5523 12,14V7Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_trim_left.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0h24v24h-24z M 0,0"/>
+    <path
+        android:pathData="M10.5212 4.12217C10.0363 4.38663 9.85769 4.99407 10.1222 5.47892L13.8609 12.3332L12.6736 14.51C12.1955 14.188 11.6196 14.0001 10.9999 14.0001C9.34303 14.0001 7.99988 15.3432 7.99988 17.0001C7.99988 18.6569 9.34303 20.0001 10.9999 20.0001C12.6567 20.0001 13.9999 18.6569 13.9999 17.0001V16.2551L15 14.4216L16 16.2551V17.0001C16 18.6569 17.3432 20.0001 19 20.0001C20.6569 20.0001 22 18.6569 22 17.0001C22 15.3432 20.6569 14.0001 19 14.0001C18.3803 14.0001 17.8044 14.188 17.3264 14.51L16.5027 13H21C21.5523 13 22 12.5523 22 12C22 11.4477 21.5523 11 21 11H16.8663L19.8778 5.47892C20.1422 4.99407 19.9636 4.38663 19.4787 4.12217C18.9939 3.85771 18.3864 4.03637 18.122 4.52122L15 10.2449L11.8779 4.52121C11.6135 4.03637 11.006 3.85771 10.5212 4.12217ZM18.9999 18C18.4476 18 17.9999 17.5523 17.9999 17C17.9999 16.4477 18.4476 16 18.9999 16C19.5522 16 19.9999 16.4477 19.9999 17C19.9999 17.5523 19.5522 18 18.9999 18ZM11 18C11.5523 18 12 17.5523 12 17C12 16.4477 11.5523 16 11 16C10.4477 16 10 16.4477 10 17C10 17.5523 10.4477 18 11 18Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M3 11C2.44772 11 2 11.4477 2 12C2 12.5523 2.44772 13 3 13H5C5.55228 13 6 12.5523 6 12C6 11.4477 5.55228 11 5 11H3Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M9 11C8.44772 11 8 11.4477 8 12C8 12.5523 8.44772 13 9 13H11C11.5523 13 12 12.5523 12 12C12 11.4477 11.5523 11 11 11H9Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>

OsmAnd/res/drawable/ic_action_trim_right.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0h24v24h-24z M 0,0"/>
+    <path
+        android:pathData="M13.4789 4.12217C13.9637 4.38663 14.1424 4.99407 13.8779 5.47892L10.1392 12.3332L11.3265 14.51C11.8046 14.188 12.3804 14.0001 13.0002 14.0001C14.657 14.0001 16.0002 15.3432 16.0002 17.0001C16.0002 18.6569 14.657 20.0001 13.0002 20.0001C11.3433 20.0001 10.0002 18.6569 10.0002 17.0001V16.2551L9.00008 14.4216L8 16.2551V17.0001C8 18.6569 6.65685 20.0001 5 20.0001C3.34315 20.0001 2 18.6569 2 17.0001C2 15.3432 3.34315 14.0001 5 14.0001C5.61975 14.0001 6.1956 14.188 6.67369 14.51L7.61085 12.7918C7.44191 12.9224 7.23005 13 7.00005 13H3.00005C2.44777 13 2.00005 12.5523 2.00005 12C2.00005 11.4477 2.44777 11 3.00005 11H7.00005C7.0472 11 7.09358 11.0033 7.139 11.0096L4.12227 5.47892C3.85781 4.99407 4.03647 4.38663 4.52132 4.12217C5.00617 3.85771 5.6136 4.03637 5.87807 4.52122L9.00008 10.2449L12.1221 4.52121C12.3866 4.03637 12.994 3.85771 13.4789 4.12217ZM5.00012 18C5.55241 18 6.00012 17.5523 6.00012 17C6.00012 16.4477 5.55241 16 5.00012 16C4.44784 16 4.00012 16.4477 4.00012 17C4.00012 17.5523 4.44784 18 5.00012 18ZM13 18C12.4478 18 12 17.5523 12 17C12 16.4477 12.4478 16 13 16C13.5523 16 14 16.4477 14 17C14 17.5523 13.5523 18 13 18Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M21.0001 11C21.5523 11 22.0001 11.4477 22.0001 12C22.0001 12.5523 21.5523 13 21.0001 13H19.0001C18.4478 13 18.0001 12.5523 18.0001 12C18.0001 11.4477 18.4478 11 19.0001 11H21.0001Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M15.0001 11C15.5523 11 16.0001 11.4477 16.0001 12C16.0001 12.5523 15.5523 13 15.0001 13H13.0001C12.4478 13 12.0001 12.5523 12.0001 12C12.0001 11.4477 12.4478 11 13.0001 11H15.0001Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>

OsmAnd/res/layout-land/map_hud_bottom.xml

@@ -147,7 +147,6 @@
 
                 <com.google.android.material.slider.Slider
                     android:id="@+id/map_transparency_slider"
-                    style="@style/Widget.Styled.Slider"
                     android:layout_width="@dimen/map_trans_seek_size"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"/>

OsmAnd/res/layout-land/move_marker_bottom_sheet.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/move_marker_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"

OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml

@@ -58,16 +58,22 @@
             android:layout_marginStart="@dimen/content_padding_small"
             android:layout_marginEnd="@dimen/content_padding_small">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/create_button"
-                style="@style/DialogActionButton"
-                android:layout_marginRight="@dimen/content_padding_half"
-                android:text="@string/shared_string_add"
-	            android:layout_marginEnd="@dimen/content_padding_half" />
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/shared_string_add" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/cancel_button"
-                style="@style/DialogCancelButton"
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/content_padding"
+                android:layout_marginRight="@dimen/content_padding"
                 android:text="@string/shared_string_cancel" />
         </LinearLayout>
 

OsmAnd/res/layout/adjust_speed_slider.xml

@@ -82,7 +82,6 @@
 
 	<com.google.android.material.slider.Slider
 		android:id="@+id/speed_slider"
-		style="@style/Widget.Styled.Slider"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/content_padding_small"

OsmAnd/res/layout/animate_route.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
 	android:orientation="vertical">
 
 	<TextView
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/dialog_content_margin"
 		android:layout_marginTop="@dimen/content_padding"
@@ -18,12 +18,12 @@
 
 	<LinearLayout
 		android:id="@+id/layout_animate_gpx"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
 		android:orientation="vertical">
 
 		<TextView
-			android:layout_width="fill_parent"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/dialog_content_margin"
 			android:layout_marginTop="@dimen/map_small_button_margin"
@@ -36,7 +36,6 @@
 
 		<com.google.android.material.slider.Slider
 			android:id="@+id/Speedup"
-			style="@style/Widget.Styled.Slider"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/dialog_content_margin"
@@ -46,7 +45,7 @@
 			android:layout_marginEnd="@dimen/content_padding" />
 
 		<LinearLayout
-			android:layout_width="fill_parent"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/dialog_content_margin"
 			android:layout_marginTop="@dimen/map_small_button_margin"

OsmAnd/res/layout/bottom_sheet_button.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/button"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/dialog_button_height"
+	android:layout_marginStart="@dimen/content_padding"
+	android:layout_marginEnd="@dimen/content_padding"
+	android:layout_marginLeft="@dimen/content_padding"
+	android:layout_marginRight="@dimen/content_padding">
+
+	<LinearLayout
+		android:id="@+id/button_container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+
+		android:duplicateParentState="true"
+		tools:ignore="UselessParent">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/button_text"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:paddingLeft="@dimen/content_padding_small"
+			android:paddingRight="@dimen/content_padding_small"
+			android:gravity="center"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			android:duplicateParentState="true"
+			tools:text="Button"
+			android:paddingStart="@dimen/content_padding_small"
+			android:paddingEnd="@dimen/content_padding_small" />
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml

@@ -36,7 +36,6 @@
 
     <com.google.android.material.slider.Slider
         android:id="@+id/slider"
-        style="@style/Widget.Styled.Slider"
         android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginRight="@dimen/content_padding"
         android:layout_width="match_parent"

OsmAnd/res/layout/download_tiles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:paddingTop="@dimen/content_padding"
     android:paddingLeft="@dimen/content_padding"
     android:paddingRight="@dimen/content_padding"
@@ -12,7 +12,7 @@
     <TextView
         android:text="@string/select_max_zoom_preload_area"
         android:gravity="center"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="?android:textColorSecondary"
         android:layout_marginLeft="10dp"
@@ -23,8 +23,7 @@
 
     <com.google.android.material.slider.Slider
         android:id="@+id/ZoomToDownload"
-		style="@style/Widget.Styled.Slider"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:stepSize="1"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/content_padding"
@@ -34,7 +33,7 @@
         android:layout_marginStart="@dimen/content_padding" />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <TextView
@@ -70,12 +69,12 @@
         android:id="@+id/DownloadDescription"
         android:layout_marginTop="@dimen/content_padding_small"
         android:textColor="?android:textColorSecondary"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="5dp"

OsmAnd/res/layout/favorite_category_dialog_item.xml

@@ -18,6 +18,7 @@
         android:gravity="start|center_vertical"
         android:textSize="@dimen/default_list_text_size"
         android:textAllCaps="false"
+	    android:textColor="?attr/textColorAlertDialogListItem"
 	    android:paddingStart="10dp"
 	    android:paddingEnd="10dp" />
 

OsmAnd/res/layout/fragment_edit_poi.xml

@@ -90,10 +90,13 @@
                     android:layout_weight="1"
                     android:layout_marginStart="24dp">
 
-                    <AutoCompleteTextView
+                    <com.google.android.material.textfield.MaterialAutoCompleteTextView
                         android:id="@+id/poiTypeEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:minHeight="@dimen/wpt_list_item_height"
+                        android:gravity="bottom|start"
+                        android:paddingBottom="@dimen/text_margin_small"
                         android:completionThreshold="1"
                         app:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
                         app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"

OsmAnd/res/layout/fragment_gpx_approximation_bottom_sheet_dialog.xml

@@ -18,8 +18,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-			<include layout="@layout/plan_route_progress_bar"/>
-
 			<net.osmand.plus.LockableScrollView
 				android:id="@+id/route_menu_bottom_scroll"
 				android:layout_width="match_parent"
@@ -37,6 +35,9 @@
 				</LinearLayout>
 
 			</net.osmand.plus.LockableScrollView>
+
+			<include layout="@layout/plan_route_progress_bar"/>
+
 		</FrameLayout>
 
 	</LinearLayout>

OsmAnd/res/layout/fragment_terrain.xml

@@ -152,7 +152,6 @@
 
 					<com.google.android.material.slider.Slider
 						android:id="@+id/transparency_slider"
-						style="@style/Widget.Styled.Slider"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:paddingTop="@dimen/list_header_settings_top_margin"
@@ -232,7 +231,6 @@
 
 						<com.google.android.material.slider.RangeSlider
 							android:id="@+id/zoom_slider"
-							style="@style/Widget.Styled.Slider"
 							android:layout_width="0dp"
 							android:layout_height="wrap_content"
 							android:layout_weight="1"

OsmAnd/res/layout/list_item_progress.xml

@@ -2,7 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/bg_color"
     android:descendantFocusability="blocksDescendants"
@@ -35,7 +35,6 @@
 
         <com.google.android.material.slider.Slider
             android:id="@+id/slider"
-            style="@style/Widget.Styled.Slider"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:valueFrom="0"

OsmAnd/res/layout/map_context_menu_fragment.xml

@@ -455,9 +455,8 @@
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/context_menu_directions_button"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
                     android:background="?attr/selectableItemBackground"
                     android:gravity="end|center_vertical"
                     android:paddingLeft="@dimen/context_menu_padding_margin_default"

OsmAnd/res/layout/map_hud_bottom.xml

@@ -72,7 +72,6 @@
 
             <com.google.android.material.slider.Slider
                 android:id="@+id/map_transparency_slider"
-                style="@style/Widget.Styled.Slider"
                 android:layout_width="@dimen/map_trans_seek_size"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"

OsmAnd/res/layout/move_marker_bottom_sheet.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/move_marker_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -57,19 +56,25 @@
             android:layout_marginStart="@dimen/content_padding_small"
             android:layout_marginEnd="@dimen/content_padding_small">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/apply_button"
-                style="@style/DialogActionButton"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:layout_marginRight="@dimen/content_padding_half"
                 android:text="@string/shared_string_apply"
                 android:layout_marginEnd="@dimen/content_padding_half" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/cancel_button"
-                style="@style/DialogCancelButton"
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/content_padding"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/content_padding"
                 android:text="@string/shared_string_cancel" />
         </LinearLayout>
-
-
     </LinearLayout>
 </LinearLayout>

OsmAnd/res/layout/my_places_fabs.xml

@@ -16,6 +16,7 @@
         android:contentDescription="@string/quick_action_new_action"
         app:srcCompat="@drawable/ic_action_plus"
         app:backgroundTint="?attr/active_color_basic"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="normal"
         app:useCompatPadding="true"/>
 
@@ -33,6 +34,7 @@
         app:srcCompat="@drawable/ic_action_marker_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>
@@ -78,6 +80,7 @@
         app:srcCompat="@drawable/ic_action_markers_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>
@@ -123,6 +126,7 @@
         app:srcCompat="@drawable/ic_action_polygom_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>

OsmAnd/res/layout/plan_route_threshold_slider.xml

@@ -37,7 +37,6 @@
 
 	<com.google.android.material.slider.Slider
 		android:id="@+id/slider"
-		style="@style/Widget.Styled.Slider"
 		android:layout_marginLeft="@dimen/content_padding"
 		android:layout_marginRight="@dimen/content_padding"
 		android:layout_width="match_parent"

OsmAnd/res/layout/poi_filter_list_item.xml

@@ -6,13 +6,13 @@
     android:layout_height="wrap_content"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:background="?attr/bg_color"
-    android:minHeight="48dp"
+    android:minHeight="@dimen/card_row_min_height"
     android:clickable="false"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/card_row_min_height"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingRight="@dimen/content_padding"
@@ -25,8 +25,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/standard_icon_size"
+                android:layout_height="@dimen/standard_icon_size"
                 osmand:srcCompat="@drawable/ic_action_search_dark"/>
 
         </LinearLayout>

OsmAnd/res/layout/poi_tag_list_item.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -17,11 +16,14 @@
         android:layout_marginStart="@dimen/content_padding_small"
         android:layout_marginEnd="@dimen/content_padding">
 
-        <AutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/tagEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="@dimen/wpt_list_item_height"
             android:hint="@string/hint_tag"
+            android:gravity="bottom"
+            android:paddingBottom="@dimen/text_margin_small"
             tools:text="Tag text"/>
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -31,11 +33,15 @@
         android:layout_height="wrap_content"
         android:layout_weight="1">
 
-        <AutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/valueEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/hint_value"/>
+            android:minHeight="@dimen/wpt_list_item_height"
+            android:gravity="bottom"
+            android:paddingBottom="@dimen/text_margin_small"
+            android:hint="@string/hint_value"
+            tools:text="Value text"/>
 
     </com.google.android.material.textfield.TextInputLayout>
 

OsmAnd/res/layout/quick_action_add_poi_layout.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:theme="?attr/new_app_theme">
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -17,12 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/bg_color"
-            android:minHeight="56dp"
+            android:minHeight="@dimen/wpt_list_item_height"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/textView3"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_weight="1"
@@ -84,10 +82,13 @@
                 android:layout_weight="1"
                 android:layout_marginStart="@dimen/content_padding">
 
-                <AutoCompleteTextView
+                <com.google.android.material.textfield.MaterialAutoCompleteTextView
                     android:id="@+id/poiTypeEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:minHeight="@dimen/wpt_list_item_height"
+                    android:gravity="bottom"
+                    android:paddingBottom="@dimen/text_margin_small"
                     android:completionThreshold="1"
                     osmand:drawableTint="@color/osmand_orange"
                     osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
@@ -95,17 +96,15 @@
                     android:hint="@string/poi_dialog_poi_type"
                     android:imeOptions="actionSend"
                     android:inputType="text"
-                    android:layout_marginLeft="-4dp"
-                    tools:text="@string/lorem_ipsum"
-	                android:layout_marginStart="-4dp" />
+                    tools:text="@string/lorem_ipsum" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <ImageButton
                 android:id="@+id/onlineDocumentationButton"
                 android:contentDescription="@string/shared_string_help"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="@dimen/dashboard_parking_icon_size"
+                android:layout_height="@dimen/dashboard_parking_icon_size"
                 android:layout_gravity="bottom"
                 android:background="@null"
                 osmand:srcCompat="@drawable/ic_action_help"/>

OsmAnd/res/layout/recalculation_angle_dialog.xml

@@ -120,7 +120,6 @@
 
             <com.google.android.material.slider.Slider
                 android:id="@+id/angle_slider"
-                style="@style/Widget.Styled.Slider"
                 android:valueTo="90"
                 android:stepSize="5"
                 android:layout_width="match_parent"

OsmAnd/res/layout/search_dialog_fragment.xml

@@ -105,7 +105,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/activity_background_color"
-                    android:theme="?attr/search_tabbar_layout_theme"
+                    style="?attr/search_tabbar_layout_theme"
                     app:tabGravity="fill"
                     app:tabMaxWidth="0dp"
                     app:tabMode="fixed"/>

OsmAnd/res/layout/slider.xml

@@ -6,7 +6,6 @@
 
     <com.google.android.material.slider.Slider
         android:id="@+id/slider"
-        style="@style/Widget.Styled.Slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 

OsmAnd/res/layout/track_split_interval.xml

@@ -96,7 +96,6 @@
 
 		<com.google.android.material.slider.Slider
 			android:id="@+id/split_slider"
-			style="@style/Widget.Styled.Slider"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/content_padding"

OsmAnd/res/layout/track_width_card.xml

@@ -95,7 +95,6 @@
 
 			<com.google.android.material.slider.Slider
 				android:id="@+id/width_slider"
-				style="@style/Widget.Styled.Slider"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginLeft="@dimen/content_padding"

OsmAnd/res/layout/zoom_levels_with_descr.xml

@@ -73,7 +73,6 @@
 
         <com.google.android.material.slider.RangeSlider
             android:id="@+id/zoom_slider"
-            style="@style/Widget.Styled.Slider"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/content_padding"

OsmAnd/res/values-ar/strings.xml

@@ -764,7 +764,7 @@
     <string name="incomplete_locale">ناقص</string>
     <string name="shared_string_next">التالي</string>
     <string name="shared_string_previous">السابق</string>
-    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميل بحري.. إلخ.</string>
+    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميلٌ بحري.. إلخ.</string>
     <string name="unit_of_length">وحدات الطول</string>
     <string name="si_mi_feet">ميل ، قدم</string>
     <string name="si_mi_yard">ميل ، ياردة</string>
@@ -1964,8 +1964,8 @@
     <string name="show_poi_over_map_description">عرض POI على الخريطة (استخدم آخر تصفية مستخدمة).</string>
     <string name="navigate_point_top_text">أدخل خط العرض وخط الطول في النمط المحدد (د - درجات، د - دقائق، ث - ثواني)</string>
     <string name="navigate_point_format_D">DDD.DD</string>
-    <string name="navigate_point_format_DM">DDD MM.MM</string>
-    <string name="navigate_point_format_DMS">DDD MM SS.SS</string>
+    <string name="navigate_point_format_DM">DDD MM.MMM</string>
+    <string name="navigate_point_format_DMS">DDD MM SS.S</string>
     <string name="plugin_touringview_descr">تفعيل هذه الرؤية يغير نمط خريطة أوسماند إلى \'نمط التجوال\'، هذا النمط يوفر رؤية غنية بالتفاصيل للمسافرين والسائقين المحترفين. 
 \n 
 \nتوفر هذه الرؤية في أي تكبير معين للخريطة أكبر قدر ممكن من تفاصيل السفر المتاحة في بيانات الخريطة (خاصة الطرق، المسارات، المعابر وعلامات التوجيه). 
@@ -2288,7 +2288,7 @@
     <string name="mapillary_widget">ويدجت مابيلاري</string>
     <string name="mapillary_widget_descr">يسمح لك بالمساهمة بسرعة لمابيلاري.</string>
     <string name="mapillary_descr">صور شوارع متاحة على الإنترنت للجميع. اكتشف أماكن، تعاون، والتقط صورا للعالم.</string>
-    <string name="mapillary">Mapillary مابيلاري</string>
+    <string name="mapillary">صور للشارع</string>
     <string name="plugin_mapillary_descr">صور شوارع متاحة للجميع. اكتشف أماكن، تعاون، والتقط صورا للعالم.</string>
     <string name="private_access_routing_req">الوجهة الخاص بك تقع في منطقة ذات ولوج خاص. هل تسمح بالدخول إلى الطرق الخاصة لهذه الرحلة؟</string>
     <string name="quick_action_showhide_osmbugs_descr">زر يظهر أو يخفي ملاحظات OSM على الخريطة.</string>
@@ -3842,4 +3842,7 @@
 \n
 \nفي الخطوة التالية ، ستحتاج إلى تحديد ملف تعريف الملاحة لاكتشاف الطرق المسموح بها وبداية المسافة لتقريب تتبعك بالطرق.</string>
     <string name="threshold_distance">بداية المسافة</string>
+    <string name="street_level_imagery">صور للشارع</string>
+    <string name="plan_route_exit_dialog_descr">هل أنت متأكد أنك تريد إغلاق مسار الخطة دون حفظ؟ سوف تفقد كل التغييرات.</string>
+    <string name="in_case_of_reverse_direction">في حالة الاتجاه المعاكس</string>
 </resources>

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

@@ -41,7 +41,7 @@
     <string name="shared_string_ok">Γas</string>
     <string name="shared_string_yes">Ih</string>
     <string name="shared_string_no">Ala</string>
-    <string name="shared_string_never">Warǧin</string>
+    <string name="shared_string_never">Werǧin</string>
     <string name="shared_string_none">Ulac</string>
     <string name="shared_string_and">d</string>
     <string name="shared_string_or">naɣ</string>
@@ -260,7 +260,7 @@
     <string name="mapillary_menu_title_username">Isem n useqdac</string>
     <string name="nearest_cities">Timdinin ig qarben</string>
     <string name="shared_string_add_to_map_markers">Rnu ar ticṛaḍ</string>
-    <string name="map_markers">Ticṛaḍ</string>
+    <string name="map_markers">Ticraḍ n tkarḍa</string>
     <string name="lang_kab">Taqbaylit</string>
     <string name="lang_ber">Tifinaɣ</string>
     <string name="shared_string_cancel">Sefsex</string>
@@ -273,7 +273,7 @@
     <string name="rendering_category_details">Talqayt</string>
     <string name="rendering_category_transport">Amesni</string>
     <string name="text_size">Tiddi n waḍris</string>
-    <string name="speak_street_names">Ismawen n iberdan (TTS)</string>
+    <string name="speak_street_names">Ismawen n yiberdan (TTS)</string>
     <string name="context_menu_item_directions_to">Iwellihen ɣer</string>
     <string name="context_menu_item_directions_from">Tinilwin seg</string>
     <string name="street_name">Isem n webrid</string>
@@ -468,7 +468,7 @@
     <string name="home">Tafelwit n usenqed</string>
     <string name="rendering_attr_moreDetailed_name">Ugar n telqayt</string>
     <string name="sort_by_name">Smizzwer s yisem</string>
-    <string name="map_widget_plain_time">Tasaɛet imir-a</string>
+    <string name="map_widget_plain_time">Akud amiran</string>
     <string name="selected_gpx_info_show">"
 \n
 \nAsiti ɣezzifen akken ad d-sekneḍ ɣef tkarḍa"</string>
@@ -505,7 +505,7 @@
     <string name="distance_measurement_start_editing">Bdu taẓrigt</string>
     <string name="other_location">Nniḍen</string>
     <string name="website">Asmel n web</string>
-    <string name="prefer_in_routing_title">Smenyifi …</string>
+    <string name="prefer_in_routing_title">Smenyif…</string>
     <string name="recording_unavailable">ulac</string>
     <string name="recording_context_menu_play">Urar</string>
     <string name="poi_filter_parking">Aneɣsar</string>
@@ -1143,8 +1143,8 @@
     <string name="local_openstreetmap_delete">Kkes</string>
     <string name="local_openstreetmap_uploadall">Ali</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/Tizmilin ulin</string>
-    <string name="arrival_distance_factor_late">Aneḍru yettwaheggan iɛedda fell-as lḥal</string>
-    <string name="arrival_distance_factor_early">Détection SKIP précoce sur images P</string>
+    <string name="arrival_distance_factor_late">Iɛedda lḥal</string>
+    <string name="arrival_distance_factor_early">Zik</string>
     <string name="no_info">talɣut</string>
     <string name="front_left">ɣer zdat</string>
     <string name="zoomIs">Seggem aswir n usemɣer/asemẓi</string>
@@ -1153,8 +1153,8 @@
     <string name="map_widget_next_turn">ar zdat</string>
     <string name="map_widget_monitoring">Aɣmis</string>
     <string name="int_continuosly">A_maɣlal</string>
-    <string name="avoid_in_routing_title">Zgel tulsa n wawalen d yisekkilen.</string>
-    <string name="show_warnings_title">Ilɣa</string>
+    <string name="avoid_in_routing_title">Zgel…</string>
+    <string name="show_warnings_title">Sken ilɣa…</string>
     <string name="poi_filter_food_shop">Tuččit</string>
     <string name="poi_filter_emergency">Annar n trusi n utrab</string>
     <string name="btn_advanced_mode">Talqayt…</string>
@@ -1197,7 +1197,7 @@
     <string name="traffic_warning_stop">Seḥbes</string>
     <string name="search_radius_proximity">Deg</string>
     <string name="configure_map">Swel…</string>
-    <string name="map_widget_left">Tafelwit n yiri, tattayt, ukessar, ufella, ɣumm, tiddi, amrussu</string>
+    <string name="map_widget_left">Agalis azelmaḍ</string>
     <string name="download_tab_downloads">Sken akkw isidar</string>
     <string name="rendering_attr_roadStyle_description">Aɣanib:</string>
     <string name="rendering_attr_roadStyle_name">Aɣanib:</string>
@@ -1329,4 +1329,13 @@
     <string name="select_track_width">Fren tehri</string>
     <string name="gpx_direction_arrows">Ineccaben n tnila</string>
     <string name="plan_route_create_new_route">Rnu abrid amaynut</string>
+    <string name="default_speed_system">Tayunt n urured</string>
+    <string name="screen_alerts">Ilɣa n ugdil</string>
+    <string name="fast_route_mode">Abrid arurad akk</string>
+    <string name="arrival_distance_factor_at_last">Deg lmitrat tineggura</string>
+    <string name="speak_speed_limit">Talast n urured</string>
+    <string name="show_lanes">Izirigen</string>
+    <string name="layer_map_appearance">Swel agdil</string>
+    <string name="map_widget_right">Agalis ayeffus</string>
+    <string name="map_widget_appearance_rem">Iferdisen i d-iqqimen</string>
 </resources>

OsmAnd/res/values-ber/phrases.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="poi_shop">ⵜⴰⵃⴰⵏⵓⵜ</string>
+    <string name="poi_video_telephone">ⴰⴼⵉⴷⵢⵓ</string>
+    <string name="poi_climbing_crag">ⵢⴰⵀ</string>
+    <string name="poi_books_type">ⵉⴷⵍⵉⵙⵏ</string>
+    <string name="poi_glacier_type">ⴰⵙⵔⵜⵓ ⴰⴳⵔⵙⴰⵏ</string>
+    <string name="poi_dish">ⴰⵟⴱⵙⵉⵍ</string>
+    <string name="poi_tents">ⴰⵅⵅⴰⵎ</string>
+    <string name="poi_shelter_type">ⴰⵙⵔⵜⵓ</string>
+    <string name="poi_recycling_type">ⴰⵙⵔⵜⵓ</string>
+    <string name="poi_covered">ⵉⵜⵜⵡⴰⴷⵍ</string>
+    <string name="poi_traffic_signals_sound">ⴰⵎⵙⵍⴰⵢ</string>
+    <string name="poi_fire_hydrant_water_source">ⴰⵖⴱⴰⵍⵓ ⵏ ⵡⴰⵎⴰⵏ</string>
+    <string name="poi_fire_hydrant_position">ⴰⵏⵙⴰ</string>
+</resources>

OsmAnd/res/values-ber/strings.xml

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

OsmAnd/res/values-ca/strings.xml

@@ -3610,10 +3610,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="download_slope_maps">Pistes</string>
     <string name="custom_osmand_plugin">Connector d\'OsmAnd adaptat</string>
     <string name="replace_point_descr">Substitueix un altre punt per aquest</string>
-    <string name="changes_applied_to_profile">S\'han fet els canvis al perfil %1$s.</string>
-    <string name="settings_item_read_error">No s\'ha pogut llegir %1$s.</string>
+    <string name="changes_applied_to_profile">S\'han fet els canvis al perfil \'%1$s\'.</string>
+    <string name="settings_item_read_error">No s\'ha pogut llegir des de \'%1$s\'.</string>
     <string name="settings_item_write_error">No s\'ha pogut escriure %1$s.</string>
-    <string name="settings_item_import_error">No s\'ha pogut importar %1$s.</string>
+    <string name="settings_item_import_error">No s\'ha pogut importar des de \'%1$s\'.</string>
     <string name="select_track_file">Seleccioneu fitxer de la traça</string>
     <string name="shared_string_languages">Idiomes</string>
     <string name="shared_string_language">Llengua</string>
@@ -3626,7 +3626,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="divider_descr">Elements per sota d’aquest punt separats per un divisor.</string>
     <string name="shared_string_hidden">Amagat</string>
     <string name="hidden_items_descr">Aquests elements no es mostren al menú, però les opcions o els connectors que representen continuaran funcionant.</string>
-    <string name="reset_items_descr">La configuració es restablirà a l\'estat original després d\'amagar-se.</string>
+    <string name="reset_items_descr">Si s\'amaga la configuració es restablirà al seus valors originals.</string>
     <string name="main_actions_descr">Les accions principals només contenen 4 botons.</string>
     <string name="main_actions">Accions principals</string>
     <string name="move_inside_category">Només podeu moure els elements dins d\'aquesta categoria.</string>
@@ -3748,4 +3748,46 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="next_segment">Següent segment</string>
     <string name="threshold_distance">Llindar de distància</string>
     <string name="navigation_profile">Perfil de navegació</string>
+    <string name="additional_actions_descr">Podeu accedir a aquestes accions prement el botó \"%1$s\".</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="search_poi_types">Cerca per tipus de PDI</string>
+    <string name="download_unsupported_action">L\'acció %1$s no s\'admet</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Acció directa</string>
+    <string name="radius_ruler_item">Radi de distància</string>
+    <string name="measure_distance_item">Mesura la distància</string>
+    <string name="travel_item">Viatges (Viquiviatges i Viquipèdia)</string>
+    <string name="map_markers_item">Marcadors de mapa</string>
+    <string name="favorites_item">Preferits</string>
+    <string name="subscription_osmandlive_item">Subscripció - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Compres OsmAnd</string>
+    <string name="navigation_profiles_item">Perfils de navegació</string>
+    <string name="quick_action_transport_hide">Amaga el transport públic</string>
+    <string name="quick_action_show_hide_transport">Mostra/amaga el transport públic</string>
+    <string name="quick_action_transport_descr">Botó que mostra o oculta el transport públic al mapa.</string>
+    <string name="create_edit_poi">Crea / Edita PDI</string>
+    <string name="parking_positions">Posicions d’aparcament</string>
+    <string name="add_edit_favorite">Afegeix / Edita Preferits</string>
+    <string name="reset_deafult_order">Restableix la ordenació dels elements predeterminats</string>
+    <string name="back_to_editing">Torna a l\'edició</string>
+    <string name="turn_screen_on_navigation_instructions_descr">A cada instrucció de navegació s\'activarà la pantalla.</string>
+    <string name="turn_screen_on_navigation_instructions">Instruccions de navegació</string>
+    <string name="turn_screen_on_proximity_sensor">Sensor de proximitat</string>
+    <string name="keep_screen_on">Manté la pantalla activada</string>
+    <string name="pseudo_mercator_projection">Projecció Pseudo-Mercator</string>
+    <string name="one_image_per_tile">Un fitxer d\'imatge per tessel·la</string>
+    <string name="sqlite_db_file">Fitxer SQLiteDB</string>
+    <string name="online_map_name_helper_text">Proporcioneu un nom per a l’origen del mapa en línia.</string>
+    <string name="online_map_url_helper_text">Introduïu o enganxeu l’URL de la font en línia.</string>
+    <string name="edit_online_source">Edita la font en línia</string>
+    <string name="expire_time">Caducitat</string>
+    <string name="mercator_projection">Projecció de Mercator</string>
+    <string name="storage_format">Format d\'emmagatzematge</string>
+    <string name="map_source_zoom_levels">Establiu un nivell de zoom mínim i màxim per a mostrar o carregar el mapa en línia.</string>
+    <string name="expire_time_descr">Les tessel·les de la memòria cau s\'actualitzaran transcorregut el nombre de minuts especificat. Deixeu aquest camp buit per no actualitzar mai les tessel·les d\'aquesta font.
+\n
+\nUn dia equival a 1.440 minuts.
+\nUna setmana té 10.080 minuts.
+\nUn mes dura 43.829 minuts.</string>
+    <string name="in_case_of_reverse_direction">Cas de sentit invers</string>
 </resources>

OsmAnd/res/values-el/phrases.xml

@@ -806,7 +806,7 @@
     <string name="poi_internet_access_service">Πρόσβαση διαδικτύου: υπηρεσία</string>
     <string name="poi_internet_access_yes">Πρόσβαση διαδικτύου: ναι</string>
     <string name="poi_internet_access_no">Πρόσβαση διαδικτύου: όχι</string>
-    <string name="poi_internet_access_fee_yes">Πρόσβαση διαδικτύου - με χρέωση</string>
+    <string name="poi_internet_access_fee_yes">Πρόσβαση διαδικτύου : με χρέωση</string>
     <string name="poi_internet_access_fee_no">Πρόσβαση διαδικτύου - χωρίς χρέωση</string>
     <string name="poi_monastery">Μοναστήρι</string>
     <string name="poi_religious">Θρησκευτική περιοχή</string>
@@ -1371,7 +1371,7 @@
     <string name="poi_pump_no">Χωρίς αντλία</string>
     <string name="poi_pump_yes">Ναι</string>
     <string name="poi_water_characteristic_mineral">Μεταλλικό</string>
-    <string name="poi_water_characteristic_mud">Χαρακτηριστικό νερού: λάσπη</string>
+    <string name="poi_water_characteristic_mud">Λάσπη</string>
     <string name="poi_water_characteristic_sulfuric">Θειικό</string>
     <string name="poi_water_point">Σημείο νερού</string>
     <string name="poi_information_guidepost">Οδοδείκτης</string>
@@ -1411,7 +1411,7 @@
     <string name="poi_tactile_paving_yes">Ναι</string>
     <string name="poi_tactile_paving_no">Χωρίς απτικό πλακόστρωτο</string>
     <string name="poi_traffic_signals_sound_yes">Ναι</string>
-    <string name="poi_traffic_signals_sound_no">Όχι</string>
+    <string name="poi_traffic_signals_sound_no">Ήχος: όχι</string>
     <string name="poi_traffic_signals_sound_walk">Μόνο όταν επιτρέπεται το περπάτημα</string>
     <string name="poi_rescue_station">Σταθμός διάσωσης</string>
     <string name="poi_services">ΣΕΑ</string>
@@ -1706,12 +1706,12 @@
     <string name="poi_service_electrical">Επισκευή ηλεκτρικών οχημάτων</string>
     <string name="poi_motorcycle_repair">Επισκευή μοτοσικλετών</string>
     <string name="poi_self_service_yes">Ναι</string>
-    <string name="poi_self_service_no">Χωρίς αυτοεξυπηρέτηση</string>
+    <string name="poi_self_service_no">Όχι</string>
     <string name="poi_automated_yes">Ναι</string>
     <string name="poi_automated_no">Μη αυτόματο</string>
     <string name="poi_full_service_yes">Πλήρης εξυπηρέτηση</string>
     <string name="poi_brushless_yes">Ναι</string>
-    <string name="poi_car_wash_no">Πλύσιμο αυτοκινήτου: όχι</string>
+    <string name="poi_car_wash_no">Όχι</string>
     <string name="poi_public_bath">Δημόσια λουτρά</string>
     <string name="poi_male_yes">Άνδρες</string>
     <string name="poi_male_no">Απαγορευμένο για άνδρες</string>
@@ -2060,7 +2060,7 @@
     <string name="poi_fuel_100ll">Καύσιμο 100LL</string>
     <string name="poi_fuel_autogas">Υγραέριο κίνησης</string>
     <string name="poi_fuel_jeta1">Καύσιμο Jet A-1</string>
-    <string name="poi_fuel_adblue">Καύσιμο AdBlue</string>
+    <string name="poi_fuel_adblue">Υγρό καυσαερίων ντίζελ</string>
     <string name="poi_fuel_wood">Καύσιμο: ξύλο</string>
     <string name="poi_fuel_charcoal">Καύσιμο: κάρβουνο</string>
     <string name="poi_fuel_coal">Καύσιμο: γαιάνθρακας</string>
@@ -3565,4 +3565,250 @@
     <string name="poi_bath_type">Πληκτρολογήστε</string>
     <string name="poi_volcano_type">Πληκτρολογήστε</string>
     <string name="poi_volcano_status">Κατάσταση</string>
+    <string name="poi_mofa_yes">Ναι</string>
+    <string name="poi_moped_designated">Δηλωμένη</string>
+    <string name="poi_moped_yes">Ναι</string>
+    <string name="poi_motorcycle_designated">Δηλωμένη</string>
+    <string name="poi_motorcycle_destination">Προορισμός</string>
+    <string name="poi_motorcycle_permissive">Ανεκτή</string>
+    <string name="poi_motorcycle_yes">Ναι</string>
+    <string name="poi_trailer_designated">Δηλωμένη</string>
+    <string name="poi_trailer_yes">Ναι</string>
+    <string name="poi_motorhome_designated">Δηλωμένη</string>
+    <string name="poi_motorhome_yes">Ναι</string>
+    <string name="poi_caravan_designated">Δηλωμένη</string>
+    <string name="poi_caravan_yes">Ναι</string>
+    <string name="poi_bus_designated">Δηλωμένη</string>
+    <string name="poi_bus_yes">Ναι</string>
+    <string name="poi_snowmobile_permissive">Ανεκτή</string>
+    <string name="poi_snowmobile_designated">Δηλωμένη</string>
+    <string name="poi_snowmobile_yes">Ναι</string>
+    <string name="poi_disabled_no">Πρόσβαση αναπήρων: όχι</string>
+    <string name="poi_taxi_no">Πρόσβαση ταξί: όχι</string>
+    <string name="poi_taxi_designated">Πρόσβαση ταξί: δηλωμένη</string>
+    <string name="poi_taxi_yes">Πρόσβαση ταξί: ναι</string>
+    <string name="poi_agricultural_no">Πρόσβαση αγροτικών οχημάτων: όχι</string>
+    <string name="poi_agricultural_yes">Πρόσβαση αγροτικών οχημάτων: ναι</string>
+    <string name="poi_snowmobile_no">Πρόσβαση χιονοοχήματος: όχι</string>
+    <string name="poi_ski_no">Χιονοδρομική πρόσβαση: όχι</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3А*</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2А*</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
+    <string name="poi_rtsa_scale_1a_asterisk">1А*</string>
+    <string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
+    <string name="poi_coach_no">Πρόσβαση λεωφορείων: όχι</string>
+    <string name="poi_coach_yes">Πρόσβαση λεωφορείων: ναι</string>
+    <string name="poi_tourist_bus_no">Πρόσβαση τουριστικών λεωφορείων: όχι</string>
+    <string name="poi_tourist_bus_designated">Πρόσβαση τουριστικών λεωφορείων: δηλωμένη</string>
+    <string name="poi_tourist_bus_yes">Πρόσβαση τουριστικών λεωφορείων: ναι</string>
+    <string name="poi_bus_no">Πρόσβαση λεωφορείων: όχι</string>
+    <string name="poi_psv_no">Πρόσβαση δημόσιων συγκοινωνιών: όχι</string>
+    <string name="poi_psv_designated">Πρόσβαση δημόσιων συγκοινωνιών: δηλωμένη</string>
+    <string name="poi_psv_yes">Πρόσβαση δημόσιων συγκοινωνιών: ναι</string>
+    <string name="poi_trailer_no">Πρόσβαση καρότσας: όχι</string>
+    <string name="poi_caravan_no">Πρόσβαση καραβανιού: όχι</string>
+    <string name="poi_motorhome_no">Πρόσβαση τροχόσπιτου: όχι</string>
+    <string name="poi_foot_customers">Πρόσβαση πεζών: πελάτες</string>
+    <string name="poi_foot_permissive">Πρόσβαση πεζών: ανεκτή</string>
+    <string name="poi_foot_destination">Πρόσβαση πεζών: προορισμός</string>
+    <string name="poi_foot_no">Πρόσβαση πεζών: όχι</string>
+    <string name="poi_foot_private">Πρόσβαση πεζών: ιδιωτική</string>
+    <string name="poi_foot_yes">Πρόσβαση πεζών: ναι</string>
+    <string name="poi_horse_forestry">Πρόσβαση αλόγων: δασοκομική</string>
+    <string name="poi_horse_permissive">Πρόσβαση αλόγων: ανεκτή</string>
+    <string name="poi_horse_destination">Πρόσβαση αλόγων: προορισμός</string>
+    <string name="poi_horse_private">Πρόσβαση αλόγων: ιδιωτική</string>
+    <string name="poi_bicycle_customers">Πρόσβαση ποδηλάτων: πελάτες</string>
+    <string name="poi_bicycle_permissive">Πρόσβαση ποδηλάτων: ανεκτή</string>
+    <string name="poi_bicycle_destination">Πρόσβαση ποδηλάτων: προορισμός</string>
+    <string name="poi_bicycle_dismount">Πρόσβαση ποδηλάτων: πεζή</string>
+    <string name="poi_bicycle_private">Πρόσβαση ποδηλάτων: ιδιωτική</string>
+    <string name="poi_mofa_no">Πρόσβαση μικρών μοτοποδηλάτων: όχι</string>
+    <string name="poi_moped_no">Πρόσβαση μοτοποδηλάτων: όχι</string>
+    <string name="poi_motorcycle_no">Πρόσβαση μοτοσικλέτας: όχι</string>
+    <string name="poi_motorcycle_private">Πρόσβαση μοτοσικλέτας: ιδιωτική</string>
+    <string name="poi_goods_no">Πρόσβαση ελαφρών φορτηγών: όχι</string>
+    <string name="poi_hgv_unsuitable">Πρόσβαση βαρέων οχημάτων: ακατάλληλη</string>
+    <string name="poi_hgv_discouraged">Πρόσβαση βαρέων οχημάτων: δεν συνιστάται</string>
+    <string name="poi_hgv_agricultural">Πρόσβαση βαρέων οχημάτων: αγροτική</string>
+    <string name="poi_hgv_no">Πρόσβαση βαρέων οχημάτων: όχι</string>
+    <string name="poi_hgv_private">Πρόσβαση βαρέων οχημάτων: ιδιωτική</string>
+    <string name="poi_motor_vehicle_agricultural">Πρόσβαση μηχανοκίνητου οχήματος: αγροτική</string>
+    <string name="poi_motor_vehicle_forestry">Πρόσβαση μηχανοκίνητου οχήματος: δασοκομική</string>
+    <string name="poi_motor_vehicle_delivery">Πρόσβαση μηχανοκίνητου οχήματος: διανομή</string>
+    <string name="poi_motor_vehicle_military">Πρόσβαση μηχανοκίνητου οχήματος: στρατιωτική</string>
+    <string name="poi_motor_vehicle_customers">Πρόσβαση μηχανοκίνητου οχήματος: πελάτες</string>
+    <string name="poi_motor_vehicle_permissive">Πρόσβαση μηχανοκίνητου οχήματος: ανεκτός</string>
+    <string name="poi_motor_vehicle_destination">Πρόσβαση μηχανοκίνητου οχήματος: προορισμός</string>
+    <string name="poi_motor_vehicle_no">Πρόσβαση μηχανοκίνητου οχήματος: όχι</string>
+    <string name="poi_motor_vehicle_private">Πρόσβαση μηχανοκίνητου οχήματος: ιδιωτική</string>
+    <string name="poi_flare">Φλόγα υψικαμίνου;Πυρσός καύσης</string>
+    <string name="poi_motor_vehicle_yes">Πρόσβαση μηχανοκίνητου οχήματος: ναι</string>
+    <string name="poi_motorcar_forestry">Πρόσβαση αυτοκινήτου: δασοκομική</string>
+    <string name="poi_motorcar_customers">Πρόσβαση αυτοκινήτου: πελάτες</string>
+    <string name="poi_motorcar_permissive">Πρόσβαση αυτοκινήτου: ανεκτή</string>
+    <string name="poi_motorcar_destination">Πρόσβαση αυτοκινήτου: προορισμός</string>
+    <string name="poi_motorcar_no">Πρόσβαση αυτοκινήτου: όχι</string>
+    <string name="poi_motorcar_private">Πρόσβαση αυτοκινήτου: ιδιωτική</string>
+    <string name="poi_motorcar_yes">Πρόσβαση αυτοκινήτου:</string>
+    <string name="poi_vehicle_forestry">Πρόσβαση οχήματος: δασοκομική</string>
+    <string name="poi_vehicle_delivery">Πρόσβαση οχήματος: διανομή</string>
+    <string name="poi_vehicle_military">Πρόσβαση οχήματος: στρατιωτική</string>
+    <string name="poi_vehicle_customers">Πρόσβαση οχήματος: πελάτες</string>
+    <string name="poi_vehicle_permissive">Πρόσβαση οχήματος: ανεκτική</string>
+    <string name="poi_vehicle_destination">Πρόσβαση οχήματος: προορισμός</string>
+    <string name="poi_vehicle_no">Πρόσβαση οχήματος: όχι</string>
+    <string name="poi_vehicle_private">Πρόσβαση οχήματος: ιδιωτική</string>
+    <string name="poi_vehicle_yes">Πρόσβαση οχήματος: ναι</string>
+    <string name="poi_taxi_office">Γραφείο ταξί</string>
+    <string name="poi_hookah_lounge">Αίθουσα ναργιλέ</string>
+    <string name="poi_charcoal_pile">Σωρός κάρβουνου</string>
+    <string name="poi_changing_table_fee_no">Αλλαξιέρα με πληρωμή: όχι</string>
+    <string name="poi_changing_table_fee_yes">Αλλαξιέρα με πληρωμή: ναι</string>
+    <string name="poi_changing_table_count">Αριθμός αλλαξιέρων</string>
+    <string name="poi_changing_table_location_unisex_toilet">Τοποθεσία αλλαξιέρας: μικτή τουαλέτα</string>
+    <string name="poi_changing_table_location_female_toilet">Τοποθεσία αλλαξιέρας: τουαλέτα γυναικών</string>
+    <string name="poi_changing_table_location_male_toilet">Τοποθεσία αλλαξιέρας: τουαλέτα ανδρών</string>
+    <string name="poi_changing_table_location_room">Τοποθεσία αλλαξιέρας: δωμάτιο</string>
+    <string name="poi_changing_table_limited">Αλλαξιέρα: περιορισμένη</string>
+    <string name="poi_changing_table_no">Αλλαξιέρα: όχι</string>
+    <string name="poi_changing_table_yes">Αλλαξιέρα: ναι</string>
+    <string name="poi_defibrillator_location">Τοποθεσία</string>
+    <string name="poi_hazard_additional_contamination">Κίνδυνος: μόλυνση</string>
+    <string name="poi_hazard_additional_minefield">Κίνδυνος: ναρκοπέδιο</string>
+    <string name="poi_hazard_additional_avalanche">Κίνδυνος: χιονοστιβάδα</string>
+    <string name="poi_hazard_additional_flood">Κίνδυνος; πλημμύρα</string>
+    <string name="poi_hazard_additional_nuclear">Κίνδυνος: πυρηνικά</string>
+    <string name="poi_hazard_additional_rockfall">Κίνδυνος: πτώση βράχων</string>
+    <string name="poi_hazard_additional_erosion">Κίνδυνος: διάβρωση</string>
+    <string name="poi_rescue_box">Κουτί διάσωσης</string>
+    <string name="poi_change_delete">Διαγραμμένο αντικείμενο</string>
+    <string name="poi_park_ride_hov">Όχημα υψηλής πληρότητας</string>
+    <string name="poi_traffic_signals_arrow">Βέλος</string>
+    <string name="poi_traffic_signals_vibration">Δόνηση</string>
+    <string name="poi_fire_hydrant_pressure_filter">Πίεση</string>
+    <string name="poi_video_telephone">Βίντεο</string>
+    <string name="poi_sms">SMS</string>
+    <string name="poi_bath_open_air">Σε ανοιχτό χώρο</string>
+    <string name="poi_piste_ref">Αριθμός αναφοράς πίστας</string>
+    <string name="poi_bowling_alley">Κέντρο μπόουλινγκ</string>
+    <string name="poi_shop_security">Είδη ασφαλείας</string>
+    <string name="poi_mountain_rescue">Διάσωση βουνού</string>
+    <string name="poi_paintball">Χρωματοσφαίριση</string>
+    <string name="poi_memorial_ghost_bike">Ποδήλατο φάντασμα</string>
+    <string name="poi_volcano_number_of_eruptions">Αριθμός εκρήξεων</string>
+    <string name="poi_volcano_status_active">Ενεργό</string>
+    <string name="poi_volcano_status_extinct">Εσβεσμένο</string>
+    <string name="poi_volcano_type_mud">Λάσπη</string>
+    <string name="poi_volcano_type_caldera">Κρατήρας</string>
+    <string name="poi_volcano_type_shield">Ασπίδα</string>
+    <string name="poi_url">URL</string>
+    <string name="poi_monastery_type_canonry">Τύπος μονής: κανονική</string>
+    <string name="poi_community_gender_female">Είδος κοινοβίου: γυναικείο</string>
+    <string name="poi_community_gender_male">Είδος κοινοβίου: ανδρικό</string>
+    <string name="poi_bath_open_air_no">Όχι</string>
+    <string name="poi_cash_withdrawal_foreign_cards">Ανάληψη μετρητών: ξένες κάρτες</string>
+    <string name="poi_cash_withdrawal_purchase_required_no">Ανάληψη μετρητών: δεν απαιτείται αγορά</string>
+    <string name="poi_cash_withdrawal_type_self_checkout">Τύπος ανάληψης μετρητών: αυτόματη ολοκλήρωση</string>
+    <string name="poi_craft_floorer">Πατωματζής</string>
+    <string name="poi_goods_yes">Ναι</string>
+    <string name="poi_volcano_status_inactive">Ανενεργό</string>
+    <string name="poi_volcano_status_dormant">Ανενεργό</string>
+    <string name="poi_volcano_last_eruption">Τελευταία έκρηξη</string>
+    <string name="poi_volcano_type_lava_dome">Ηφαιστειακός θόλος</string>
+    <string name="poi_volcano_type_maar">Ηφαιστειακή λίμνη</string>
+    <string name="poi_volcano_type_stratovolcano">Στρωματοηφαίστειο</string>
+    <string name="poi_grave">Τάφος</string>
+    <string name="poi_tourist_camp">Τουριστικό κατάλυμα</string>
+    <string name="poi_monastery_type_convent">Τύπος μονής: γυναικεία</string>
+    <string name="poi_cash_withdrawal_migros_bank">Τράπεζα Migros</string>
+    <string name="poi_cash_withdrawal_fee_no">Τέλος ανάληψης μετρητών: όχι</string>
+    <string name="poi_cash_withdrawal_currency">Νόμισμα ανάληψης μετρητών</string>
+    <string name="poi_cash_withdrawal_operator">Χειριστής ανάληψης μετρητών</string>
+    <string name="poi_disabled_yes">Ναι</string>
+    <string name="poi_hgv_permissive">Ανεκτή</string>
+    <string name="poi_volcano_type_scoria">Σκουριά</string>
+    <string name="poi_parking_space">Χώρος στάθμευσης</string>
+    <string name="poi_community_gender_mixed">Είδος κοινότητας: μικτή</string>
+    <string name="poi_monastery_type_clerks_regular">Τύπος μονής: κανονικοί κληρικοί</string>
+    <string name="poi_monastery_type_hermitage">Τύπος μονής: ερημητήριο</string>
+    <string name="poi_monastery_type_monastics">Τύπος μονής: μοναστική</string>
+    <string name="poi_bath_open_air_yes">Ναι</string>
+    <string name="poi_bath_type_foot_bath">Ποδόλουτρο</string>
+    <string name="poi_bath_type_lake">Λίμνη</string>
+    <string name="poi_bath_type_river">Ποταμός</string>
+    <string name="poi_bath_type_thermal">Θερμικό</string>
+    <string name="poi_bath_type_hammam">Χαμάμ</string>
+    <string name="poi_bath_type_onsen">Όνσεν</string>
+    <string name="poi_bath_type_hot_spring">Θερμή πηγή</string>
+    <string name="poi_cash_withdrawal_postbank">Postbank</string>
+    <string name="poi_cash_withdrawal_girocard">Girocard</string>
+    <string name="poi_cash_withdrawal_postfinance_card">Κάρτα Postfinance</string>
+    <string name="poi_cash_withdrawal_purchase_minimum">Ανάληψη μετρητών: ελάχιστη αγορά</string>
+    <string name="poi_cash_withdrawal_fee_yes">Τέλος ανάληψης μετρητών: ναι</string>
+    <string name="poi_cash_withdrawal_purchase_required_yes">Ανάληψη μετρητών: απαιτείται αγορά</string>
+    <string name="poi_cash_withdrawal_limit">Όριο ανάληψης μετρητών</string>
+    <string name="poi_cash_withdrawal_type_checkout">Τύπος ανάληψης μετρητών: ταμείο</string>
+    <string name="poi_cash_withdrawal">Ανάληψη μετρητών</string>
+    <string name="poi_cash_withdrawal_yes">Ανάληψη μετρητών: ναι</string>
+    <string name="poi_pet_grooming">Καλλωπισμός κατοικίδιων</string>
+    <string name="poi_charge">Χρέωση</string>
+    <string name="poi_craft_cabinet_maker">Επιπλοποιός</string>
+    <string name="poi_craft_bakery">Φούρνος</string>
+    <string name="poi_craft_joiner">Ξυλουργός</string>
+    <string name="poi_craft_distillery">Αποστακτήριο</string>
+    <string name="poi_craft_builder">Κατασκευαστής</string>
+    <string name="poi_health_food">Υγιεινά τρόφιμα</string>
+    <string name="poi_cellar_entrance">Είσοδος κάβας</string>
+    <string name="poi_disabled_designated">Δηλωμένη</string>
+    <string name="poi_goods_designated">Δηλωμένη</string>
+    <string name="poi_hgv_delivery">Διανομή</string>
+    <string name="poi_hgv_designated">Δηλωμένη</string>
+    <string name="poi_hgv_destination">Προορισμός</string>
+    <string name="poi_hgv_yes">Ναι</string>
+    <string name="poi_mofa_designated">Δηλωμένη</string>
+    <string name="poi_snowmobile_private">Πρόσβαση χιονοοχήματος: ιδιωτική</string>
+    <string name="poi_ski_yes">Χιονοδρομική σύμβαση: ναι</string>
+    <string name="poi_rtsa_scale_3b">3Б</string>
+    <string name="poi_rtsa_scale_3a">3А</string>
+    <string name="poi_rtsa_scale_2b">2Б</string>
+    <string name="poi_rtsa_scale_2a">2А</string>
+    <string name="poi_rtsa_scale_1b">1Б</string>
+    <string name="poi_rtsa_scale_1a">1А</string>
+    <string name="poi_rtsa_scale_nc">н/к</string>
+    <string name="poi_borough">Διαμέρισμα</string>
+    <string name="poi_traffic_signals_arrow_yes">Ναι</string>
+    <string name="poi_traffic_signals_vibration_yes">Ναι</string>
+    <string name="poi_traffic_signals_vibration_no">Δόνηση: όχι</string>
+    <string name="poi_pump_status_missing_beam">Κατάσταση αντλίας: ελλείπων βραχίονας</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Αναρρόφηση</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Πιεσμένο</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">Υπόγεια ύδατα</string>
+    <string name="poi_fire_hydrant_type_pipe">Σωλήνας</string>
+    <string name="poi_drinking_water_refill_network">Δίκτυο ξαναγεμίσματος πόσιμου νερού</string>
+    <string name="poi_drinking_water_refill_no">Ξαναγέμισμα πόσιμου νερού: όχι</string>
+    <string name="poi_drinking_water_refill_yes">Ξαναγέμισμα πόσιμου νερού: ναι</string>
+    <string name="poi_seamark_obstruction">Εμπόδιο</string>
+    <string name="poi_seamark_water_level_below_mwl">Επίπεδο νερού: Κάτω από το διάμεσο επίπεδο νερού</string>
+    <string name="poi_seamark_water_level_above_mwl">Επίπεδο νερού: πάνω από το διάμεσο επίπεδο νερού</string>
+    <string name="poi_seamark_water_level_floating">Επίπεδο νερού: επιπλέον</string>
+    <string name="poi_seamark_water_level_floods">Επίπεδο νερού: κατακλυσμένο</string>
+    <string name="poi_seamark_water_level_awash">Επίπεδο νερού: πλημμυρισμένο</string>
+    <string name="poi_seamark_water_level_covers">Επίπεδο νερού: καλυμμένο</string>
+    <string name="poi_seamark_water_level_dry">Επίπεδο νερού: ξηρό</string>
+    <string name="poi_seamark_water_level_submerged">Επίπεδο νερού: βυθισμένο</string>
+    <string name="poi_seamark_water_level_part_submerged">Επίπεδο νερού: μερικώς βυθισμένο</string>
+    <string name="poi_tactile_paving_incorrect">Εσφαλμένο</string>
+    <string name="poi_tactile_paving_primitive">Πρωτογενές</string>
+    <string name="poi_tactile_paving_contrasted">Αντίθετο</string>
+    <string name="poi_traffic_signals_sound_locate">Μόνο όταν επιτρέπεται το περπάτημα</string>
+    <string name="poi_internet_access_fee_customers">Σήμα για την εύρεση του πόλου</string>
+    <string name="poi_video_no">Όχι</string>
+    <string name="poi_booth">Τύπος θαλάμου</string>
+    <string name="poi_covered_booth">Θάλαμος</string>
+    <string name="poi_sms_yes">Ναι</string>
+    <string name="poi_dive_centre">Κέντρο αυτόνομης κατάδυσης</string>
+    <string name="poi_resort_hunting">Βάση κυνηγιού</string>
 </resources>

OsmAnd/res/values-el/strings.xml

@@ -1015,23 +1015,23 @@
     <string name="driving_region_japan">Ιαπωνία</string>
     <string name="driving_region_us">ΗΠΑ</string>
     <string name="driving_region_canada">Καναδάς</string>
-    <string name="driving_region_europe_asia">Ευρώπη, Ασία, Λατινική Αμερική κ.ο.κ.</string>
-    <string name="driving_region_uk">ΗΒ, Ινδία κ.ο.κ</string>
+    <string name="driving_region_europe_asia">Ευρώπη, Ασία, Λατινική Αμερική και παρόμοια</string>
+    <string name="driving_region_uk">ΗΒ, Ινδία και παρόμοια</string>
     <string name="about_version">Έκδοση:</string>
     <string name="shared_string_about">Περί</string>
     <string name="about_settings_descr">Πληροφορίες έκδοσης, άδειες, μέλη έργου</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_maxzoom">Μέγιστη εστίαση: %1$s</string>
     <string name="local_index_tile_data_minzoom">Ελάχιστη εστίαση: %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="maps_define_edit">Καθορισμός/Επεξεργασία…</string>
     <string name="local_index_tile_data_downloadable">Διαθέσιμο για λήψη: %1$s</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_name">Δεδομένα πλακιδίου: %1$s</string>
-    <string name="edit_tilesource_successfully">Πάροχος πλακιδίων %1$s αποθηκεύτηκε</string>
-    <string name="edit_tilesource_elliptic_tile">Ελλειπτικό Μερκάτωρ</string>
+    <string name="edit_tilesource_successfully">Αποθηκεύτηκε η πηγή πλακιδίων %1$s</string>
+    <string name="edit_tilesource_elliptic_tile">Ελλειπτική μερκατορική προβολή</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Επιλογή υπάρχοντος…</string>
     <string name="driving_region_descr">Επιλέξτε περιοχή οδήγησης: ΗΠΑ, Ευρώπη, ΗΒ, Ασία κλπ.</string>
@@ -1074,13 +1074,14 @@
     <string name="selected_gpx_info_show">"
 \n
 \nΠαρατεταμένο πάτημα για προβολή στον χάρτη"</string>
-    <string name="gpx_info_start_time">"Χρόνος έναρξης: %1$tF, %1$tT "</string>
-    <string name="gpx_info_end_time">"Χρόνος λήξης: %1$tF, %1$tT "</string>
+    <string name="gpx_info_start_time">Χρόνος έναρξης: %1$tF, %1$tT</string>
+    <string name="gpx_info_end_time">Χρόνος λήξης: %1$tF, %1$tT</string>
     <string name="gpx_info_diff_altitude">Εύρος υψομέτρου: %1$s</string>
     <string name="gpx_info_asc_altitude">Κατηφόρα/Ανηφόρα: %1$s</string>
     <string name="gpx_selection_number_of_points">%1$s σημεία</string>
-    <string name="gpx_selection_point">"Σημείο  %1$s"</string>
-    <string name="gpx_selection_route_points">"%1$s\nΣημεία διαδρομής  %2$s"</string>
+    <string name="gpx_selection_point">Σημείο %1$s</string>
+    <string name="gpx_selection_route_points">%1$s
+\nΣημεία διαδρομής %2$s</string>
     <string name="gpx_selection_points">%1$s\nΣημεία</string>
     <string name="osmo_edit_color">Χρώμα εμφάνισης</string>
     <string name="int_days">ημέρες</string>
@@ -1089,7 +1090,7 @@
     <string name="select_destination_and_intermediate_points">Ορίστε προορισμούς</string>
     <string name="shared_string_waypoint">Σημείο διαδρομής</string>
     <string name="gpx_info_subtracks">Υποδεέστερα ίχνη: %1$s</string>
-    <string name="gpx_info_waypoints">"Σημεία διαδρομής: %1$s "</string>
+    <string name="gpx_info_waypoints">Σημεία διαδρομής: %1$s</string>
     <string name="gpx_timespan">Χρονική διάρκεια: %1$s</string>
     <string name="gpx_timemoving">Χρόνος σε κίνηση: %1$s</string>
     <string name="gpx_selection_segment_title">Τμήμα</string>
@@ -1226,7 +1227,7 @@
     <string name="rendering_value_car_name">Αυτοκίνητο</string>
     <string name="rendering_value_bicycle_name">Ποδήλατο</string>
     <string name="rendering_value_pedestrian_name">Πεζοπόρος</string>
-    <string name="gpx_monitoring_start">Έναρξη καταγραφής GPX</string>
+    <string name="gpx_monitoring_start">Συνέχιση καταγραφής GPX</string>
     <string name="gpx_monitoring_stop">Παύση καταγραφής GPX</string>
     <string name="gpx_start_new_segment">Έναρξη νέου τμήματος</string>
     <string name="shared_string_all">Όλα</string>
@@ -1393,7 +1394,7 @@
     <string name="share_note">Κοινή χρήση σημείωσης</string>
     <string name="notes">Σημειώσεις A/V</string>
     <string name="roads_only">Μόνο δρόμοι</string>
-    <string name="free">"Ελεύθερο %1$s "</string>
+    <string name="free">Ελεύθερο %1$s</string>
     <string name="device_memory">Μνήμη συσκευής</string>
     <string name="rendering_attr_streetLighting_name">Φωτισμός οδών</string>
     <string name="rendering_attr_subwayMode_name">Διαδρομές μετρό</string>
@@ -1589,8 +1590,8 @@
     <string name="one_tap_active_descr">Πατήστε ένα δείκτη στο χάρτη για να τον μετακινήσετε στην κορυφή των ενεργών δεικτών χωρίς να ανοίξει το συναφές μενού.</string>
     <string name="one_tap_active">Ενεργό το \'Ένα πάτημα\'</string>
     <string name="empty_state_av_notes">Κρατήστε σημειώσεις!</string>
-    <string name="empty_state_av_notes_desc">Προσθέστε ήχο, βίντεο ή φωτοσημείωση για κάθε σημείο στο χάρτη, χρησιμοποιώντας το widget ή το συναφές μενού.</string>
-    <string name="notes_by_date">Σημειώσεις OSM κατά ημερομηνία</string>
+    <string name="empty_state_av_notes_desc">Προσθέστε ήχο, βίντεο ή φωτοσημειώσεις για κάθε σημείο στο χάρτη, χρησιμοποιώντας τα γραφικά στοιχεία ή τα μενού περιβάλλοντος.</string>
+    <string name="notes_by_date">Σημειώσεις ήχου/βίντεο κατά ημερομηνία</string>
     <string name="download_maps_travel">Ταξιδιωτικοί οδηγοί</string>
     <string name="article_removed">Το άρθρο αφαιρέθηκε</string>
     <string name="wikivoyage_search_hint">Αναζήτηση για χώρα, πόλη, ή επαρχία</string>
@@ -1665,7 +1666,7 @@
     <string name="show_guide_line_descr">Εμφάνιση κατευθυντήριας γραμμής από τη θέση σας προς τις ενεργές τοποθεσίες δείκτη.</string>
     <string name="show_arrows_descr">Εμφάνιση ενός ή δύο βελών που δείχνουν την κατεύθυνση προς τους ενεργούς δείκτες.</string>
     <string name="distance_indication_descr">Επιλέξτε πώς θα εμφανίζεται η απόσταση προς τους ενεργούς δείκτες.</string>
-    <string name="active_markers_descr">Προσδιορίστε τον αριθμό των δεικτών κατεύθυνσης:</string>
+    <string name="active_markers_descr">Προσδιορίστε τον αριθμό των δεικτών κατεύθυνσης.</string>
     <string name="digits_quantity">Αριθμός δεκαδικών ψηφίων</string>
     <string name="shared_string_right">Δεξιά</string>
     <string name="shared_string_left">Αριστερά</string>
@@ -1726,7 +1727,7 @@
     <string name="order_by">Ταξινόμηση κατά:</string>
     <string name="marker_show_distance_descr">Επιλογή υπόδειξης απόστασης και κατεύθυνσης σε σημειωτές χαρτών στον χάρτη:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Όριο προσανατολισμού χάρτη</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Επιλογή παρακάτω της ταχύτητας εναλλαγής προσανατολισμού από \'Κατεύθυνση κίνησης\' σε \'Κατεύθυνση πυξίδας\'.</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Επιλέξτε την ταχύτητα εναλλαγής προσανατολισμού από \'Κατεύθυνση κίνησης\' σε \'Κατεύθυνση πυξίδας\' παρακάτω.</string>
     <string name="all_markers_moved_to_history">Όλοι οι δείκτες χάρτη μετακινήθηκαν στο ιστορικό</string>
     <string name="marker_moved_to_history">Ο δείκτης χάρτη μετακινήθηκε στο ιστορικό</string>
     <string name="marker_moved_to_active">Ο δείκτης χάρτη ενεργοποιήθηκε</string>
@@ -1775,13 +1776,13 @@
     <string name="import_gpx_failed_descr">Δεν μπορούσε να εισαχθεί το αρχείο. Παρακαλώ διαβεβαιώστε πως το OsmAnd επιτρέπεται να το αναγνώσει.</string>
     <string name="mapillary_image">Εικόνα Mapillary</string>
     <string name="improve_coverage_mapillary">Βελτίωση κάλυψης φωτογραφίας με Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Εγκαταστήστε το Mapillary για να προσθέσετε μία ή περισσότερες φωτογραφίες σε αυτήν την τοποθεσία του χάρτη.</string>
+    <string name="improve_coverage_install_mapillary_desc">Εγκαταστήστε το Mapillary για να προσθέσετε φωτογραφίες σε αυτήν την τοποθεσία του χάρτη.</string>
     <string name="no_photos_descr">Χωρίς φωτογραφίες εδώ.</string>
     <string name="mapillary_action_descr">Μοιραστείτε την θέα σας στο δρόμο μέσω του Mapillary.</string>
     <string name="mapillary_widget">Γραφικό στοιχείο Mapillary</string>
     <string name="mapillary_widget_descr">Επιτρέπει γρήγορες συνεισφορές στο Mapillary.</string>
     <string name="mapillary_descr">Διαδικτυακές φωτογραφίες δρόμου για όλους. Ανακαλύψτε θέσεις, συνεργαστείτε, αποτυπώστε τον κόσμο.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Εικόνες επιπέδου οδού</string>
     <string name="plugin_mapillary_descr">Φωτογραφίες δρόμου για όλους. Ανακαλύψτε θέσεις, συνεργαστείτε, αποτυπώστε τον κόσμο.</string>
     <string name="private_access_routing_req">Ο προορισμός σας βρίσκεται σε ιδιωτική περιοχή. Να επιτραπεί η πρόσβαση σε ιδιωτικούς δρόμους για αυτό το ταξίδι;</string>
     <string name="restart_search">Επανεκκίνηση αναζήτησης</string>
@@ -1927,7 +1928,7 @@
     <string name="gpx_add_track">Προσθήκη περισσότερων…</string>
     <string name="shared_string_appearance">Εμφάνιση</string>
     <string name="trip_rec_notification_settings">Ενεργοποίηση γρήγορης καταγραφής</string>
-    <string name="trip_rec_notification_settings_desc">Εμφάνιση ειδοποίησης συστήματος που επιτρέπει την καταγραφή ταξιδιού.</string>
+    <string name="trip_rec_notification_settings_desc">Εμφάνιση ειδοποίησης συστήματος που επιτρέπει την έναρξη καταγραφής ταξιδιού.</string>
     <string name="shared_string_notifications">Ειδοποιήσεις</string>
     <string name="shared_string_continue">Συνέχεια</string>
     <string name="shared_string_pause">Παύση</string>
@@ -1965,7 +1966,7 @@
     <string name="delete_filter">Διαγραφή φίλτρου</string>
     <string name="new_filter">Νέο φίλτρο</string>
     <string name="new_filter_desc">Παρακαλούμε, εισάγετε όνομα για το νέο φίλτρο, αυτό θα προστεθεί στην δική σας καρτέλα \'Κατηγορίες\'.</string>
-    <string name="osm_live_payment_desc">Τα τέλη εγγραφής επιβαρύνονται μηνιαία. Μπορείτε να ακυρώσετε την εγγραφή σας στο Google Play οποτεδήποτε.</string>
+    <string name="osm_live_payment_desc">Η συνδρομή επιβαρύνεται ανά επιλεγμένη περίοδο. Μπορείτε να την ακυρώσετε στο Google Play οποτεδήποτε.</string>
     <string name="donation_to_osm">Δωρεά στην κοινότητα OSM</string>
     <string name="donation_to_osm_desc">Μέρος της δωρεάς σας θα σταλεί στους συντελεστές OSM. Το κόστος της εγγραφής παραμένει το ίδιο.</string>
     <string name="osm_live_subscription_desc">Η εγγραφή ενεργοποιεί ωριαίες, ημερήσιες και εβδομαδιαίες ενημερώσεις και απεριόριστες λήψεις για όλους τους χάρτες παγκοσμίως.</string>
@@ -2005,7 +2006,7 @@
     <string name="back_to_search">Πίσω στην αναζήτηση</string>
     <string name="confirmation_to_delete_history_items">Να αφαιρεθούν τα επιλεγμένα στοιχεία από το \'Ιστορικό\';</string>
     <string name="show_something_on_map">Εμφάνιση του %1$s στον χάρτη</string>
-    <string name="dist_away_from_my_location">"Αναζήτηση %1$s μακριά "</string>
+    <string name="dist_away_from_my_location">Αναζήτηση %1$s μακριά</string>
     <string name="share_history_subject">κοινόχρηστο μέσω του OsmAnd</string>
     <string name="search_categories">Κατηγορίες</string>
     <string name="postcode">Ταχυδρομικός κώδικας</string>
@@ -2329,7 +2330,7 @@
     <string name="search_radius_proximity">Μέσα σε</string>
     <string name="fav_point_emoticons_message">Το αγαπημενο μετονομάστηκε σε \'%1$s\' για να προφυλάξει την συμβολοσειρά που περιέχει emoticons σε αρχείο.</string>
     <string name="fav_point_dublicate">Ορίστηκε διπλογραφή ονόματος Αγαπημένου</string>
-    <string name="traffic_warning_calming">Ήπια κυκλοφορία</string>
+    <string name="traffic_warning_calming">Χαλάρωση κυκλοφορίας</string>
     <string name="save_global_track_interval_descr">Ορίστε τα χρονικά διαστήματα καταγραφής για τη γενική εγγραφή ιχνών (ενεργό μέσω του γραφικού στοιχείου καταγραφής GPX στον χάρτη).</string>
     <string name="save_track_to_gpx_globally_headline">Καταγραφή ίχνους κατ΄ απαίτηση</string>
     <string name="enable_proxy_descr">Διαμόρφωση μεσολαβητή HTTP για όλες τις αιτήσεις δικτύου.</string>
@@ -2412,19 +2413,24 @@
 \n</string>
     <string name="osmand_extended_description_part4">Χιονοδρομίες
 \nΤο πρόσθετο χαρτών χιονοδρομιών σας επιτρέπει να δείτε ίχνη χιονοδρομιών με επίπεδο δυσκολίας και κάποιες πρόσθετες πληροφορίες, όπως τοποθεσίες αναβατορίων και άλλων εγκαταστάσεων.</string>
-    <string name="osmand_extended_description_part6">"Περπάτημα, πεζοπορία, γύρος της πόλης 
+    <string name="osmand_extended_description_part6">Περπάτημα, πεζοπορία, γύρος της πόλης 
+\n
 \n • Ο χάρτης σας εμφανίζει διαδρομές περπατήματος και πεζοπορίας 
+\n
 \n • Η βικιπαίδεια στην προτιμώμενη γλώσσα σας μπορεί να σας πει πολλά στον γύρο της πόλης 
+\n
 \n • Οι στάσεις των δημόσιων συγκοινωνιών (λεωφορείου, τροχιόδρομου, σιδηρόδρομου), συμπεριλαμβάνοντας τα ονόματα γραμμών, βοηθούν στην πλοήγηση σε μια νέα πόλη 
+\n
 \n • Η πλοήγηση GPS σε κατάσταση πεζού δημιουργεί τη διαδρομή σας χρησιμοποιώντας πεζοπορικές διαδρομές 
+\n
 \n • Ανεβάσετε και ακολουθήσετε μια διαδρομή GPX ή καταγράψετε και μοιραστείτε τη δική σας
-\n"</string>
+\n</string>
     <string name="osmand_extended_description_part7">Συνεισφέρετε στο OSM
 \n • Αναφέρετε σφάλματα δεδομένων
 \n • Ανεβάστε ίχνη GPX στο OSM απευθείας από την εφαρμογή
 \n • Προσθέστε ΣΕ και ανεβάστε τα απευθείας στο OSM (ή αργότερα εάν είσαστε χωρίς σύνδεση)
 \n</string>
-    <string name="osmand_extended_description_part8">Το OsmAnd αναπτύσσεται ενεργά από λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας μεταφράσεις ή κωδικοποιώντας νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται στις οικονομικές συνδρομές για να . Η πρόοδος του έργου βασίζεται επίσης στις οικονομικές συνεισφορές για να τροφοδοτήσει την κωδικοποίηση και τον έλεγχο των νέων λειτουργιών. 
+    <string name="osmand_extended_description_part8">Το OsmAnd αναπτύσσεται ενεργά από λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας μεταφράσεις ή κωδικοποιώντας νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται στις οικονομικές συνδρομές για χρηματοδότηση του κώδικα και των νέων λειτουργιών.
 \n Προσεγγιστική κάλυψη χάρτη και ποιότητας:
 \n • Δυτική Ευρώπη: ****
 \n • Ανατολική Ευρώπη: ***
@@ -2482,11 +2488,16 @@
 \n • Προαιρετική εμφάνιση ταχύτητας και υψομέτρου 
 \n • Εμφάνιση ισοϋψών γραμμών και σκίαση αναγλύφου (μέσω προσθέτου)</string>
     <string name="osmand_plus_extended_description_part7">"Απευθείας συνεισφορά στο OSM 
+\n
 \n • Αναφορά σφαλμάτων δεδομένων 
+\n
 \n• Ανέβασμα ιχνών GPX στο OSM απευθείας από την εφαρμογή 
+\n
 \n • Προσθήκη ΣΕ και απευθείας ανέβασμα τους στο OSM (ή αργότερα εάν είναι χωρίς σύνδεση) 
+\n
 \n • Επίσης, προαιρετική καταγραφή ταξιδιού σε κατάσταση παρασκηνίου (ενώ η συσκευή είναι σε κατάσταση ύπνωσης) 
-\n Το OsmAnd είναι ενεργά αναπτυσσόμενο λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας τις μεταφράσεις, ή κωδικοποιόντας  νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται επίσης στις χρηματικές συνεισφορές για χρηματοδότηση κωδικοποίησης και ελέγχου των νέων λειτουργιών.
+\n
+\n Το OsmAnd είναι ενεργά αναπτυσσόμενο λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας τις μεταφράσεις, ή κωδικοποιώντας  νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται επίσης στις χρηματικές συνεισφορές για χρηματοδότηση κωδικοποίησης και ελέγχου των νέων λειτουργιών.
 \n"</string>
     <string name="osmand_plus_extended_description_part8">Προσεγγιστική κάλυψη χαρτών και ποιότητα:
 \n • Δυτική Ευρώπη: ****
@@ -2499,7 +2510,8 @@
 \n • Μέση Ανατολή: **
 \n • Αφρική **
 \n • Ανταρκτική: *
-\n Οι περισσότερες χώρες της Γης είναι διαθέσεις για λήψη! Από το Αφγανιστάν μέχρι τη Ζιμπάμπουε, από την Αυστραλία μέχρι τις ΗΠΑ. Αργεντινή, Βραζιλία, Καναδάς, Γαλλία, Γερμανία, Μεξικό, Ενωμένο Βασίλειο, Ισπανία, …
+\n Οι περισσότερες χώρες της Γης είναι διαθέσεις για λήψη
+\n Από το Αφγανιστάν μέχρι τη Ζιμπάμπουε, από την Αυστραλία μέχρι τις ΗΠΑ. Αργεντινή, Βραζιλία, Καναδάς, Γαλλία, Γερμανία, Μεξικό, Ενωμένο Βασίλειο, Ισπανία, …
 \n</string>
     <string name="share_route_subject">Διαμοιρασμένη διαδρομή μέσω OsmAnd</string>
     <string name="local_index_description">Πατήστε οποιοδήποτε υφιστάμενο στοιχείο για να δείτε περισσότερες λεπτομέρειες, παρατεταμένο πάτημα για απενεργοποίηση ή διαγραφή. Τρέχοντα δεδομένα στη συσκευή (%1$s ελεύθερα):</string>
@@ -2708,7 +2720,7 @@
     <string name="empty_state_my_tracks">Προσθήκη αρχείων GPX</string>
     <string name="empty_state_my_tracks_desc">Εισαγωγή αρχείων GPX, ή καταγραφή ιχνών.</string>
     <string name="empty_state_favourites">Προσθήκη αγαπημένων</string>
-    <string name="empty_state_favourites_desc">Εισαγωγή αγαπημένων, ή προσθήκη μέσω σημείων επισήμανσης στον χάρτη.</string>
+    <string name="empty_state_favourites_desc">Εισαγωγή αγαπημένων, ή προσθήκη τους μέσω σημείων επισήμανσης στον χάρτη.</string>
     <string name="import_track">Εισαγωγή αρχείου GPX</string>
     <string name="import_track_desc">Το αρχείο %1$s δεν περιέχει σημεία διαδρομής, να εισαχθεί ως ίχνος;</string>
     <string name="move_point">Μετακίνηση σημείου</string>
@@ -2744,7 +2756,7 @@
     <string name="update_is_available">Υπάρχει διαθέσιμη ενημέρωση</string>
     <string name="download_file">Λήψη αρχείου</string>
     <string name="start_editing_card_image_text">Ο ελεύθερος παγκόσμιος ταξιδιωτικός οδηγός που οποιοσδήποτε μπορεί να επεξεργαστεί.</string>
-    <string name="welcome_to_open_beta_description">"Το OsmAnd Travel βασίζεται, προς το παρόν, στα βικιταξίδια.  Ελέγξτε όλα τα χαρακτηριστικά δωρεάν κατά την ανοικτή βήμα δοκιμή. Κατόπιν, οι οδηγοί ταξιδιού θα είναι διαθέσιμοι στους συνδρομητές του απεριόριστου OsmAnd και στους κατόχους του OsmAnd+."</string>
+    <string name="welcome_to_open_beta_description">Το OsmAnd Travel βασίζεται, προς το παρόν, στα βικιταξίδια. Ελέγξτε όλα τα χαρακτηριστικά δωρεάν κατά την ανοικτή βήμα δοκιμή. Κατόπιν, οι οδηγοί ταξιδιού θα είναι διαθέσιμοι στους συνδρομητές του απεριόριστου OsmAnd και στους κατόχους του OsmAnd+.</string>
     <string name="start_editing_card_description">Μπορείτε και πρέπει να επεξεργαστείτε οποιοδήποτε άρθρο στο βικιταξίδια, Μοιραστείτε τη γνώση, την εμπειρία, το ταλέντο και την προσοχή σας.</string>
     <string name="start_editing">Έναρξη επεξεργασίας</string>
     <string name="get_unlimited_access">Πάρτε απεριόριστη πρόσβαση</string>
@@ -2824,7 +2836,7 @@
     <string name="test_voice_desrc">Πιέστε ένα κουμπί και ακούστε την φωνητική προτροπή για να ταυτοποιήσετε αν απουσιάζει ή είναι εσφαλμένη</string>
     <string name="osm_live_subscriptions">Συνδρομές</string>
     <string name="powered_by_osmand">Από το OsmAnd</string>
-    <string name="osm_live_plan_pricing">"Δυνατότητες  και τιμές"</string>
+    <string name="osm_live_plan_pricing">Δυνατότητες και τιμές</string>
     <string name="osm_live_payment_monthly_title">Μηνιαία</string>
     <string name="osm_live_payment_3_months_title">Τριμηνιαία</string>
     <string name="osm_live_payment_annual_title">Ετήσια</string>
@@ -3078,7 +3090,7 @@
     <string name="turn_screen_on_router">Ενεργοποίηση στη στροφή</string>
     <string name="turn_screen_on_time_descr">Ορίστε για πόσο χρόνο θα είναι ενεργοποιημένη η οθόνη.</string>
     <string name="turn_screen_on_sensor">Χρήση του αισθητήρα προσέγγισης</string>
-    <string name="turn_screen_on_sensor_descr">Κουνήστε το χέρι σας πάνω από την οθόνη για να την ενεργοποιήσετε κατά την πλοήγηση.</string>
+    <string name="turn_screen_on_sensor_descr">Η κίνηση του χεριού σας πάνω από την οθόνη θα την ενεργοποιήσει.</string>
     <string name="turn_on_profile_desc">Παρακαλώ ενεργοποιήστε τουλάχιστον ένα προφίλ για τη χρήση αυτής της ρύθμισης.</string>
     <string name="rendering_attr_winter_road_name">Δρόμος του Χειμώνα</string>
     <string name="rendering_attr_ice_road_name">Παγωμένος δρόμος</string>
@@ -3245,7 +3257,7 @@
     <string name="analytics_pref_title">Αναλυτικά στοιχεία</string>
     <string name="turn_screen_on_info">Εμφάνιση χάρτη στην οθόνη κλειδώματος κατά την πλοήγηση.</string>
     <string name="route_parameters_info">Ρυθμίσεις δρομολόγησης στο επιλεγμένο προφίλ \"%1$s\".</string>
-    <string name="wake_time">Ώρα αφύπνισης</string>
+    <string name="wake_time">Αναμονή μετά την αφύπνιση</string>
     <string name="units_and_formats">Μονάδες μέτρησης &amp; φορμά</string>
     <string name="appearance">Εμφάνιση</string>
     <string name="map_look_descr">Εμφάνιση χάρτη</string>
@@ -3267,7 +3279,7 @@
     <string name="map_during_navigation_info">Χάρτης κατά την πλοήγηση</string>
     <string name="map_during_navigation">Χάρτης κατά την πλοήγηση</string>
     <string name="shared_string_other">Άλλα</string>
-    <string name="vehicle_parameters_descr">Βάρος, ύψος, ταχύτητα</string>
+    <string name="vehicle_parameters_descr">Βάρος, ύψος, μήκος, ταχύτητα</string>
     <string name="vehicle_parameters">Παράμετροι οχήματος</string>
     <string name="voice_announces_info">Οι φωνητικές ανακοινώσεις να γίνονται μόνο κατά την πλοήγηση.</string>
     <string name="voice_announces_descr">Οδηγίες πλοήγησης και ανακοινώσεις</string>
@@ -3466,7 +3478,7 @@
     <string name="monitoring_min_speed_descr_side_effect">Παράπλευρο φαινόμενο: Θα λείπουν από τη διαδρομή σας όλες οι ενότητες όπου δεν καλύπτονται από το κριτήριο της ελάχιστης ταχύτητας (π.χ. όταν σπρώχνετε το μηχανάκι σας σε απότομο λόφο). Επίσης, δεν θα υπάρχουν πληροφορίες για περιόδους ακινησίας, όπως φρένα. Αυτό έχει συνέπειες στην ανάλυση ή την μετεπεξεργασία, όπως όταν προσπαθείτε να καθορίσετε το συνολικό μήκος του ταξιδιού σας, τον χρόνο κίνησης, ή την μέση ταχύτητά σας.</string>
     <string name="monitoring_min_speed_descr_recommendation">Σύσταση: Προσπαθήστε να χρησιμοποιήσετε τον εντοπισμό ταχύτητας μέσω του φίλτρου μετατόπισης ελάχιστης καταγραφής (Β) πρώτα, μπορεί να παράξει καλύτερα αποτελέσματα και θα χάσετε λιγότερα δεδομένα. Εάν οι διαδρομές σας παραμένουν θορυβώδεις σε χαμηλές ταχύτητες, δοκιμάστε μη μηδενικές τιμές εδώ. Σημειώστε ότι κάποιες μετρήσεις μπορεί να μην αναφέρουν καθόλου τιμή ταχύτητας (κάποιες μέθοδοι που βασίζονται σε δίκτυα), οπότε δεν θα μπορέσετε να εγγράψετε τίποτα.</string>
     <string name="monitoring_min_speed_descr_remark">Σημείωση: ταχύτητα &gt; 0 ελέγξτε: Τα περισσότερα κυκλώματα GPS αναφέρουν τιμή ταχύτητας μόνο εάν ο αλγόριθμος καθορίζει ότι κινείστε και καμία όταν δεν κινείστε. Συνεπώς χρησιμοποιώντας τη ρύθμιση &gt; 0 σε αυτό το φίλτρο χρησιμοποιεί τον εντοπισμό κίνησης του κυκλώματος GPS. Αλλά ακόμα κι αν δεν φιλτραριστεί εδώ κατά τον χρόνο εγγραφής, εξακολουθούμε να χρησιμοποιούμε αυτό το γνώρισμα στην ανάλυση GPX για τον καθορισμό της διορθωμένης απόστασης, δηλ. η εμφανιζόμενη τιμή σε αυτό το πεδίο είναι η καταγραφόμενη απόσταση κατά την κίνηση.</string>
-    <string name="monitoring_min_accuracy_descr">Αυτό θα καταγράψει μόνο μετρημένα σημεία με ελάχιστη ένδειξη ακρίβειας (σε μέτρα/πόδια, όπως αναφέρεται από το Android για το κύκλωμά σας). Η ακρίβεια αναφέρεται στη διασπορά των επαναλαμβανόμενων μετρήσεων και δεν σχετίζεται άμεσα με την ακρίβεια, που καθορίζει πόσο κοντά είναι οι μετρήσεις σας με την πραγματική σας θέση.</string>
+    <string name="monitoring_min_accuracy_descr">Αυτό θα καταγράψει μόνο μετρημένα σημεία με ελάχιστη ένδειξη ακρίβειας (σε μέτρα/πόδια, όπως αναφέρεται από το Android για το κύκλωμά σας). Ακρίβεια είναι η εγγύτητα των μετρήσεων με την πραγματική θέση και δεν σχετίζεται άμεσα με τη διακύμανση που είναι η διασπορά των επαναλαμβανόμενων μετρήσεων.</string>
     <string name="monitoring_min_accuracy_descr_side_effect">Παράπλευρο φαινόμενο: Ως αποτέλεσμα φιλτραρίσματος από ακρίβεια, μπορεί να λείπουν πλήρως σημεία, π.χ. κάτω από γέφυρες, κάτω από δένδρα, μεταξύ υψηλών κτιρίων, ή με συγκεκριμένες συνθήκες καιρού.</string>
     <string name="monitoring_min_accuracy_descr_recommendation">Σύσταση: Είναι δύσκολο να προβλεφθεί τι θα εγγραφεί και τι όχι, ίσως είναι καλύτερο να απενεργοποιήσετε αυτό το φίλτρο.</string>
     <string name="monitoring_min_accuracy_descr_remark">Παρατήρηση: Εάν το GPS είχε απενεργοποιηθεί αμέσως πριν μια εγγραφή, το πρώτο μετρούμενο σημείο μπορεί να έχει μειωμένη ακρίβεια, έτσι μπορεί να θέλουμε να περιμένουμε λιγάκι πριν την καταγραφή σημείου (ή να εγγράψουμε τα καλύτερα 3 διαδοχικά σημεία, κλπ.), αλλά αυτό δεν έχει ακόμα υλοποιηθεί.</string>
@@ -3478,32 +3490,32 @@
     <string name="live_monitoring_tracking_interval">Χρονικά διαστήματα ιχνηλάτησης</string>
     <string name="search_offline_geo_error">Αδυναμία ανάλυσης γεωγραφικού στόχου \'%s\'.</string>
     <string name="rearrange_categories">Αναδιάταξη κατηγοριών</string>
-    <string name="create_custom_categories_list_promo">Μπορείτε να προσθέσετε προσαρμοσμένες κατηγορίες να απόκρυψεται κατηγορίες που δεν βρίσκεται απαραίτητες και να αλλάξετε τη σειρά ταξινόμησης του καταλόγου. Ο κατάλογος μπορεί να εισαχθεί και να εξαχθεί με προφίλ.</string>
-    <string name="add_new_custom_category_button_promo">Μπορείτε να προσθέσετε μια νέα προσαρμοσμένη κατηγορία επιλέγοντας μία ή μερικές απαιτούμενες κατηγορίες.</string>
-    <string name="reset_to_default_category_button_promo">Επαναφορά στην προεπιλογή θα επαναφέρει τη ταξινόμηση στην προεπιλεγμένη κατάσταση μετά την εγκατάσταση.</string>
+    <string name="create_custom_categories_list_promo">Η αλλαγή της σειράς διάταξης του καταλόγου, αποκρύπτει τις κατηγορίες. Μπορείτε να εισάγετε ή να εξάγετε όλες τις αλλαγές με κατατομές (προφίλ).</string>
+    <string name="add_new_custom_category_button_promo">Μπορείτε να προσθέσετε μια νέα προσαρμοσμένη κατηγορία επιλέγοντας μία ή περισσότερες κατηγορίες.</string>
+    <string name="reset_to_default_category_button_promo">Το \'Επαναφορά στην προεπιλογή\' θα επαναφέρει τη σειρά ταξινόμησης στην προεπιλεγμένη εγκατάσταση.</string>
     <string name="shared_string_available">Διαθέσιμα</string>
     <string name="add_custom_category">Προσθήκη προσαρμοσμένης κατηγορίας</string>
     <string name="rendering_attr_streetLightingNight_name">Εμφάνιση μόνο τη νύχτα</string>
-    <string name="plugin_prefs_reset_successful">Όλες οι ρυθμίσεις πρόσθετων επαναφέρθηκαν στην προεπιλεγμένη κατάσταση.</string>
-    <string name="profile_prefs_reset_successful">Όλες οι ρυθμίσεις προφίλ επαναφέρθηκαν στην προεπιλεγμένη κατάσταση.</string>
+    <string name="plugin_prefs_reset_successful">Όλες οι ρυθμίσεις πρόσθετων επαναφέρθηκαν στην προεπιλογή.</string>
+    <string name="profile_prefs_reset_successful">Όλες οι ρυθμίσεις κατατομών (προφίλ) επαναφέρθηκαν στην προεπιλογή.</string>
     <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
     <string name="sunset_at">Ηλιοβασίλεμα στις %1$s</string>
     <string name="sunrise_at">Ανατολή του ηλίου στις %1$s</string>
-    <string name="accessibility_mode_disabled">Η λειτουργία προσβασιμότητας απενεργοποιήθηκε στο σύστημά σας.</string>
-    <string name="use_system_screen_timeout">Χρήση χρονικού ορίου της οθόνης από το σύστημα</string>
+    <string name="accessibility_mode_disabled">Η λειτουργία προσβασιμότητας απενεργοποιήθηκε στο Android σύστημά σας.</string>
+    <string name="use_system_screen_timeout">Χρήση του χρονικού ορίου της οθόνης του συστήματος</string>
     <string name="clear_recorded_data">Εκκαθάριση κατεγραμμένων δεδομένων</string>
     <string name="copy_coordinates">Αντέγραψε συντεταγμένες</string>
     <string name="routing_profile_direct_to">Άμεσα-στο-σημείο</string>
     <string name="please_provide_profile_name_message">Καταχωρίστε ένα όνομα για το προφίλ</string>
     <string name="open_settings">Άνοιγμα ρυθμίσεων</string>
-    <string name="plugin_disabled">Πρόσθετο απενεργοποιημένο</string>
-    <string name="plugin_disabled_descr">Αυτο το πρόσθετο είναι ξεχωριστή εφαρμογή, θα πρέπει να το απεγκαταστήσετε ξεχωριστά αν πλέον δεν το χρησιμοποιήτε.
+    <string name="plugin_disabled">Ανενεργό πρόσθετο</string>
+    <string name="plugin_disabled_descr">Αυτό το πρόσθετο είναι ξεχωριστή εφαρμογή, θα πρέπει να το αφαιρέσετε ξεχωριστά εάν πλέον δεν σκοπεύετε να το χρησιμοποιήσετε.
 \n
 \nΤο πρόσθετο θα παραμείνει στη συσκευή μετά την απεγκατάσταση του OsmAnd.</string>
     <string name="shared_string_menu">Μενού</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
     <string name="shared_string_app_default_w_val">Προεπιλογή της εφαρμογής (%s)</string>
-    <string name="no_recalculation_setting">Απενεργοποίησε τον επανυπολογισμό</string>
+    <string name="no_recalculation_setting">Χωρίς επανυπολογισμό</string>
     <string name="route_recalculation_dist_title">Ελάχιστη απόσταση για επανυπολογισμό διαδρομής</string>
     <string name="route_recalculation_dist_descr">Η διαδρομή θα επανυπολογισθεί αν η απόσταση από την διαδρομή είναι μακρύτερη από μια συγκεκριμένη παράμετρο</string>
     <string name="profile_type_custom_string">Προσαρμοσμένη κατανομή</string>
@@ -3520,7 +3532,7 @@
     <string name="replace_all_desc">Τα τρέχοντα αντικείμενα θα αντικατασταθούν με αντικείμενα από το αρχείο</string>
     <string name="replace_all">Αντικατάσταση όλων</string>
     <string name="keep_both">Διατήρηση και των δύο</string>
-    <string name="keep_both_desc">Τα εισαχθέντα αντικείμενα θα προστεθούν με πρόθεμα</string>
+    <string name="keep_both_desc">Τα εισαχθέντα στοιχεία θα προστεθούν με πρόθεμα</string>
     <string name="import_duplicates_description">Το OsmAnd έχει ήδη στοιχεία με το ίδιο όνομα όπως τα εισηχθέντα.
 \n
 \nΕπιλέξτε μια ενέργεια.</string>
@@ -3736,4 +3748,117 @@
     <string name="lang_uz">Ουζμπέκικα</string>
     <string name="lang_ur">Ουρντού</string>
     <string name="lang_tt">Ταταρικά</string>
+    <string name="use_system_screen_timeout_promo">Προεπιλεγμένη απενεργοποίηση: Όσο εκτελείται το OsmAnd στο προσκήνιο, η οθόνη δεν θα σβήσει.
+\n
+\nΕάν είναι ενεργό, το OsmAnd θα χρησιμοποιήσει τη ρύθμιση χρόνου αδράνειας του συστήματος.</string>
+    <string name="release_3_6">• Κατατομές (προφίλ): τώρα μπορείτε να αλλάξετε τη σειρά, να ορίσετε εικονίδιο για τον χάρτη, να αλλάξετε όλες τις ρυθμίσεις για κατατομές βάσης και να τις επαναφέρετε στις προεπιλογές.
+\n
+\n • Προστέθηκε αριθμός εξόδου στην πλοήγηση
+\n
+\n • Ξαναδουλεύτηκαν οι ρυθμίσεις προσθέτου
+\n
+\n • Ξαναδουλεύτηκε η οθόνη ρυθμίσεων για γρήγορη πρόσβαση σε όλες τις κατατομές
+\n
+\n • Προστέθηκε επιλογή αντιγραφής ρυθμίσεων από άλλη κατατομή
+\n
+\n • Προστέθηκε η δυνατότητα αλλαγής σειράς ή απόκρυψης κατηγοριών ΣΕ στην αναζήτηση
+\n
+\n • Καλύτερη στοίχιση εικονιδίων ΣΕ στον χάρτη
+\n
+\n • Προστέθηκαν δεδομένα δύσης / ανατολής για τον χάρτη διαμόρφωσης
+\n
+\n • Προστέθηκαν εικονίδια οικίας/εργασίας στον χάρτη
+\n
+\n • Προστέθηκε υποστήριξη για περιγραφή πολλών γραμμών στις ρυθμίσεις
+\n
+\n • Προστέθηκε σωστή μεταγραφή στον χάρτη Ιαπωνίας
+\n
+\n • Προστέθηκε χάρτης της Ανταρκτικής
+\n
+\n</string>
+    <string name="index_name_antarctica">Ανταρκτική</string>
+    <string name="sort_by_category">Ταξινόμηση κατά κατηγορία</string>
+    <string name="shared_string_resume">Συνέχιση</string>
+    <string name="export_profile_dialog_description">Μπορείτε να επιλέξετε πρόσθετα δεδομένα για εξαγωγή μαζί με την κατατομή (προφίλ).</string>
+    <string name="import_profile_dialog_description">Η εισαγόμενη κατατομή (προφίλ) περιέχει πρόσθετα δεδομένα. Πατήστε \"Εισαγωγή\" για να εισάγετε μόνο δεδομένα κατατομής, ή επιλέξτε πρόσθετα δεδομένα.</string>
+    <string name="shared_string_include_data">Να συμπεριλαμβάνονται πρόσθετα δεδομένα</string>
+    <string name="shared_string_rendering_style">Τεχνοτροπία απόδοσης</string>
+    <string name="shared_string_routing">Δρομολόγηση</string>
+    <string name="import_rendering_file">Εισαγωγή αρχείου απόδοσης</string>
+    <string name="shared_string_terrain">Έδαφος</string>
+    <string name="hillshade_description">Η σκίαση αναγλύφου με σκούρες σκιές για την εμφάνιση κλίσεων, κορυφών και πεδινών.</string>
+    <string name="slope_description">Η κλίση χρησιμοποιεί χρώματα για να οπτικοποιήσει την κλίση του εδάφους.</string>
+    <string name="terrain_slider_description">Ορίστε το μέγιστο και το ελάχιστο επίπεδο εστίασης στον οποίο θα εμφανίζεται η στρώση.</string>
+    <string name="hillshade_download_description">Απαιτούνται πρόσθετοι χάρτες για να προβάλετε τη σκίαση αναγλύφου στον χάρτη.</string>
+    <string name="slope_download_description">Απαιτούνται πρόσθετοι χάρτες για να προβάλετε τις κλίσεις στον χάρτη.</string>
+    <string name="slope_read_more">Μπορείτε να διαβάσετε περισσότερα για τις κλίσεις στο %1$s.</string>
+    <string name="shared_string_transparency">Διαφάνεια</string>
+    <string name="shared_string_zoom_levels">Επίπεδα εστίασης</string>
+    <string name="shared_string_legend">Υπόμνημα</string>
+    <string name="terrain_empty_state_text">Ενεργοποιήστε το για να προβάλετε σκίαση αναγλύφου ή χάρτη κλίσεων. Μπορείτε να διαβάσετε περισσότερα για αυτούς τους τύπους χάρτη στον ιστότοπό μας.</string>
+    <string name="shared_string_hillshade">Σκίαση ανάγλυφου</string>
+    <string name="import_complete_description">Εισήχθησαν όλα τα δεδομένα από το %1$s, μπορείτε να χρησιμοποιήσετε τα παρακάτω πλήκτρα για να ανοίξετε το απαιτούμενο τμήμα της εφαρμογής για να το διαχειριστείτε.</string>
+    <string name="shared_string_import_complete">Ολοκλήρωση εισαγωγής</string>
+    <string name="items_added">Προστέθηκαν στοιχεία</string>
+    <string name="checking_for_duplicate_description">Το OsmAnd ελέγχει το %1$s για διπλότυπα με υφιστάμενα στοιχεία στην εφαρμογή.
+\n
+\nΜπορεί να πάρει κάποιο χρόνο.</string>
+    <string name="shared_string_importing">Εισάγεται</string>
+    <string name="importing_from">Εισαγωγή δεδομένων από το %1$s</string>
+    <string name="profile_backup_failed">Αδυναμία δημιουργίας αντιγράφου κατατομής.</string>
+    <string name="saving_new_profile">Αποθήκευση νέας κατατομής (προφίλ)</string>
+    <string name="restore_all_profile_settings">Να επαναφερθούν όλες οι ρυθμίσεις κατατομών (προφίλ);</string>
+    <string name="restore_all_profile_settings_descr">Όλες οι ρυθμίσεις κατατομής (προφίλ) θα επαναφερθούν στην αρχική τους κατάσταση μετά τη δημιουργία/εισαγωγή αυτής της κατατομής.</string>
+    <string name="clear_recorded_data_warning">Είσαστε σίγουρος ότι θέλετε να καθαρίσετε τα καταγεγραμμένα δεδομένα;</string>
+    <string name="recalculate_route_in_deviation">Επανυπολογισμός διαδρομής σε περίπτωση απόκλισης</string>
+    <string name="select_distance_route_will_recalc">Επιλέξτε την απόσταση μετά την οποία η διαδρομή θα επανυπολογιστεί.</string>
+    <string name="recalculate_route_distance_promo">Η διαδρομή θα επανυπολογιστεί εάν η απόσταση από τη διαδρομή στην τρέχουσα θέση είναι μεγαλύτερη από την επιλεγμένη τιμή.</string>
+    <string name="n_items_of_z">%1$s από %2$s</string>
+    <string name="download_slope_maps">Πλαγιές</string>
+    <string name="quick_action_show_hide_terrain">Εμφάνιση / απόκρυψη εδάφους</string>
+    <string name="quick_action_terrain_hide">Απόκρυψη εδάφους</string>
+    <string name="quick_action_terrain_show">Εμφάνιση εδάφους</string>
+    <string name="quick_action_terrain_descr">Ένα πλήκτρο εμφάνισης ή απόκρυψης της στρώσης εδάφους στον χάρτη.</string>
+    <string name="delete_description">Διαγραφή περιγραφής</string>
+    <string name="add_description">Προσθήκη περιγραφής</string>
+    <string name="select_group">Επιλογή ομάδας</string>
+    <string name="select_shape">Επιλογή σχήματος</string>
+    <string name="shared_string_circle">Κύκλος</string>
+    <string name="shared_string_octagon">Οκτάγωνο</string>
+    <string name="shared_string_square">Τετράγωνο</string>
+    <string name="shared_string_min">Ελαχ</string>
+    <string name="ui_customization_description">Προσαρμογή της ποσότητας στοιχείων στον \"Σχεδιαστή\", \"Χάρτη διαμόρφωσης\" και \"Μενού περιβάλλοντος\".
+\n
+\nΑπενεργοποιήστε τα μη χρησιμοποιούμενα πρόσθετα για να αποκρύψετε όλα τα στοιχεία ελέγχου τους. %1$s.</string>
+    <string name="ui_customization_short_descr">Στοιχεία σχεδιαστή, μενού περιβάλλοντος</string>
+    <string name="ui_customization">Προσαρμογή UI</string>
+    <string name="shared_string_drawer">Σχεδιαστής</string>
+    <string name="context_menu_actions">Ενέργειες μενού περιβάλλοντος</string>
+    <string name="reorder_or_hide_from">Αναδιάταξη ή απόκρυψη στοιχείων από το %1$s.</string>
+    <string name="shared_string_divider">Διαχωριστικό</string>
+    <string name="divider_descr">Τα στοιχεία κάτω από αυτό το σημείο χωρίζονται με διαχωριστικό.</string>
+    <string name="shared_string_hidden">Κρυφά</string>
+    <string name="hidden_items_descr">Αυτά τα στοιχεία κρύβονται από το μενού, αλλά οι αντίστοιχες επιλογές ή πρόσθετα θα συνεχίσουν να δουλεύουν.</string>
+    <string name="reset_items_descr">Η απόκρυψη ρυθμίσεων τις επαναφέρει στην αρχική τους κατάσταση.</string>
+    <string name="main_actions_descr">Έχει μόνο τέσσερα πλήκτρα.</string>
+    <string name="main_actions">Κύριες ενέργειες</string>
+    <string name="additional_actions_descr">Μπορείτε να προσπελάσετε αυτές τις ενέργειες πατώντας το πλήκτρο “%1$s”.</string>
+    <string name="move_inside_category">Μπορείτε να μετακινήσετε στοιχεία μόνο μέσα σε αυτήν τη κατηγορία.</string>
+    <string name="developer_plugin">Πρόσθετο ανάπτυξης</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>
+    <string name="shared_string_items">Στοιχεία</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>
+    <string name="settings_item_import_error">Αδυναμία εισαγωγής από \'%1$s\'.</string>
+    <string name="select_track_file">Επιλέξτε αρχείο ίχνους</string>
+    <string name="shared_string_languages">Γλώσσες</string>
+    <string name="shared_string_language">Γλώσσα</string>
+    <string name="shared_string_all_languages">Όλες οι γλώσσες</string>
+    <string name="wiki_menu_download_descr">Απαιτούνται πρόσθετοι χάρτες για να προβάλετε τα ΣΕ της Wikipedia στον χάρτη.</string>
+    <string name="select_wikipedia_article_langs">Επιλέξτε τις γλώσσες για τα άρθρα Wikipedia στον χάρτη. Αλλάξτε σε οποιαδήποτε διαθέσιμη γλώσσα κατά την ανάγνωση του άρθρου.</string>
+    <string name="radius_ruler_item">Χάρακας ακτίνας</string>
 </resources>

OsmAnd/res/values-en-rGB/strings.xml

@@ -26,7 +26,7 @@
     <string name="add_group_descr">You can import groups from favourites or track waypoints.</string>
     <string name="empty_state_markers_groups_desc">You can import favourite groups or track waypoints as markers.</string>
     <string name="empty_state_favourites">Add Favourites</string>
-    <string name="empty_state_favourites_desc">Add favourites on the map or import them from a file.</string>
+    <string name="empty_state_favourites_desc">Import Favourites or add them by marking points on the map.</string>
     <string name="import_gpx_file_description">can be imported as Favourites points, or as track file.</string>
     <string name="import_as_favorites">Import as Favourites</string>
     <string name="search_favorites">Search favourites</string>
@@ -99,8 +99,10 @@
     <string name="quick_action_showhide_favorites_title">Show/hide favourites</string>
     <string name="quick_action_favorites_show">Show Favourites</string>
     <string name="quick_action_favorites_hide">Hide Favourites</string>
-    <string name="quick_action_category_descr">Select the category to save the favourite in.</string>
+    <string name="quick_action_category_descr">Category to save the Favourite in:</string>
     <string name="analyze_on_map">Analyse on map</string>
     <string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
     <string name="show_transparency_seekbar">Show transparency slider</string>
+    <string name="app_mode_camper">Camper</string>
+    <string name="osm_live_payment_discount_descr">Save %1$s</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -2419,7 +2419,7 @@
     <string name="nothing_found">Trovis nenion</string>
     <string name="nothing_found_descr">Ŝanĝu serĉpeton aŭ pliigu radiuson de serĉo.</string>
     <string name="private_access_routing_req">Via celo troviĝas en privata tereno. Ĉu permesi aliron al privataj vojoj por tiu ĉi kurso\?</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Strat-nivela fotaro</string>
     <string name="mapillary_widget">Mapillary-fenestraĵo</string>
     <string name="mapillary_widget_descr">Ebligas rapide kontribui al Mapillary.</string>
     <string name="mapillary_descr">Enretaj strat-nivelaj fotoj por ĉiuj. Esplori lokojn, kunlabori kaj foti la mondon.</string>
@@ -3852,4 +3852,7 @@
     <string name="threshold_distance">Sojla distanco</string>
     <string name="navigation_profile">Profilo de navigo</string>
     <string name="rourte_between_points_add_track_desc">Elektu dosieron de spuro al kiu nova segmento estos aldonita.</string>
+    <string name="street_level_imagery">Strat-nivela fotaro</string>
+    <string name="plan_route_exit_dialog_descr">Ĉu vi certe volas fermi planadon de kurso sen konservi\? Ĉiuj viaj ŝanĝoj perdiĝos.</string>
+    <string name="in_case_of_reverse_direction">Kiam en inversa direkto</string>
 </resources>

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

@@ -2424,7 +2424,7 @@
     <string name="nothing_found">Nada encontrado</string>
     <string name="nothing_found_descr">Cambiar la búsqueda o aumentar su radio.</string>
     <string name="private_access_routing_req">El destino se ubica en un área de acceso privado. ¿Permitir el uso de caminos privados para este viaje\?</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Imágenes a nivel de calle</string>
     <string name="mapillary_widget">Widget de Mapillary</string>
     <string name="mapillary_widget_descr">Permite realizar contribuciones rápidas a Mapillary.</string>
     <string name="mapillary_descr">Fotos a nivel de calle en línea para todos. Descubre sitios, colabora, captura el mundo.</string>
@@ -3857,4 +3857,7 @@
     <string name="threshold_distance">Distancia de umbral</string>
     <string name="navigation_profile">Perfil de navegación</string>
     <string name="rourte_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string>
+    <string name="street_level_imagery">Imágenes a nivel de calle</string>
+    <string name="plan_route_exit_dialog_descr">¿Cerrar el plan de ruta sin guardar\? Se perderán todos los cambios.</string>
+    <string name="in_case_of_reverse_direction">En caso de dirección inversa</string>
 </resources>

OsmAnd/res/values-eu/strings.xml

@@ -590,7 +590,7 @@
     <string name="show_more_map_detail_descr">Erakutsi bektore mapen xehetasun gehiago (bideak etab.) zoom maila baxuetan.</string>
     <string name="favourites_delete_multiple_succesful">Gogoko puntuak ezabatu dira.</string>
     <string name="favorite_delete_multiple">Ziur %1$d gogoko eta %2$d gogokoen talde ezabatu nahi dituzula\?</string>
-    <string name="favorite_home_category">Hasiera</string>
+    <string name="favorite_home_category">Etxea</string>
     <string name="favorite_friends_category">Lagunak</string>
     <string name="favorite_places_category">Lekuak</string>
     <string name="shared_string_name">Izena</string>
@@ -1772,7 +1772,7 @@ Lorratza %2$s</string>
     <string name="use_opengl_render">Erabili OpenGL marrazketa</string>
     <string name="use_opengl_render_descr">Erabili hardware bidez azkartutako OpenGL marrazketa (bateria gehiago erabili lezake, eta ez dabil gailu oso zaharretan).</string>
     <string name="error_avoid_specific_road">Ez da saihesbiderik aurkitu</string>
-    <string name="home_button">Hasiera</string>
+    <string name="home_button">Etxea</string>
     <string name="map_update">Eguneraketak eskuragarri %1$s mapentzako</string>
     <string name="search_for">Bilatu</string>
     <string name="coordinates">Koordenatuak</string>
@@ -2903,8 +2903,8 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="routeInfo_smoothness_name">Lausotasuna</string>
     <string name="routeInfo_steepness_name">Aldapa</string>
     <string name="add_home">Gehitu etxea</string>
-    <string name="add_work">Gehitu lana</string>
-    <string name="work_button">Lana</string>
+    <string name="add_work">Gehitu lantokia</string>
+    <string name="work_button">Lantokia</string>
     <string name="avoid_roads_descr">Hautatu saihestu nahi duzun bidea mapan edo beheko zerrendan:</string>
     <string name="quick_action_switch_day_night_descr">OsmAnd egun eta gau moduen artean txandakatzeko botoia.</string>
     <string name="use_osm_live_public_transport_description">Gaitu garraio publikoa OsmAnd Live aldaketetan.</string>
@@ -3484,7 +3484,7 @@ Area honi dagokio: %1$s x %2$s</string>
 \n
 \n• Ilunabarra / egunsentia datuak gehitu da maparen konfigurazioan
 \n
-\n• Hasiera/Lana ikonoak mapara gehitu dira
+\n• Etxea/Lantokia ikonoak mapara gehitu dira
 \n
 \n• Hainbat lerroko deskripzioa gehitzeko euskarria gehitu da ezarpenetan
 \n
@@ -3787,4 +3787,36 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_mapillary_hide">Ezkutatu Mapillary</string>
     <string name="quick_action_mapillary_show">Erakutsi Mapillary</string>
     <string name="shared_string_done">Egina</string>
+    <string name="quick_action_remove_next_destination">Ezabatu hurrengo norako puntua.</string>
+    <string name="use_volume_buttons_as_zoom">Bolumen botoiak zoom egiteko</string>
+    <string name="quick_action_remove_next_destination_descr">Uneko ibilbidearen norako puntua ezabatuko da. Ibilbidearen helmuga bada nabigazioa geldituko da.</string>
+    <string name="plugin_wikipedia_description">Eskuratu interesguneei buruzko Wikipediaren informazioa. Zure poltsikoko lineaz kanpoko gida da. Aski duzu Wikipediako plugina gaitu eta gozatu inguruko objektuen inguruko artikuluez.</string>
+    <string name="app_mode_enduro_motorcycle">Enduro motozikleta</string>
+    <string name="app_mode_wheelchair">Gurpil-aulkia</string>
+    <string name="app_mode_go_cart">Kart</string>
+    <string name="route_between_points">Puntuen arteko ibilbidea</string>
+    <string name="add_to_a_track">Gehitu arrasto batera</string>
+    <string name="select_track_width">Hautatu zabalera</string>
+    <string name="gpx_split_interval_none_descr">Hautatu zatiketa aukera: denboraren arabera edo distantziaren arabera.</string>
+    <string name="gpx_direction_arrows">Norabideko geziak</string>
+    <string name="plan_route_create_new_route">Sortu ibilbide berria</string>
+    <string name="threshold_distance">Distantzia margena</string>
+    <string name="rourte_between_points_warning_desc">Aukera hau erabiltzeko OsmAnd-ek zure arrastoak mapako errepideetara atxiki behar ditu.
+\n
+\nHurrengo urratsean, nabigazio profila hautatu beharko duzu baimendutako errepideak eta zure arrastoa errepideetara hurbiltzeko distantzia tartea atzemateko.</string>
+    <string name="plan_route_last_edited">Editatutako azkena</string>
+    <string name="plan_route_import_track">Inportatu arrastoa</string>
+    <string name="plan_route_open_existing_track">Ireki dagoen arrasto bat</string>
+    <string name="plan_route_select_track_file_for_open">Hautatu irekitzeko arrasto fitxategia</string>
+    <string name="overwrite_track">Gainidatzi arrastoa</string>
+    <string name="save_as_new_track">Gorde arrasto berri gisa</string>
+    <string name="reverse_route">Alderantzizko ibilbidea</string>
+    <string name="rourte_between_points_whole_track_button_desc">Arrasto osoa birkalkulatuko da hautatutako profilaren bidez.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Bakarrik hurrengo segmentua birkalkulatuko da hautatutako profilaren bidez.</string>
+    <string name="rourte_between_points_desc">Hautatu nola konektatu puntuak, lerro zuzen batez, edo kalkulatu horien arteko ibilbidea hautatutako profilarekin.</string>
+    <string name="whole_track">Arrasto osoa</string>
+    <string name="next_segment">Hurrengo segmentua</string>
+    <string name="navigation_profile">Nabigazio profila</string>
+    <string name="rourte_between_points_add_track_desc">Hautatu zein arrasto fitxategiari gehituko zaion segmentu berria.</string>
+    <string name="set_working_days_to_continue">Ezarri behar dituzu lanegunak jarraitzeko</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -722,7 +722,7 @@
     <string name="poi_landuse_railway">Zone ferroviaire</string>
     <string name="poi_village_green">Village green (GB)</string>
     <string name="poi_sailing">Navigation à voile</string>
-    <string name="poi_charity">Magasin caritatif</string>
+    <string name="poi_charity">Boutique caritative</string>
     <string name="poi_tomb">Sépulture</string>
     <string name="poi_wilderness_hut">Refuge de bivouac non gardé</string>
     <string name="poi_payment_terminal">Terminal de paiement</string>

OsmAnd/res/values-fr/strings.xml

@@ -87,7 +87,7 @@
     <string name="old_poi_file_should_be_deleted">Le fichier de points d\'intérêt \'%1$s\' est obsolète et peut être supprimé.</string>
     <string name="update_poi_file_not_found">Fichier local de gestion des modifications de points d\'intérêt introuvable, et ne peut être créé.</string>
     <string name="button_upgrade_osmandplus">Mettre à jour OsmAnd+</string>
-    <string name="map_version_changed_info">Téléchargez la nouvelle version de l\'application pour utiliser les nouvelle cartes.</string>
+    <string name="map_version_changed_info">Téléchargez la nouvelle version de l\'application pour utiliser les nouvelles cartes.</string>
     <string name="shared_string_rename">Renommer</string>
     <string name="poi_filter_nominatim">Recherche OSM en ligne</string>
     <string name="search_position_current_location_search">Recherche de la position…</string>
@@ -1121,7 +1121,7 @@
     <string name="shared_string_favorite">Favori</string>
     <string name="route_preferences">Préférences d\'itinéraire</string>
     <string name="route_info">Informations sur l\'itinéraire</string>
-    <string name="keep_and_add_destination_point">Ajouter comme destination suivante</string>
+    <string name="keep_and_add_destination_point">Ajouter comme destination</string>
     <string name="use_displayed_track_for_navigation">Souhaitez-vous suivre la trace affichée à l\'écran ?</string>
     <string name="gpx_option_calculate_first_last_segment">Calculer un itinéraire OsmAnd pour le début et la fin de l\'itinéraire</string>
     <string name="calculate_osmand_route_without_internet">Calcul de l\'itinéraire hors-ligne</string>
@@ -1373,7 +1373,7 @@
     <string name="use_opengl_render">Utiliser le rendu OpenGL</string>
     <string name="use_opengl_render_descr">Utiliser le rendu matériel accéléré OpenGL (peut consommer plus de batterie et ne pas fonctionner sur les anciens appareils).</string>
     <string name="everything_up_to_date">Tous les fichiers sont à jour</string>
-    <string name="shared_string_dismiss">Ignorer</string>
+    <string name="shared_string_dismiss">Arrêter</string>
     <string name="no_internet_connection">Téléchargement impossible, veuillez vérifier votre connexion Internet.</string>
     <string name="download_tab_downloads">Tous les téléchargements</string>
     <string name="download_tab_updates">Mises à jour</string>
@@ -2372,7 +2372,7 @@
     <string name="online_photos">Photos en ligne</string>
     <string name="no_photos_descr">Aucune photo pour ce lieu.</string>
     <string name="shared_string_install">Installer</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Photos des rues</string>
     <string name="open_mapillary">Ouvrir Mapillary</string>
     <string name="improve_coverage_mapillary">Améliorez la couverture photo avec Mapillary</string>
     <string name="improve_coverage_install_mapillary_desc">Installez Mapillary pour ajouter des photos à cet emplacement de la carte.</string>
@@ -2527,7 +2527,7 @@
     <string name="add_location_as_first_point_descr">Ajoutez votre position comme point de départ pour calculer l\'itinéraire.</string>
     <string name="my_location">Ma position</string>
     <string name="shared_string_finish">Terminer</string>
-    <string name="plan_route">Itinéraire planifié</string>
+    <string name="plan_route">Planifier un itinéraire</string>
     <string name="shared_string_sort">Trier</string>
     <string name="coordinate_input">Saisie des coordonnées</string>
     <string name="marker_save_as_track_descr">Exporter vos marques dans le fichier GPX suivant :</string>
@@ -2660,9 +2660,9 @@
     <string name="tunnel_warning">En approche d\'un tunnel</string>
     <string name="show_tunnels">Tunnels</string>
     <string name="shared_string_current">Actuelle</string>
-    <string name="last_intermediate_dest_description">Ajoute une étape</string>
-    <string name="first_intermediate_dest_description">Ajoute comme première étape</string>
-    <string name="subsequent_dest_description">Monter et définir comme Arrivée</string>
+    <string name="last_intermediate_dest_description">Ajouter comme dernière étape</string>
+    <string name="first_intermediate_dest_description">Ajouter comme première étape</string>
+    <string name="subsequent_dest_description">Ajouter comme arrivée (l\'arrivée précédente devient la dernière étape)</string>
     <string name="make_as_start_point">Utiliser ce point comme départ</string>
     <string name="map_import_error">Erreur d\'import de la carte</string>
     <string name="map_imported_successfully">Carte importée</string>
@@ -2911,7 +2911,7 @@
     <string name="sit_on_the_stop">Panneau d\'affichage à l\'arrêt</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Bouton affichant ou masquant les traces GPX sélectionnées sur la carte.</string>
     <string name="transfers_size">%1$d transferts</string>
-    <string name="add_start_and_end_points">Ajouter un point de départ et d\'arrivée</string>
+    <string name="add_start_and_end_points">Ajoutez un point de départ et d\'arrivée</string>
     <string name="route_add_start_point">Ajouter un point de départ</string>
     <string name="route_descr_select_start_point">Sélectionnez un point de départ</string>
     <string name="rendering_attr_surface_unpaved_name">Non revêtu</string>
@@ -3102,7 +3102,7 @@
     <string name="rendering_attr_tracktype_grade4_name">Principalement non-compact</string>
     <string name="rendering_attr_tracktype_grade5_name">Non-compact</string>
     <string name="routeInfo_tracktype_name">Dureté de la surface</string>
-    <string name="shared_string_file_is_saved">Gain de %s</string>
+    <string name="shared_string_file_is_saved">%s enregistré</string>
     <string name="shared_string_open_track">Ouvrir la trace</string>
     <string name="shared_string_track_is_saved">Trace %s enregistrée</string>
     <string name="shared_string_crash">Oups</string>
@@ -3446,7 +3446,7 @@
     <string name="multimedia_photo_play_sound">Son de la prise de vue</string>
     <string name="osm_authorization_success">L\'autorisation a été accordée</string>
     <string name="search_offline_geo_error">Impossible d\'analyser le geo intent \'%s\'.</string>
-    <string name="monitoring_min_speed_descr">Filtre interrompant l\'enregistrement en dessous d\'une certaines vitesse. Rend les traces enregistrées plus régulières lorsqu\'elles sont affichées sur la carte.</string>
+    <string name="monitoring_min_speed_descr">Filtre interrompant l\'enregistrement en dessous d\'une certaine vitesse. Rend les traces enregistrées plus régulières lorsqu\'elles sont affichées sur la carte.</string>
     <string name="live_monitoring_time_buffer">Durée de la mémoire tampon</string>
     <string name="live_monitoring_adress_descr">Indiquez l\'adresse web avec la syntaxe suivante pour les paramètres : lat = {0}, lon = {1}, horodatage = {2}, hdop = {3}, altitude = {4}, vitesse = {5}, direction = {6}.</string>
     <string name="monitoring_min_accuracy_descr_recommendation">Recommandation : il est difficile de prédire ce qui sera enregistré et ce qui ne le sera pas, il peut être préférable de désactiver ce filtre.</string>
@@ -3834,4 +3834,7 @@
     <string name="next_segment">Segment suivant</string>
     <string name="threshold_distance">Seuil de distance</string>
     <string name="navigation_profile">Profil de navigation</string>
+    <string name="street_level_imagery">Photos des rues</string>
+    <string name="plan_route_exit_dialog_descr">Voulez-vous vraiment fermer l\'itinéraire planifié sans enregistrer \? Vous perdrez toutes les modifications.</string>
+    <string name="in_case_of_reverse_direction">Si inversion du sens</string>
 </resources>

OsmAnd/res/values-iw/strings.xml

@@ -1127,7 +1127,7 @@
     <string name="mapillary_widget">וידג׳ט Mapillary</string>
     <string name="mapillary_widget_descr">מאפשר תרומה במהירות ל־Mapillary.</string>
     <string name="mapillary_descr">תמונות מקוונות ברמת רחוב לכולם. היכרות עם מקומות חדשים, שיתוף פעולה וצילום העולם.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">תמונות ברמת רחוב</string>
     <string name="plugin_mapillary_descr">תמונות ברמת הרחוב לכולם. להכיר מקומות, לשתף פעולה ולצלם את העולם.</string>
     <string name="private_access_routing_req">היעד שלך ממוקם באיזור עם גישה פרטית. לאשר שימוש בכבישים פרטיים לצורך טיול זה\?</string>
     <string name="restart_search">חיפוש מחדש</string>
@@ -3854,4 +3854,13 @@
     <string name="threshold_distance">סף מרחק</string>
     <string name="navigation_profile">פרופיל ניווט</string>
     <string name="rourte_between_points_add_track_desc">נא לבחור קובץ מסלול שבו יתווסף המקטע החדש.</string>
+    <string name="rourte_between_points_whole_track_button_desc">כל המסלול יחושב מחדש באמצעות הפרופיל הנבחר.</string>
+    <string name="rourte_between_points_next_segment_button_desc">רק המקטע הבא יחושב מחודש באמצעות הפרופיל הנבחר.</string>
+    <string name="rourte_between_points_desc">נא לבחור כיצד לחבר נקודות, בקו ישר, או לחבר מסלול ביניהן עם הפרופיל הנבחר.</string>
+    <string name="rourte_between_points_warning_desc">כדי להשתמש באפשרות זו על OsmAnd להצמיד את המסלול שלך לדרכים שעל המפה.
+\n
+\n בשלב הבא יהיה עליך לבחור בפרופיל ניווט כדי לזהות את הדרכים המורשות ואת סף המרחק כדי להעריך את המסלול שלך ביחס לדרכים.</string>
+    <string name="street_level_imagery">תמונות ברמת רחוב</string>
+    <string name="plan_route_exit_dialog_descr">לסגור את תכנון המסלול בלי לשמור\? כל השינויים שלך יאבדו.</string>
+    <string name="in_case_of_reverse_direction">במקרה של כיוון הפוך</string>
 </resources>

OsmAnd/res/values-ja/strings.xml

@@ -1355,7 +1355,7 @@ POIの更新は利用できません</string>
     <string name="fav_point_dublicate_message">そのお気に入りは、重複を避けるために%1$sという名前に変更されました。</string>
     <string name="text_size_descr">マップ上の文字サイズを設定します。</string>
     <string name="text_size">文字サイズ</string>
-    <string name="rendering_attr_tramTrainRoutes_name">路面電車と鉄道の路線</string>
+    <string name="rendering_attr_tramTrainRoutes_name">路面電車＆鉄道路線</string>
     <string name="lock_screen_request_explanation">省電力機能で画面をオフにするには%1$s の権限が必要です。</string>
     <string name="wake_on_voice">画面の電源オン設定</string>
     <string name="wake_on_voice_descr">方向転換地点に近づいたらデバイスの画面を(オフの場合指定時間)オンにします</string>
@@ -3683,7 +3683,7 @@ POIの更新は利用できません</string>
     <string name="hillshade_download_description">マップ上で起伏の陰影表示をするには、追加マップが必要です。</string>
     <string name="shared_string_drawer">ドロワーメニュー</string>
     <string name="shared_string_octagon">八角形</string>
-    <string name="context_menu_actions">コンテキストメニューアクション</string>
+    <string name="context_menu_actions">コンテキストメニュー</string>
     <string name="reorder_or_hide_from">項目の並べ替えや非表示するものを指定できます。</string>
     <string name="shared_string_divider">分割</string>
     <string name="divider_descr">分割線で区切られた部分より下にある項目が適用されます。</string>
@@ -3724,4 +3724,17 @@ POIの更新は利用できません</string>
     <string name="lang_gu">グジャラート語</string>
     <string name="lang_cv">チュヴァシ語</string>
     <string name="gpx_parse_error">OsmAnd GPXの形式が正しくありません。サポートチームに連絡しての調査をおすすめします</string>
+    <string name="screen_timeout">画面のタイムアウト</string>
+    <string name="turn_screen_on_descr">画面復帰オプションを選択します(端末設定でロックされる場合は、OsmAndがバックグラウンド動作でないことを確認してください):</string>
+    <string name="system_screen_timeout_descr">端末側の画面オフ(省電力)設定に従って画面を消灯します。</string>
+    <string name="system_screen_timeout">端末側の画面オフ設定を使用</string>
+    <string name="turn_screen_on_wake_time_descr">画面がオンになった後からオフまでの時間を指定します。(\"%1$s\"有効時は適用されません)</string>
+    <string name="keep_screen_on">画面を常に表示</string>
+    <string name="turn_screen_on_proximity_sensor">近接センサー</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="use_volume_buttons_as_zoom_descr">端末の音量ボタンでマップのズームレベルを変更できるようにします。</string>
+    <string name="use_volume_buttons_as_zoom">音量ボタンでズーム</string>
 </resources>

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

@@ -2063,7 +2063,7 @@
     <string name="mapillary_widget">Ferramenta Mapillary</string>
     <string name="mapillary_widget_descr">Permite contribuições rápidas ao Mapillary.</string>
     <string name="mapillary_descr">Fotos ao nível da rua, online, para todos. Descobrir lugares, colaborar, capturar o mundo.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Imagens de rua</string>
     <string name="plugin_mapillary_descr">Fotos ao nível da rua para todos. Descubra lugares, colabore, capture o mundo.</string>
     <string name="private_access_routing_req">Seu destino está localizado numa área de acesso privado. Permitir uso de vias privadas para esta viagem\?</string>
     <string name="restart_search">Reiniciar pesquisa</string>
@@ -3883,4 +3883,7 @@
     <string name="threshold_distance">Distância limite</string>
     <string name="navigation_profile">Perfil de navegação</string>
     <string name="rourte_between_points_add_track_desc">Selecione um arquivo de trilha para o qual um novo segmento será adicionado.</string>
+    <string name="street_level_imagery">Imagens de rua</string>
+    <string name="plan_route_exit_dialog_descr">Tem certeza de que deseja fechar plano de rota sem salvar\? Você perderá todas as alterações.</string>
+    <string name="in_case_of_reverse_direction">Em caso de direção reversa</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -917,8 +917,7 @@
     <string name="index_srtm_ele">Curvas de nível</string>
     <string name="recording_photo_description">Foto %1$s de %2$s</string>
     <string name="av_def_action_picture">Capture uma foto</string>
-    <string name="osmand_srtm_long_description_1000_chars">Este suplemento disponibiliza \'Curvas de Nível\' e \'Sombras de relevo\', que podem ser aplicadas nos mapas padrão do OsmAnd.
-\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes e qualquer pessoa interessada na informação de relevo de uma paisagem.
+    <string name="osmand_srtm_long_description_1000_chars">Este suplemento disponibiliza \'Curvas de Nível\' e \'Sombras de relevo\', que podem ser aplicadas nos mapas padrão do OsmAnd. Estas funcionalidades podem ser apreciadas por atletas, caminhantes e qualquer pessoa interessada na informação de relevo de uma paisagem.
 \n
 \n Os dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems).</string>
     <string name="srtm_plugin_description">Este suplemento disponibiliza \'Curvas de Nível\' e \'Sombras de relevo\', que podem ser aplicadas nos mapas padrão do OsmAnd. Estas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.
@@ -1065,7 +1064,6 @@
 \n - Recurso Wikipédia desligado da Internet (descarregamento de POIs da Wikipédia), ótimo para passeios turísticos.
 \n - Possibilidade de sobreposição de várias camadas de mapas, como trilhos GPX ou navegação, pontos de Interesse, favoritos, curvas de nível, paragens de transporte público, mapas adicionais com transparência personalizável.
 \n
-\n
 \n - Pesquisa desligado da Internet para endereços e locais (POIs).
 \n - Encaminhamento desligado da Internet para distâncias médias.
 \n - Modos de carro, bicicleta e pedestre com os opcionais:
@@ -1250,7 +1248,7 @@
     <string name="traffic_warning_border_control">Posto alfandegário</string>
     <string name="traffic_warning_payment">Portagem</string>
     <string name="traffic_warning_stop">Sinal de stop</string>
-    <string name="traffic_warning_calming">Choque de velocidade</string>
+    <string name="traffic_warning_calming">Moderação de trafego</string>
     <string name="traffic_warning_speed_camera">Radar de velocidade</string>
     <string name="traffic_warning">Aviso de tráfego</string>
     <string name="speak_favorites">Favoritos pertos</string>
@@ -1921,7 +1919,7 @@
     <string name="mapillary_widget">Widget Mapillary</string>
     <string name="mapillary_widget_descr">Permite contribuir rapidamente para Mapillary.</string>
     <string name="mapillary_descr">Fotos on-line ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Imagens de nível de rua</string>
     <string name="plugin_mapillary_descr">Fotos ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
     <string name="private_access_routing_req">O seu destino está localizado numa área de acesso privado. Permitir uso de estradas privadas para esta viagem\?</string>
     <string name="restart_search">Reiniciar pesquisa</string>
@@ -3382,7 +3380,7 @@
     <string name="edit_profiles_descr">Perfis padrão do OsmAnd não podem ser apagados, mas desativados (na tela anterior) ou classificados na parte inferior.</string>
     <string name="edit_profiles">Editar perfis</string>
     <string name="select_nav_profile_dialog_message">O \'Tipo de navegação\' controla como as rotas são calculadas.</string>
-    <string name="profile_appearance">Aspecto do perfil</string>
+    <string name="profile_appearance">Aspeto do perfil</string>
     <string name="layer_osm_edits">Edições OSM</string>
     <string name="quick_action_contour_lines_descr">Botão que mostra ou oculta curvas de nível no mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar curvas de nível</string>
@@ -3846,4 +3844,17 @@
     <string name="plan_route_create_new_route">Criar rota</string>
     <string name="shared_string_done">Pronto</string>
     <string name="overwrite_track">Sobrescrever trilho</string>
+    <string name="save_as_new_track">Gravar como novo trilho</string>
+    <string name="reverse_route">Rota inversa</string>
+    <string name="rourte_between_points_whole_track_button_desc">O trilho inteiro será recalculado a usar o perfil selecionado.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Somente o próximo segmento será recalculado a usar o perfil selecionado.</string>
+    <string name="rourte_between_points_desc">Selecione como ligar pontos, com uma linha reta ou calcule uma rota entre eles com o perfil selecionado.</string>
+    <string name="whole_track">Trilho inteiro</string>
+    <string name="next_segment">Próximo segmento</string>
+    <string name="rourte_between_points_warning_desc">Para usar esta opção o OsmAnd precisa de encaixar o seu trilho nas estradas do mapa.
+\n
+\n No passo seguinte, terá de selecionar o perfil de navegação para detetar estradas permitidas e a distância limiar para se aproximar do seu trilho com as estradas.</string>
+    <string name="threshold_distance">Distância limiar</string>
+    <string name="navigation_profile">Perfil de navegação</string>
+    <string name="rourte_between_points_add_track_desc">Selecione um ficheiro de faixa para o qual um novo segmento será adicionado.</string>
 </resources>

OsmAnd/res/values-ro/strings.xml

@@ -58,7 +58,7 @@
 	</string>
     <string name="filterpoi_activity">Creează filtru POI</string>
     <string name="recalculate_route_to_your_location">Mod de transport:</string>
-    <string name="select_navigation_mode">Selectează modul de transport</string>
+    <string name="select_navigation_mode">Mod transport:</string>
     <string name="day_night_info_description">Răsărit : %1$s \nApus : %2$s</string>
     <string name="day_night_info">Info zi/noapte</string>
     <string name="map_widget_vector_attributes">Atribute randare</string>
@@ -99,12 +99,12 @@
     <string name="show_cameras">Arată camerele radar</string>
     <string name="show_traffic_warnings">Arată atenționări de trafic</string>
     <string name="avoid_toll_roads">Evită drumuri cu taxă</string>
-    <string name="continue_follow_previous_route_auto">"Navigarea anterioară nu s-a încheiat. Doriți s-o continuați (implicit \'Da\')?  (%1$s seconds)"</string>
+    <string name="continue_follow_previous_route_auto">Continuați să urmați navigarea anterioară neterminată\? (%1$s seconds)</string>
     <string name="route_updated_loc_found">Ruta va fi calculată când se va stabili poziția curentă</string>
     <string name="osmand_parking_hours">Ore</string>
     <string name="osmand_parking_minutes">Minute</string>
-    <string name="osmand_parking_position_description_add_time">Mașina a fost parcată la:</string>
-    <string name="select_animate_speedup">Selecție accelerare simulare rută</string>
+    <string name="osmand_parking_position_description_add_time">Mașina este parcată la</string>
+    <string name="select_animate_speedup">Viteză simulare rută:</string>
     <string name="global_app_allocated_memory_descr">Memorie alocată %1$s MB (limita Android %2$s MB, Dalvik %3$s MB).</string>
     <string name="global_app_allocated_memory">Memorie alocată</string>
     <string name="native_app_allocated_memory_descr">Total memorie nativă alocată de aplicație %1$s MB (Dalvik %2$s MB, other %3$s MB).
@@ -150,7 +150,7 @@
     <string name="rendering_attr_hmRendered_description">Crește nivelul de detalii ale hărții</string>
     <string name="rendering_attr_hmRendered_name">Mai multe detalii pe hartă</string>
     <string name="local_index_routing_data">Date despre rutare</string>
-    <string name="navigate_point_format">Format:</string>
+    <string name="navigate_point_format">Format</string>
     <string name="poi_search_desc">Caută POI (Puncte de Interes)</string>
     <string name="address_search_desc">Căutare adresă</string>
     <string name="navpoint_search_desc">Coordonate</string>
@@ -183,7 +183,7 @@
     <string name="prefs_plugins">Manager de plugin-uri</string>
     <string name="osm_editing_plugin_description">Arată setările necesare pentru colectarea/modificarea de date openstreetmaps.org (POI, bug-uri, trasee) - necesită specificarea datelor de acces la OSM.</string>
     <string name="vector_maps_may_display_faster_on_some_devices">Hărțile vectoriale se afișează mai rapid de regulă. Posibil să nu funcționeze bine pe anumite dispozitive.</string>
-    <string name="play_commands_of_currently_selected_voice">Exemple de comenzi ale vocii selectate</string>
+    <string name="play_commands_of_currently_selected_voice">Selectează o voce și testează redând anunțuri:</string>
     <string name="debugging_and_development">Dezvoltare OsmAnd</string>
     <string name="native_rendering">Randare nativă</string>
     <string name="test_voice_prompts">Testare instrucțiuni vocale</string>
@@ -329,7 +329,7 @@
     <string name="file_can_not_be_renamed">Fișierul nu poate fi redenumit.</string>
     <string name="file_with_name_already_exists">Există un fișier cu același nume.</string>
     <string name="shared_string_gpx_route">Rută GPX</string>
-    <string name="poi_query_by_name_matches_categories">Au foste găsite câteva categorii de POI care satisfac condițiile:</string>
+    <string name="poi_query_by_name_matches_categories">Au fost găsite câteva categorii asemănătoare de POI.</string>
     <string name="data_to_search_poi_not_available">Nu există date offline salvate pentru efectuarea căutării.</string>
     <string name="poi_filter_by_name">Căutare după nume</string>
     <string name="old_poi_file_should_be_deleted">Fișierul de date POI \'%1$s\' este redundant și poate fi șters.</string>
@@ -389,7 +389,7 @@
     <string name="local_indexes_cat_poi">Date despre POI</string>
     <string name="ttsvoice">Voce TTS</string>
     <string name="search_offline_clear_search">Căutare nouă</string>
-    <string name="map_text_size_descr">Selecția mărimii textului pentru denumirile afișate pe hartă</string>
+    <string name="map_text_size_descr">Mărimea textului pentru denumirile afișate pe hartă:</string>
     <string name="map_text_size">Mărime font hartă</string>
     <string name="trace_rendering">Info depanare randare</string>
     <string name="trace_rendering_descr">Afișare date despre performanțele procesului de randare</string>
@@ -549,7 +549,7 @@
     <string name="rotate_map_compass_opt">Către direcție busolă</string>
     <string name="rotate_map_bearing_opt">În direcția deplasării</string>
     <string name="rotate_map_none_opt">Nord întotdeauna sus</string>
-    <string name="rotate_map_to_bearing_descr">Aliniere hartă la ecran</string>
+    <string name="rotate_map_to_bearing_descr">Aliniere hartă:</string>
     <string name="rotate_map_to_bearing">Orientare hartă</string>
     <string name="show_route">Detalii rută</string>
     <string name="fav_imported_sucessfully">Puncte favorite importate cu succes</string>
@@ -581,9 +581,9 @@
     <string name="gps_provider">GPS</string>
     <string name="int_seconds">secunde</string>
     <string name="int_min">min.</string>
-    <string name="background_service_int_descr">Alegeți intervalul de timp pentru menținerea activă a serviciilor folosite în fundal</string>
+    <string name="background_service_int_descr">Intervalul de timp pentru menținerea activă a serviciilor folosite în fundal:</string>
     <string name="background_service_int">Interval menținere activă GPS</string>
-    <string name="background_service_provider_descr">Alege furnizorul serviciului de localizare pe timpul navigării în fundal</string>
+    <string name="background_service_provider_descr">Metodă localizare folosită de serviciul în fundal:</string>
     <string name="background_service_provider">Furnizorul serviciului de localizare</string>
     <string name="background_router_service_descr">Rulează OsmAnd în fundal pentru determinarea poziției în timp ce ecranul este oprit</string>
     <string name="background_router_service">Rulează în fundal</string>
@@ -699,7 +699,7 @@
     <string name="empty_route_calculated">Eroare: ruta calculată este vidă</string>
     <string name="new_route_calculated_dist">O nouă rută a fost calculată, distanța</string>
     <string name="arrived_at_destination">Ați ajuns la destinație</string>
-    <string name="invalid_locations">Coordonatele nu sunt valide!</string>
+    <string name="invalid_locations">Coordonate invalide</string>
     <string name="go_back_to_osmand">Înapoi la harta OsmAnd</string>
     <string name="shared_string_close">Închideți</string>
     <string name="loading_data">Se încarcă date…</string>
@@ -794,7 +794,7 @@
     <string name="osb_comment_dialog_message">Mesaj</string>
     <string name="osb_comment_dialog_author">Nume autor</string>
     <string name="osb_comment_dialog_success">Comentariu adăugat</string>
-    <string name="osb_comment_dialog_error">Nu s-a putut adăuga comentariul</string>
+    <string name="osb_comment_dialog_error">Nu s-a putut adăuga comentariul.</string>
     <string name="poi_edit_title">Editare POI</string>
     <string name="poi_create_title">Creează POI</string>
     <string name="poi_error_poi_not_found">POI-ul nu poate fi găsit sau punctul de interes nu este singular</string>
@@ -825,7 +825,7 @@
     <string name="native_library_not_running">Aplicația rulează în safe mode (se poate dezactiva de la Setări).</string>
     <string name="rendering_attr_showRoadMaps_description">Specificați când anume să fie afișate hărțile exclusiv cu drumuri:</string>
     <string name="rendering_attr_showRoadMaps_name">Hărți doar pentru drumuri</string>
-    <string name="download_roads_only_item">"Drumuri "</string>
+    <string name="download_roads_only_item">Doar drumuri</string>
     <string name="download_regular_maps">Hărți complete</string>
     <string name="download_roads_only_maps">Hărți exclusiv drumuri</string>
     <string name="incomplete_locale">incomplet</string>
@@ -868,11 +868,11 @@
     <string name="srtm_paid_version_title">Plugin linii de nivel</string>
     <string name="av_def_action_video">Înregistrare video</string>
     <string name="av_def_action_audio">Înregistrare audio</string>
-    <string name="av_widget_action_descr">Selectați acțiunea implicită a iconiței</string>
+    <string name="av_widget_action_descr">Acțiune implicită a iconiței:</string>
     <string name="av_widget_action">Acțiune implicită iconiță</string>
-    <string name="av_video_format_descr">Selectați formatul video</string>
+    <string name="av_video_format_descr">Format ieșire video:</string>
     <string name="av_video_format">Format video</string>
-    <string name="av_use_external_recorder_descr">Folosește aplicația sistemului pt înregistrare video</string>
+    <string name="av_use_external_recorder_descr">Folosește aplicația sistemului pt înregistrare video.</string>
     <string name="av_use_external_recorder">Folosește aplicație externă pentru înregistrare</string>
     <string name="av_settings_descr">Configurarea setărilor audio și video</string>
     <string name="av_settings">Setări audio/video </string>
@@ -888,7 +888,7 @@
     <string name="routing_attr_avoid_toll_name">Evită drumurile cu taxă</string>
     <string name="routing_attr_avoid_toll_description">Evită drumurile cu taxă</string>
     <string name="routing_attr_avoid_unpaved_name">Evită drumurile neasfaltate</string>
-    <string name="routing_attr_avoid_unpaved_description">Evită drumurile neasfaltate.</string>
+    <string name="routing_attr_avoid_unpaved_description">Evită drumurile neasfaltate</string>
     <string name="routing_attr_avoid_ferries_name">Evită feriboturile</string>
     <string name="routing_attr_avoid_ferries_description">Evită feriboturile</string>
     <string name="routing_attr_avoid_motorway_name">Evită autostrăzile</string>
@@ -995,7 +995,7 @@
     <string name="shared_string_map">Hartă</string>
     <string name="prefer_motorways">Preferă autostrăzi</string>
     <string name="prefer_in_routing_title">Preferă…</string>
-    <string name="prefer_in_routing_descr">Preferă autostrăzi</string>
+    <string name="prefer_in_routing_descr">Preferă autostrăzi.</string>
     <string name="max_speed_none">nici una</string>
     <string name="index_name_openmaps">OpenMaps EU</string>
     <string name="local_indexes_cat_srtm">Date linii de contur</string>
@@ -1111,7 +1111,7 @@
     <string name="gpx_selection_segment_title">Segment</string>
     <string name="record_plugin_description">Salvează înregistrările cu o singură atingere a ecranului. Arată setările pentru înregistrarea traseelor și stocarea locală în fișiere GPX folosind un serviciu web.</string>
     <string name="av_camera_focus">Tip de focalizare al camerei</string>
-    <string name="av_camera_focus_descr">Selectați modul de focalizare al camerei interne.</string>
+    <string name="av_camera_focus_descr">Mod focalizare cameră:</string>
     <string name="av_camera_focus_auto">Auto focalizare</string>
     <string name="av_camera_focus_hiperfocal">Focalizare hiperfocală</string>
     <string name="av_camera_focus_infinity">Focalizarea este setata la infinit</string>
@@ -1206,8 +1206,8 @@
     <string name="gpx_file_is_empty">Fișier GPX gol</string>
     <string name="shared_string_tracks">Traseele mele</string>
     <string name="navigation_intent_invalid">Format invalid: %s</string>
-    <string name="osb_author_dialog_password">"Parolă OSM  (opţional)"</string>
-    <string name="shared_string_downloading">Se descarcă</string>
+    <string name="osb_author_dialog_password">Parolă OSM (opţională)</string>
+    <string name="shared_string_downloading">Se descarcă…</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlas rutier german</string>
     <string name="version_settings">Versiuni</string>
     <string name="rendering_attr_tramRoutes_name">Rute tramvai</string>
@@ -1366,9 +1366,9 @@
     <string name="osn_reopen_dialog_title">Redeschide nota</string>
     <string name="osn_close_dialog_title">Închideți nota</string>
     <string name="osn_add_dialog_success">Notă creată</string>
-    <string name="osn_add_dialog_error">Nu s-a putut crea nota</string>
+    <string name="osn_add_dialog_error">Nu s-a putut crea nota.</string>
     <string name="osn_close_dialog_success">Notă închisă</string>
-    <string name="osn_close_dialog_error">Nota nu a putut fi închisă</string>
+    <string name="osn_close_dialog_error">Nota nu a putut fi închisă.</string>
     <string name="shared_string_commit">Comite</string>
     <string name="context_menu_item_delete_waypoint">Ștergi punctul de referință GPX?</string>
     <string name="context_menu_item_edit_waypoint">Editează punctul de referință GPX</string>
@@ -1678,7 +1678,7 @@
     <string name="notes_by_date">Note după dată</string>
     <string name="by_date">După dată</string>
     <string name="by_type">După tip</string>
-    <string name="looking_for_tracks_with_waypoints">"Se caută  trasee cu puncte intermediare"</string>
+    <string name="looking_for_tracks_with_waypoints">Se caută trasee cu puncte intermediare</string>
     <string name="shared_string_more_without_dots">Mai mult</string>
     <string name="appearance_on_the_map">Aspectul pe hartă</string>
     <string name="add_track_to_markers_descr">Selectați un traseu pentru a-i adăuga un punct intermediar la marcaje.</string>
@@ -1723,7 +1723,7 @@
     <string name="route_is_calculated">Ruta a fost calculată</string>
     <string name="round_trip">Dus-întors</string>
     <string name="plan_route_no_markers_toast">Trebuie sa adăugați cel puțin un marcaj pentru a utilza această funcție.</string>
-    <string name="osn_modify_dialog_error">Nu s-a putut modifica nota</string>
+    <string name="osn_modify_dialog_error">Nu s-a putut modifica nota.</string>
     <string name="osn_modify_dialog_title">Modifică nota</string>
     <string name="context_menu_item_modify_note">Modifică nota OMS</string>
     <string name="make_round_trip_descr">Copiază punctul de pornire ca destinație.</string>
@@ -1778,7 +1778,7 @@
     <string name="mapillary_menu_title_dates">Dată</string>
     <string name="mapillary_menu_edit_text_hint">Scrie nume utilizator</string>
     <string name="mapillary_menu_descr_username">Vedeți doar imaginile adaugate de</string>
-    <string name="mapillary_menu_filter_description">"Filtrați imaginile după utilizator,  după dată sau după tip. Active doar pentru zoom apropiat."</string>
+    <string name="mapillary_menu_filter_description">Filtrați imaginile după utilizator, după dată sau după tip. Active doar pentru zoom apropiat.</string>
     <string name="import_gpx_failed_descr">Osmand nu poate importa fișierul. Vă rugăm să verificați dacă OsmAnd are permisiuni de citire din această locație.</string>
     <string name="distance_moving">Distanța corectată</string>
     <string name="mapillary_image">Imagine Mapillary</string>
@@ -1835,7 +1835,7 @@
     <string name="restore_purchases">Restaurare cumpărături</string>
     <string name="fonts_header">Fonturi hartă</string>
     <string name="right_side_navigation">Conducere pe dreapta</string>
-    <string name="driving_region_automatic">Automatic</string>
+    <string name="driving_region_automatic">Automat</string>
     <string name="do_not_send_anonymous_app_usage">Nu trimite statistici de utilizare anonime ale aplicației</string>
     <string name="do_not_send_anonymous_app_usage_desc">OsmAnd colectează informații despre părțile din aplicatie folosite. Locația dumneavoastră și datele introduse în aplicație nu vor fi niciodată trimise, sau detalii despre zona în care vă aflați, căutari sau descărcări.</string>
     <string name="do_not_show_startup_messages">Nu arăta mesaje la pornire</string>
@@ -2305,7 +2305,7 @@
     <string name="searching_gps">Căutare GPS</string>
     <string name="rate_dialog_descr">Acordați-ne 30 de secunde, trimiteți părerea dvs. și evaluați munca noastră pe Google Play.</string>
     <string name="shared_string_privacy_policy">Politica de confidențialitate</string>
-    <string name="help_us_make_osmand_better">Ajutați-ne să facem OsmAnd mai bun!</string>
+    <string name="help_us_make_osmand_better">Ajutați-ne să facem OsmAnd mai bun</string>
     <string name="choose_data_to_share">Alegeți ce tip de date doriți să partajați:</string>
     <string name="downloaded_maps">Hărți descărcate</string>
     <string name="visited_screens">Ecrane vizitate</string>
@@ -2335,7 +2335,7 @@
     <string name="profile_type_base_string">Profil de bază</string>
     <string name="profile_alert_need_routing_type_title">Selectați tipul navigației</string>
     <string name="profile_alert_need_profile_name_title">Introduceți numele profilului</string>
-    <string name="profile_alert_need_profile_name_msg">Numele profilului nu trebuie să fie gol!</string>
+    <string name="profile_alert_need_profile_name_msg">Trebuie să specificați mai întâi un nume de profil.</string>
     <string name="profile_alert_duplicate_name_title">Nume deja existent</string>
     <string name="profile_alert_duplicate_name_msg">Există deja un profil cu un astfel de nume</string>
     <string name="profile_alert_cant_delete_base">Nu puteți șterge profile de bază OsmAnd</string>
@@ -2369,12 +2369,12 @@
     <string name="arrival_distance_descr">Cât de repede vrei să se anunțe sosirea\?</string>
     <string name="press_again_to_change_the_map_orientation">Apăsați din nou pentru a schimba orientarea hărții</string>
     <string name="shared_string_min_speed">Viteza min.</string>
-    <string name="shared_string_max_speed">Viteza max.</string>
+    <string name="shared_string_max_speed">Viteză max.</string>
     <string name="default_speed_setting_title">Viteză implicită</string>
     <string name="default_speed_setting_descr">Modificați setările de viteză implicită</string>
     <string name="minmax_speed_dialog_title">Setați viteza min/max</string>
     <string name="new_profile">Profil nou</string>
-    <string name="apply_preference_to_all_profiles">Poţi aplica aceasta modificare pe toate profilele sau doar pe cel selectat</string>
+    <string name="apply_preference_to_all_profiles">Poţi aplica aceasta modificare pe toate profilele sau doar pe cel selectat.</string>
     <string name="shared_preference">Partajat</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Prefer drumurile nepavate</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefer drumurile nepavate</string>
@@ -2390,12 +2390,12 @@
     <string name="tts_initialization_error">Motorul text-to-speech nu porneste.</string>
     <string name="export_profile">Exportă profilul</string>
     <string name="exported_osmand_profile">Profil osmand exportat %1$s</string>
-    <string name="overwrite_profile_q">Profil \'%1$s\' deja existent, îl rescrii\?</string>
+    <string name="overwrite_profile_q">\'%1$s\' există deja. Îl suprascriu\?</string>
     <string name="export_profile_failed">Profilul nu se poate exporta.</string>
-    <string name="profile_import">Importare de profil:</string>
+    <string name="profile_import">Importare profil</string>
     <string name="profile_import_descr">Pentru a importa profilul, selectați fișierul din dispozitiv, și deschideți-l cu OsmAnd.</string>
     <string name="file_import_error">%1$s Eroare de incarcare al fisierului. %1$s: %2$s</string>
-    <string name="file_imported_successfully">%1$s Incarcat cu succes.</string>
+    <string name="file_imported_successfully">%1$s importat.</string>
     <string name="rendering_value_white_name">Alb</string>
     <string name="route_start_point">Punct de plecare</string>
     <string name="unirs_render_descr">Modifica stilul implicit pentru a crește contrastul dintre drumurile pietonale și biciclete. Utilizează culori Mapnik.</string>
@@ -2427,7 +2427,7 @@
     <string name="change_osmand_data_folder_question">Schimbați dosarul de date ale OsmAnd\?</string>
     <string name="move_maps_to_new_destination">Mută la noua destinație</string>
     <string name="internal_app_storage_description">Stocare internă, ascunsă de utilizator și alte aplicații, accesibilă exclusiv pentru OsmAnd</string>
-    <string name="change_data_storage_folder">Schimbați folderul de stocare a datelor</string>
+    <string name="change_data_storage_folder">Schimbați folderul de stocare</string>
     <string name="rendering_attr_piste_type_snow_park_name">Parc</string>
     <string name="rendering_attr_piste_type_sleigh_name">Sanie</string>
     <string name="rendering_attr_piste_type_sled_name">Sanie</string>
@@ -2640,16 +2640,16 @@
     <string name="voice_announces_descr">Instrucțiuni și anunțuri de navigație</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Arată rutele pentru biciclete</string>
     <string name="download_map_dialog">Dialogul de descărcare a hărții</string>
-    <string name="dialogs_and_notifications_descr">Control popups, dialoguri și notificări pe care OsmAnd le arată în timpul utilizării.</string>
+    <string name="dialogs_and_notifications_descr">Control popups, dialoguri și notificări.</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">Rețele de noduri</string>
     <string name="suggested_maps">Hărți sugerate</string>
-    <string name="suggested_maps_descr">Aceste hărți trebuie să fie utilizate cu pluginul</string>
+    <string name="suggested_maps_descr">Aceste hărți sunt necesare pentru plugin.</string>
     <string name="added_profiles">Profiluri adăugate</string>
-    <string name="added_profiles_descr">Pluginul adaugă un nou profil la OsmAnd</string>
+    <string name="added_profiles_descr">Profiluri adăugate de plugin</string>
     <string name="shared_string_turn_off">Opriți</string>
     <string name="new_plugin_added">A fost adăugat un plugin nou</string>
     <string name="join_segments">Alăturați segmente</string>
-    <string name="add_new_profile_q">Adăugați un profil nou \'%1$s\'\?</string>
+    <string name="add_new_profile_q">Adăugați profilul nou \'%1$s\'\?</string>
     <string name="save_heading">Includeți titlu</string>
     <string name="save_heading_descr">Salvați poziția fiecarui punct al traseului în timpul înregistrării.</string>
     <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
@@ -2657,17 +2657,17 @@
     <string name="personal_category_name">Personal</string>
     <string name="shared_string_downloading_formatted">Descarcarea %s</string>
     <string name="rendering_value_thick_name">Gros</string>
-    <string name="desert_render_descr">Pentru deșerturi și alte zone slab populate.</string>
-    <string name="select_navigation_icon">Selecteaza iconul pentru navigatie</string>
-    <string name="select_map_icon">Selecteaza iconul pentru harta</string>
-    <string name="delete_profiles_descr">Dupa ce apasati Apply ,profilul sters va fi pierdut definitiv.</string>
+    <string name="desert_render_descr">Pentru deșerturi și alte zone slab populate. Mai detaliat.</string>
+    <string name="select_navigation_icon">Selectează icoana pentru navigație</string>
+    <string name="select_map_icon">Poziționare icoană în timpul repausului</string>
+    <string name="delete_profiles_descr">Apăsând pe \'Aplică\' se vor șterge permanent profilurile eliminate.</string>
     <string name="master_profile">Profil de baza</string>
-    <string name="select_color">Selecteaza culoarea</string>
+    <string name="select_color">Selectează culoarea</string>
     <string name="edit_profiles_descr">Nu puteți șterge profilurile OsmAnd implicite, dar aveți posibilitatea să le dezactivați în ecranul anterior sau să le mutați în partea de jos.</string>
     <string name="edit_profiles">Editarea profilurilor</string>
     <string name="select_nav_profile_dialog_message">Tipul de navigație afectează regulile pentru calcularea rutei.</string>
     <string name="profile_appearance">Aspectul profilului</string>
-    <string name="choose_icon_color_name">Alegeți pictograma, culoarea și numele</string>
+    <string name="choose_icon_color_name">Pictograma, culoarea și numele</string>
     <string name="reorder_profiles">Editează lista de profiluri</string>
     <string name="selected_profile">Profil selectat</string>
     <string name="nautical_render_descr">Pentru navigare nautică.Caracteristici de geamanduri, faruri, râuri, benzi și mărci de mare, porturi, servicii de marinari, și contururi de adâncime.</string>
@@ -2747,7 +2747,7 @@
     <string name="route_recalculation">Recalculare rută</string>
     <string name="accessibility_announce">Anunț</string>
     <string name="login_and_pass">Utilizator și parolă</string>
-    <string name="plugin_global_prefs_info">Aceste setări se aplică la toate profilurile.</string>
+    <string name="plugin_global_prefs_info">Aceste setări se aplicp la toate profilurile.</string>
     <string name="osm_editing">Editare OSM</string>
     <string name="app_mode_osm">OSM</string>
     <string name="permission_is_required">E nevoie de permisiune pentru a utiliza această opțiune.</string>
@@ -2797,4 +2797,65 @@
     <string name="shared_string_importing">Se importă</string>
     <string name="items_added">Articole adăugate</string>
     <string name="shared_string_import_complete">Importarea s-a finalizat</string>
+    <string name="edit_online_source">Editare sursă online</string>
+    <string name="mercator_projection">Proiecție Mercator</string>
+    <string name="speed_camera_pois">POI-uri Camere viteză</string>
+    <string name="speed_cameras_legal_descr">În unele țări sau regiuni, utilizarea aplicațiilor de avertizare a camerelor de viteză este interzisă de lege.
+\n
+\nTrebuie să faceți o alegere în funcție de legea țării dvs.
+\n
+\nSelectați %1$s și veți primi alerte și avertismente cu privire la camerele de viteză.
+\n
+\nSelectați %2$s. Toate datele legate de camerele de viteză: alerte, notificări, POI-uri vor fi șterse până când OsmAnd este reinstalat din nou.</string>
+    <string name="speed_cameras_alert">Alertele camerelor de viteză în unele țări sunt interzise de lege.</string>
+    <string name="use_volume_buttons_as_zoom">Butoane volum ca și zoom</string>
+    <string name="set_working_days_to_continue">Trebuie să setați zile lucrătoare pentru a continua</string>
+    <string name="track_show_start_finish_icons">Afișare icoane start finish</string>
+    <string name="select_track_width">Selecție lățime</string>
+    <string name="keep_screen_on">Țineți ecranul pornit</string>
+    <string name="keep_screen_off">Țineți ecranul oprit</string>
+    <string name="pseudo_mercator_projection">Proiecție pseudo-Mercator</string>
+    <string name="sqlite_db_file">Fișier SQLiteDB</string>
+    <string name="expire_time">Timp expirare</string>
+    <string name="storage_format">Format stocare</string>
+    <string name="shared_string_delete_all_q">Șterg tot\?</string>
+    <string name="uninstall_speed_cameras">Dezinstalare camere radar</string>
+    <string name="shared_string_legal">Legal</string>
+    <string name="keep_active">Mențineți activ</string>
+    <string name="shared_string_uninstall">Dezinstalare</string>
+    <string name="shared_string_tones">tone</string>
+    <string name="shared_string_meters">metrii</string>
+    <string name="add_online_source">Adăugare surse online</string>
+    <string name="quick_action_showhide_mapillary_title">Afișare/ascundere Mapillary</string>
+    <string name="quick_action_mapillary_hide">Ascundere Mapillary</string>
+    <string name="quick_action_mapillary_show">Afișare Mapillary</string>
+    <string name="quick_action_showhide_mapillary_descr">O comutare pentru a afișa sau ascunde stratul Mapillary pe hartă.</string>
+    <string name="routing_attr_length_description">Specificați lungimea vehiculului care trebuie permisă pe rute.</string>
+    <string name="routing_attr_length_name">Limită lungime</string>
+    <string name="shared_string_bearing">Direcție</string>
+    <string name="item_deleted">%1$s șters</string>
+    <string name="shared_string_uninstall_and_restart">Dezinstalare și repornire</string>
+    <string name="quick_action_remove_next_destination">Ștergeți următorul punct de destinație</string>
+    <string name="please_provide_point_name_error">Vă rugăm să furnizați un nume pentru acest punct</string>
+    <string name="search_download_wikipedia_maps">Descărcare hărți Wikipedia</string>
+    <string name="app_mode_enduro_motorcycle">Motocicletă enduro</string>
+    <string name="app_mode_wheelchair">Scaun cu rotile</string>
+    <string name="osm_edit_closed_note">Notă OSM închisă</string>
+    <string name="plan_a_route">Planificați o rută</string>
+    <string name="add_to_a_track">Adăugați la traseu</string>
+    <string name="shared_string_custom">Personalizat</string>
+    <string name="gpx_direction_arrows">Săgeți direcționale</string>
+    <string name="track_coloring_solid">Solid</string>
+    <string name="plan_route_last_edited">Ultima modificare</string>
+    <string name="plan_route_import_track">Importare traseu</string>
+    <string name="plan_route_open_existing_track">Deschideți o rută existentă</string>
+    <string name="plan_route_create_new_route">Creați o rută nouă</string>
+    <string name="shared_string_done">Gata</string>
+    <string name="overwrite_track">Suprascriere traseu</string>
+    <string name="save_as_new_track">Salvați ca și traseu nou</string>
+    <string name="reverse_route">Inversare rută</string>
+    <string name="whole_track">Întreg traseul</string>
+    <string name="next_segment">Segmentul următor</string>
+    <string name="navigation_profile">Profil navigație</string>
+    <string name="routing_attr_height_obstacles_name">Utilizare date altitudine</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -3838,4 +3838,19 @@
     <string name="plan_route_select_track_file_for_open">Выберите файл трека для открытия.</string>
     <string name="shared_string_done">Готово</string>
     <string name="overwrite_track">Перезаписать трек</string>
+    <string name="rourte_between_points_add_track_desc">Выбрать трек, к которому будет добавлен новый сегмент.</string>
+    <string name="navigation_profile">Профиль</string>
+    <string name="threshold_distance">Предельная дистанция</string>
+    <string name="save_as_new_track">Сохранить как новый трек</string>
+    <string name="reverse_route">Обратный маршрут</string>
+    <string name="rourte_between_points_whole_track_button_desc">Весь трек будет перестроен с использованием выбранного профиля.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Только следующий сегмент будет перестроен с использованием выбранного профиля.</string>
+    <string name="next_segment">Следующий сегмент</string>
+    <string name="whole_track">Весь трек</string>
+    <string name="rourte_between_points_warning_desc">Для использования данной опции OsmAnd проложет ваш трек по дорогам.
+\n
+\nДалее вам следует выбрать профиль для построения маршрута с учётом ограничений этого профиля.</string>
+    <string name="rourte_between_points_desc">Выберите как соединять точки: по прямой линии или построением маршрута.</string>
+    <string name="in_case_of_reverse_direction">В случае обратного направления</string>
+    <string name="plan_route_exit_dialog_descr">Закрыть план маршрута без сохранения\? Все изменения будут потеряны.</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -2418,7 +2418,7 @@
     <string name="increase_search_radius">Zväčšiť okruh hľadania</string>
     <string name="nothing_found">Nič sa nenašlo</string>
     <string name="nothing_found_descr">Zmeňte vyhľadávacie kritérium alebo zväčšite polomer hľadania.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Snímky z úrovne ulice</string>
     <string name="open_mapillary">Otvoriť Mapillary</string>
     <string name="shared_string_install">Inštalovať</string>
     <string name="improve_coverage_mapillary">Zlepšiť pokrytie fotografií s Mapillary</string>
@@ -3852,4 +3852,7 @@
     <string name="threshold_distance">Hraničná vzdialenosť</string>
     <string name="navigation_profile">Navigačný profil</string>
     <string name="rourte_between_points_add_track_desc">Zvoľte súbor stopy, pre ktorú bude pridaný nový úsek.</string>
+    <string name="street_level_imagery">Snímky z úrovne ulice</string>
+    <string name="plan_route_exit_dialog_descr">Naozaj chcete zatvoriť plánovanie trasy bez uloženia\? Všetky zmeny sa stratia.</string>
+    <string name="in_case_of_reverse_direction">V prípade opačného smeru</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -684,7 +684,7 @@
     <string name="shared_string_not_selected">Није означено</string>
     <string name="osmand_parking_hour">h</string>
     <string name="osmand_parking_minute">min</string>
-    <string name="traffic_warning_calming">Лежећи полицајац</string>
+    <string name="traffic_warning_calming">Смиривање саобраћаја</string>
     <string name="way_alarms">Упозорења о гужвама у саобраћају</string>
     <string name="background_service_is_enabled_question">Позадинске услуге OsmAnd-а су и даље покренуте. Прекинути и њих?</string>
     <string name="sleep_mode_stop_dialog">Прекинути позадински режим GPS-а?</string>
@@ -1251,7 +1251,7 @@
     <string name="mapillary_widget_descr">Омогућава брзи допринос Мапилару.</string>
     <string name="open_mapillary">Отвори Мапилар</string>
     <string name="mapillary_descr">Мрежне слике улица за све. Откријте места, сарађујте, освојите свет.</string>
-    <string name="mapillary">Мапилар</string>
+    <string name="mapillary">Слике на нивоу улице</string>
     <string name="plugin_mapillary_descr">Мрежне слике улица за све. Откријте места, сарађујте, освојите свет.</string>
     <string name="private_access_routing_req">Ваше одредиште се налази на приватном поседу. Дозволити коришћење приватних путева на овом путовању\?</string>
     <string name="restart_search">Препокрени претрагу</string>
@@ -3836,4 +3836,20 @@
     <string name="plan_route_select_track_file_for_open">Изаберите фајл путање за отварање.</string>
     <string name="shared_string_done">Завршено</string>
     <string name="overwrite_track">Замени стазу</string>
+    <string name="save_as_new_track">Сачувај као нову стазу</string>
+    <string name="reverse_route">Обрнута рута</string>
+    <string name="rourte_between_points_whole_track_button_desc">Читава стаза ће се прерачунати користећи одабрани профил.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Само ће се следећи сегмент прерачунати користећи одабрани профил.</string>
+    <string name="rourte_between_points_desc">Изаберите како повезати тачке, са правом линијом, или израчунајте руту између њих са одабраним профилом.</string>
+    <string name="whole_track">Цела стаза</string>
+    <string name="next_segment">Следећи сегмент</string>
+    <string name="rourte_between_points_warning_desc">Да бисте користили ову опцију, ОсмАнд мора да прилагоди вашу стазу путевима на мапи.
+\n
+\n На следећем кораку мора ћете одабрати навигацијски профил како бисте открили дозвољене путеве и праг удаљености и тиме приближили вашу стазу путевима.</string>
+    <string name="threshold_distance">Праг удаљености</string>
+    <string name="navigation_profile">Навигацијски профил</string>
+    <string name="rourte_between_points_add_track_desc">Изаберите датотеку записа којој ће се додати нови сегмент.</string>
+    <string name="street_level_imagery">Слике на нивоу улице</string>
+    <string name="plan_route_exit_dialog_descr">Јесте ли сигурни да желите затворити План руте без чувања\? Изгуби ћете све промене.</string>
+    <string name="in_case_of_reverse_direction">У случају обрнутог правца</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -2151,7 +2151,7 @@
     <string name="modify_the_search_query">Arama sorgunuzu değiştirin.</string>
     <string name="add_favourites_group_to_markers_descr">İşaretleyicilere eklemek için bir Sık Kullanılanlar kategorisi seçin.</string>
     <string name="import_as_gpx">GPX dosyası olarak içe aktar</string>
-    <string name="plan_route">Rotayı planla</string>
+    <string name="plan_route">Güzergah planla</string>
     <string name="shared_string_list">Liste</string>
     <string name="shared_string_groups">Gruplar</string>
     <string name="passed">Son kullanılan: %1$s</string>
@@ -2255,7 +2255,7 @@
     <string name="mapillary_widget">Mapillary widget\'ı</string>
     <string name="mapillary_widget_descr">Mapillary\'ye hızlıca katkıda bulunmanıza imkan verir.</string>
     <string name="mapillary_descr">Herkes için sokak seviyesinde fotoğraflar. Yerler keşfedin, katkıda bulunun, dünyayı yakalatın.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Sokak seviyesi görüntüleri</string>
     <string name="plugin_mapillary_descr">Herkes için sokak seviyesinde fotoğraflar. Yerler keşfedin, katkıda bulunun, dünyayı yakalayın.</string>
     <string name="parking_options">Park etme seçenekleri</string>
     <string name="routing_attr_allow_motorway_name">Otoyolları kullan</string>
@@ -3810,4 +3810,7 @@
     <string name="threshold_distance">Eşik mesafesi</string>
     <string name="navigation_profile">Navigasyon profili</string>
     <string name="rourte_between_points_add_track_desc">Kendisine yeni bir bölümün ekleneceği bir yol dosyası seçin.</string>
+    <string name="street_level_imagery">Sokak seviyesi görüntüleri</string>
+    <string name="plan_route_exit_dialog_descr">Kaydetmeden güzergah planlamayı kapatmak istediğinize emin misiniz\? Tüm değişiklikleri kaybedeceksiniz.</string>
+    <string name="in_case_of_reverse_direction">Ters yön durumunda</string>
 </resources>

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

@@ -2416,7 +2416,7 @@
     <string name="increase_search_radius">增加搜尋半徑</string>
     <string name="nothing_found">没有找到</string>
     <string name="nothing_found_descr">變更搜尋或增加搜尋半徑。</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">街道級照片</string>
     <string name="mapillary_widget">Mapillary 小工具</string>
     <string name="mapillary_widget_descr">允許快速的提供給 Mapillary。</string>
     <string name="mapillary_descr">把線上街道平面照片給每個人。發覺地點、協作、抓取世界。</string>
@@ -3849,4 +3849,7 @@
     <string name="threshold_distance">門檻距離</string>
     <string name="navigation_profile">導航設定檔</string>
     <string name="rourte_between_points_add_track_desc">選取要加入新片段的軌道檔案。</string>
+    <string name="street_level_imagery">街道級照片</string>
+    <string name="plan_route_exit_dialog_descr">您確定要不儲存就關閉計劃錄線嗎？您將會失去所有變更。</string>
+    <string name="in_case_of_reverse_direction">反向時</string>
 </resources>

OsmAnd/res/values/sizes.xml

@@ -242,6 +242,7 @@
 
 	<dimen name="measurement_tool_select_radius">20dp</dimen>
 	<dimen name="bottom_sheet_content_margin">16dp</dimen>
+	<dimen name="bottom_sheet_exit_button_margin">18dp</dimen>
 	<dimen name="bottom_sheet_content_margin_small">8dp</dimen>
 	<dimen name="content_padding">16dp</dimen>
 	<dimen name="content_padding_small">12dp</dimen>
@@ -396,4 +397,7 @@
 	<dimen name="info_description_line_spacing_multiplier" format="float">1.4</dimen>
 
 	<dimen name="screen_alert_big_warning_icon_size">92dp</dimen>
+
+	<dimen name="radioButtonSize">32dp</dimen>
+	<dimen name="checkBoxSize">24dp</dimen>
 </resources>

OsmAnd/res/values/strings.xml

@@ -14,6 +14,8 @@
     <string name="access_hint_enter_address">Enter address</string>
     <string name="add_address">Add address</string>
     <string name="delete_address">Delete address</string>
+    <string name="in_case_of_reverse_direction">In case of reverse direction</string>
+    <string name="plan_route_exit_dialog_descr">Are you sure you want to close Plan route without saving? You will lose all changes.</string>
     <string name="street_level_imagery">Street-level imagery</string>
     <string name="rourte_between_points_add_track_desc">Select a track file for which a new segment will be added.</string>
     <string name="navigation_profile">Navigation profile</string>
@@ -1248,7 +1250,7 @@
     <string name="mapillary_widget">Mapillary widget</string>
     <string name="mapillary_widget_descr">Allows quick contributions to Mapillary.</string>
     <string name="mapillary_descr">Online street-level photos for everyone. Discover places, collaborate, capture the world.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Street-level imagery</string>
     <string name="plugin_mapillary_descr">Street-level photos for everyone. Discover places, collaborate, capture the world.</string>
     <string name="private_access_routing_req">Your destination is located in an area with private access. Allow using private roads for this trip?</string>
     <string name="restart_search">Restart search</string>

OsmAnd/res/values/styles.xml

@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Dialog_Fullscreen" parent="android:Theme">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@color/color_transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
     <!-- Dashboard styles -->
     <style name="DashboardSubHeader">
         <item name="android:layout_width">0dp</item>
@@ -36,18 +28,6 @@
         <item name="android:background">?attr/dashboard_button</item>
     </style>
 
-    <style name="DashboardSearchButton">
-        <item name="android:paddingTop">@dimen/dashSearchPaddingTop</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:textSize">@dimen/default_sub_text_size</item>
-        <item name="android:gravity">bottom|center_horizontal</item>
-        <item name="android:paddingBottom">@dimen/dashSearchPaddingBot</item>
-        <item name="android:background">?attr/dashboard_button</item>
-    </style>
-
     <style name="DialogActionButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -60,18 +40,6 @@
         <item name="android:background">?attr/btn_round</item>
     </style>
 
-    <style name="DialogCancelButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">@dimen/dialog_button_height</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="android:paddingBottom">8dp</item>
-        <item name="android:textColor">?attr/contextMenuButtonColor</item>
-        <item name="android:background">?attr/selectableItemBackground</item>
-    </style>
-    
     <style name="FirstSplashScreenCustom" parent="OsmandLightTheme.NoActionbar">
         <item name="android:windowBackground">@drawable/first_splash_screen_free</item>
     </style>
@@ -88,43 +56,14 @@
         <item name="android:windowBackground">@drawable/first_splash_screen_free_dev</item>
     </style>
 
-    <style name="OsmandTextFieldBoxes" parent="OsmandDarkTheme">
-        <item name="android:textColorTertiary">@color/white_50_transparent</item>
-        <item name="primaryColor">@color/white_50_transparent</item>
-        <item name="errorColor">@color/coordinate_input_error_color</item>
-    </style>
-
-    <style name="OsmandLightThemeWithLightStatusBar" parent="OsmandLightTheme">
-        <item name="android:statusBarColor">@color/status_bar_route_light</item>
-    </style>
-
     <style name="TextAppearance.App.DarkTextInputLayout" parent="@android:style/TextAppearance">
         <item name="android:textColor">@color/active_color_primary_dark</item>
     </style>
 
-    <style name="OsmandMaterialLightTheme" parent="Theme.MaterialComponents.Light">
-        <item name="colorPrimary">@color/active_color_primary_light</item>
-        <item name="dashboard_divider">@color/divider_color_light</item>
-        <item name="divider_color">@color/divider_color</item>
-        <item name="android:textColorPrimary">@color/text_color_primary_light</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
-    </style>
-
-    <style name="OsmandMaterialDarkTheme" parent="Theme.MaterialComponents">
-        <item name="colorPrimary">@color/active_color_primary_dark</item>
-        <item name="dashboard_divider">@color/divider_color_dark</item>
-        <item name="divider_color">@color/divider_color_dark</item>
-        <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
-    </style>
-
-    <!-- MaterialComponents Widgets override -->
-    <style name="Widget.Styled.Slider" parent="Widget.MaterialComponents.Slider">
-        <item name="android:theme">@style/Theme.MaterialComponents</item>
-    </style>
-
     <!-- Osmand themes styles -->
-    <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
+    <style name="OsmandLightTheme" parent="Theme.MaterialComponents.Light">
+        <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
+        <item name="buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
         <item name="bottom_bar_background_color">@color/bottom_bar_background_color_light</item>
         <item name="android:textDirection">locale</item>
         <item name="android:statusBarColor">@color/status_bar_color_light</item>
@@ -188,6 +127,7 @@
         <item name="dashboard_general_button_text_color">@color/active_color_primary_light</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item>
 
+        <item name="android:textColor">@color/text_color_primary_light</item>
         <item name="android:textColorPrimary">@color/text_color_primary_light</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_light</item>
@@ -196,7 +136,7 @@
         <item name="spinnerListBackground">@color/spinner_list_background_light</item>
         <item name="colorButtonNormal">@color/color_white</item>
 
-        <item name="colorPrimary">@color/osmand_orange</item>
+        <item name="colorPrimary">@color/active_color_primary_light</item>
         <item name="colorPrimaryDark">@color/osmand_orange_dark</item>
         <item name="colorAccent">@color/active_color_primary_light</item>
 
@@ -300,6 +240,8 @@
         <item name="btn_radio_button_left">@drawable/radio_button_left_light</item>
         <item name="btn_radio_button_right">@drawable/radio_button_right_light</item>
         <item name="btn_radio_button_center">@drawable/radio_button_center_light</item>
+        <item name="checkboxStyle">@style/CheckboxStyle</item>
+        <item name="radioButtonStyle">@style/RadioButtonStyle</item>
     </style>
 
     <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -343,9 +285,11 @@
         <!--<item name="actionMenuTextColor">@color/color_white</item>-->
     </style>
 
-    <style name="OsmandLightTheme.SearchTabbar">
-        <item name="android:textColorPrimary">@color/osmand_orange</item>
+    <style name="OsmandLightTheme.SearchTabbar" parent="Widget.MaterialComponents.TabLayout">
+        <item name="tabIndicatorColor">@color/app_bar_main_light</item>
+        <item name="tabTextColor">@color/text_color_secondary_light</item>
         <item name="colorAccent">@color/osmand_orange</item>
+        <item name="tabSelectedTextColor">@color/osmand_orange</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorHint">@color/text_color_secondary_light</item>
     </style>
@@ -371,9 +315,11 @@
         <item name="colorAccent">@color/color_white</item>
     </style>
 
-    <style name="OsmandDarkTheme.SearchTabbar">
-        <item name="android:textColorPrimary">@color/osmand_orange</item>
+    <style name="OsmandDarkTheme.SearchTabbar"  parent="Widget.MaterialComponents.TabLayout">
+        <item name="tabIndicatorColor">@color/app_bar_main_light</item>
+        <item name="tabTextColor">@color/text_color_secondary_dark</item>
         <item name="colorAccent">@color/osmand_orange</item>
+        <item name="tabSelectedTextColor">@color/osmand_orange</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorHint">@color/text_color_secondary_dark</item>
     </style>
@@ -420,7 +366,7 @@
         <item name="colorControlNormal">?attr/coordinate_input_edit_text_normal</item>
     </style>
 
-    <style name="OsmandDarkTheme" parent="Theme.AppCompat">
+    <style name="OsmandDarkTheme" parent="Theme.MaterialComponents">
         <item name="bottom_bar_background_color">@color/bottom_bar_background_color_dark</item>
         <item name="android:textDirection">locale</item>
         <item name="android:statusBarColor">@color/status_bar_color_dark</item>
@@ -478,6 +424,7 @@
         <item name="dashboard_general_button_text_color">@color/active_color_primary_dark</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
 
+        <item name="android:textColor">@color/text_color_primary_dark</item>
         <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
@@ -501,6 +448,8 @@
         <item name="search_tabbar_layout_theme">@style/OsmandDarkTheme.SearchTabbar</item>
         <item name="toolbar_theme">@style/OsmandDarkTheme</item>
         <item name="new_app_theme">@style/OsmandDarkTheme</item>
+
+        <item name="colorPrimary">@color/active_color_primary_dark</item>
         <item name="colorAccent">@color/active_color_primary_dark</item>
 
         <item name="contextMenuButtonColor">@color/osmand_orange</item>
@@ -584,6 +533,8 @@
         <item name="btn_radio_button_left">@drawable/radio_button_left_dark</item>
         <item name="btn_radio_button_right">@drawable/radio_button_right_dark</item>
         <item name="btn_radio_button_center">@drawable/radio_button_center_dark</item>
+        <item name="checkboxStyle">@style/CheckboxStyle</item>
+        <item name="radioButtonStyle">@style/RadioButtonStyle</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">
@@ -634,6 +585,16 @@
         <item name="elevation">0dp</item>
     </style>
 
+    <style name="CheckboxStyle" parent="Widget.AppCompat.CompoundButton.CheckBox">
+        <item name="android:height">@dimen/checkBoxSize</item>
+        <item name="android:width">@dimen/checkBoxSize</item>
+    </style>
+
+    <style name="RadioButtonStyle" parent="Widget.AppCompat.CompoundButton.RadioButton">
+        <item name="android:height">@dimen/radioButtonSize</item>
+        <item name="android:width">@dimen/radioButtonSize</item>
+    </style>
+
     <style name="Widget.Styled.LightActionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@color/color_white</item>
     </style>

OsmAnd/res/xml/accessibility_settings.xml

@@ -47,29 +47,6 @@
 		android:layout="@layout/simple_divider_item"
 		android:selectable="false" />
 
-	<PreferenceCategory
-		android:key="route_recalculation"
-		android:layout="@layout/preference_category_with_descr"
-		android:title="@string/route_recalculation" />
-
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="disable_offroute_recalc"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/access_disable_offroute_recalc" />
-
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="disable_wrong_direction_recalc"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/access_disable_wrong_direction_recalc" />
-
-	<Preference
-		android:layout="@layout/simple_divider_item"
-		android:selectable="false" />
-
 	<net.osmand.plus.settings.preferences.ListPreferenceEx
 		android:key="direction_style"
 		android:layout="@layout/preference_with_descr"

OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java

@@ -43,7 +43,7 @@ public abstract class CacheFragmentStatePagerAdapter extends FragmentStatePagerA
     private SparseArray<Fragment> mPages;
 
     public CacheFragmentStatePagerAdapter(FragmentManager fm) {
-        super(fm);
+        super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         mPages = new SparseArray<Fragment>();
         mFm = fm;
     }

OsmAnd/src/net/osmand/AndroidUtils.java

@@ -54,6 +54,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
@@ -96,20 +97,24 @@ public class AndroidUtils {
 		return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
 	}
 
-	public static void softKeyboardDelayed(final View view) {
+	public static void softKeyboardDelayed(final Activity activity, final View view) {
 		view.post(new Runnable() {
 			@Override
 			public void run() {
 				if (!isHardwareKeyboardAvailable(view.getContext())) {
-					showSoftKeyboard(view);
+					showSoftKeyboard(activity,view);
 				}
 			}
 		});
 	}
 
-	public static void showSoftKeyboard(final View view) {
+	public static void showSoftKeyboard(final Activity activity, final View view) {
 		InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
 		if (imm != null) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				KeyguardManager keyguardManager = (KeyguardManager) view.getContext().getSystemService(Context.KEYGUARD_SERVICE);
+				keyguardManager.requestDismissKeyguard(activity,null);
+			}
 			imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
 		}
 	}
@@ -169,11 +174,11 @@ public class AndroidUtils {
 		return intent.resolveActivity(context.getPackageManager()) != null;
 	}
 
-	public static boolean isActivityNotDestroyed(Activity activity) {
+	public static boolean isActivityNotDestroyed(@Nullable Activity activity) {
 		if (Build.VERSION.SDK_INT >= 17) {
-			return !activity.isFinishing() && !activity.isDestroyed();
+			return activity != null && !activity.isFinishing() && !activity.isDestroyed();
 		}
-		return !activity.isFinishing();
+		return activity != null && !activity.isFinishing();
 	}
 
 	public static Spannable replaceCharsWithIcon(String text, Drawable icon, String[] chars) {

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

@@ -36,6 +36,7 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.ListPopupWindow;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
@@ -547,6 +548,19 @@ public class UiUtilities {
 		compoundButton.setBackgroundColor(Color.TRANSPARENT);
 	}
 
+	public static void setupToolbarOverflowIcon(Toolbar toolbar, @DrawableRes int iconId, @ColorRes int colorId) {
+		Context ctx = toolbar.getContext();
+		if (ctx != null) {
+			Drawable icon = ContextCompat.getDrawable(ctx, iconId);
+			toolbar.setOverflowIcon(icon);
+			if (icon != null) {
+				int color = ContextCompat.getColor(ctx, colorId);
+				DrawableCompat.setTint(icon.mutate(), color);
+				toolbar.setOverflowIcon(icon);
+			}
+		}
+	}
+
 	public static ViewGroup createSliderView(@NonNull Context ctx, boolean nightMode) {
 		return (ViewGroup) getInflater(ctx, nightMode).inflate(R.layout.slider, null, false);
 	}
@@ -692,14 +706,6 @@ public class UiUtilities {
 		}
 	}
 
-	public static LayoutInflater getMaterialInflater(Context ctx, boolean nightMode) {
-		return LayoutInflater.from(getThemedMaterialContext(ctx, nightMode));
-	}
-
-	private static Context getThemedMaterialContext(Context context, boolean nightMode) {
-		return getThemedContext(context, nightMode, R.style.OsmandMaterialLightTheme, R.style.OsmandMaterialDarkTheme);
-	}
-
 	public static LayoutInflater getInflater(Context ctx, boolean nightMode) {
 		return LayoutInflater.from(getThemedContext(ctx, nightMode));
 	}

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

@@ -19,7 +19,6 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiType;
@@ -102,7 +101,7 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 		createMenuItem(menu, FILTER, R.string.filter_current_poiButton, 
 				R.drawable.ic_action_done, 
 				//R.drawable.a_1_navigation_accept_light, R.drawable.a_1_navigation_accept_dark,
-				MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT | MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+				MenuItem.SHOW_AS_ACTION_WITH_TEXT | MenuItem.SHOW_AS_ACTION_ALWAYS);
 		return super.onCreateOptionsMenu(menu);
 	}	
 	

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

@@ -249,7 +249,7 @@ public class FavoritesSearchFragment extends DialogFragment {
 
 	private void openKeyboard() {
 		searchEditText.requestFocus();
-		AndroidUtils.softKeyboardDelayed(searchEditText);
+		AndroidUtils.softKeyboardDelayed(getActivity(), searchEditText);
 	}
 
 	public void hideKeyboard() {

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

@@ -32,7 +32,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ActionMode;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.Location;
@@ -435,7 +434,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu.clear();
-		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
+		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark, MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
 		mi.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -452,11 +451,11 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 		((FavoritesActivity) getActivity()).updateListViewFooter(footerView);
 
 
-		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, 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);
+		if (!mi.isActionViewExpanded()) {
+			createMenuItem(menu, IMPORT_FAVOURITES_ID, R.string.shared_string_add_to_favorites, R.drawable.ic_action_plus, MenuItem.SHOW_AS_ACTION_ALWAYS);
+			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItem.SHOW_AS_ACTION_ALWAYS, true);
+			createMenuItem(menu, SELECT_MAP_MARKERS_ID, R.string.select_map_markers, R.drawable.ic_action_flag, MenuItem.SHOW_AS_ACTION_ALWAYS);
+			createMenuItem(menu, DELETE_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark, MenuItem.SHOW_AS_ACTION_ALWAYS);
 		}
 	}
 
@@ -483,7 +482,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 				enableSelectionMode(true);
 				createMenuItem(menu, SELECT_MAP_MARKERS_ACTION_MODE_ID, R.string.select_map_markers,
 						R.drawable.ic_action_flag,
-						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+						MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				favoritesSelected.clear();
 				groupsToDelete.clear();
 				favouritesAdapter.notifyDataSetInvalidated();
@@ -546,7 +545,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 				enableSelectionMode(true);
 				createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete,
 						R.drawable.ic_action_delete_dark,
-						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+						MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				favoritesSelected.clear();
 				groupsToDelete.clear();
 				favouritesAdapter.notifyDataSetInvalidated();

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

@@ -18,7 +18,6 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 
 import com.jwetherell.openmap.common.LatLonPoint;
@@ -106,7 +105,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
 			light = false;
 		}
 		MenuItem menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
-		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		menuItem = menuItem.setIcon(app.getUIUtilities().getIcon(R.drawable.ic_action_marker_dark, light));
 
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {

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

@@ -10,8 +10,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ExpandableListView;
 
-import androidx.core.view.MenuItemCompat;
-
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 
@@ -64,7 +62,7 @@ public abstract class OsmandExpandableListActivity extends
 				return onOptionsItemSelected(item);
 			}
 		});
-		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
+		menuItem.setShowAsAction(menuItemType);
 		return menuItem;
 	}
 

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

@@ -10,8 +10,6 @@ import android.widget.HeaderViewListAdapter;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
-import androidx.core.view.MenuItemCompat;
-
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -68,7 +66,7 @@ public abstract class OsmandListActivity extends
 				return onOptionsItemSelected(item);
 			}
 		});
-		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
+		menuItem.setShowAsAction(menuItemType);
 		return menuItem;
 	}
 

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

@@ -130,7 +130,6 @@ public class PluginsActivity extends OsmandListActivity implements DownloadIndex
 	}
 
 	protected class PluginsListAdapter extends ArrayAdapter<Object> {
-
 		PluginsListAdapter() {
 			super(PluginsActivity.this, R.layout.plugins_list_item, new ArrayList<>());
 			addAll(getMyApplication().getAidlApi().getConnectedApps());
@@ -193,7 +192,7 @@ public class PluginsActivity extends OsmandListActivity implements DownloadIndex
 				AndroidUtils.removeLinkUnderline(pluginDescription);
 
 				OsmandApplication app = getMyApplication();
-				int color = AndroidUtils.getColorFromAttr(app, R.attr.list_background_color);
+				int color = AndroidUtils.getColorFromAttr(PluginsActivity.this, R.attr.list_background_color);
 				pluginLogo.setImageDrawable(UiUtilities.tintDrawable(plugin.getLogoResource(), color));
 				pluginLogo.setOnClickListener(new View.OnClickListener() {
 					@Override

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

@@ -39,7 +39,7 @@ public class TabActivity extends ActionBarProgressActivity {
 		private List<TabItem> mTabs;
 
 		public OsmandFragmentPagerAdapter(FragmentManager fm, List<TabItem> items) {
-			super(fm);
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 			mTabs = items;
 		}
 

OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java

@@ -2,6 +2,7 @@ package net.osmand.plus.activities.actions;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -9,7 +10,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.ClipboardManager;
 import android.text.Html;
 import android.widget.Toast;
 

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

@@ -16,7 +16,6 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 
 import net.osmand.data.LatLon;
@@ -82,7 +81,7 @@ public class SearchAddressFragment extends Fragment {
 		}
 		if(getActivity() instanceof SearchAddressActivity) {
 			MenuItem menuItem = menu.add(0, SELECT_POINT, 0, "");
-			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			if (getApplication().accessibilityEnabled())
 				menuItem.setTitle(R.string.shared_string_ok);
 			menuItem = menuItem.setIcon(R.drawable.ic_action_done);
@@ -95,7 +94,7 @@ public class SearchAddressFragment extends Fragment {
 			});
 		} else {
 			MenuItem menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
-			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			menuItem = menuItem.setIcon(R.drawable.ic_action_marker_dark);
 
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -107,7 +106,7 @@ public class SearchAddressFragment extends Fragment {
 			});
 			if (ENABLE_ONLINE_ADDRESS) {
 				menuItem = menu.add(0, ONLINE_SEARCH, 0, R.string.search_online_address);
-				MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+				menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 				menuItem = menuItem.setIcon(R.drawable.ic_world_globe_dark);
 				menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 					@Override

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

@@ -34,7 +34,6 @@ import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.MenuItemCompat;
 import androidx.core.view.ViewCompat;
 
 import net.osmand.Location;
@@ -124,7 +123,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 	public boolean onCreateOptionsMenu(Menu omenu) {
 		Menu menu = getClearToolbar(true).getMenu();
 		searchPOILevel = menu.add(0, SEARCH_MORE, 0, R.string.search_POI_level_btn);
-		MenuItemCompat.setShowAsAction(searchPOILevel, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		searchPOILevel.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		searchPOILevel.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -133,7 +132,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 
 		});
 		showFilterItem = menu.add(0, FILTER, 0, R.string.search_poi_filter);
-		MenuItemCompat.setShowAsAction(showFilterItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		showFilterItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		showFilterItem = showFilterItem.setIcon(getMyApplication().getUIUtilities().getIcon(
 				R.drawable.ic_action_filter_dark));
 		showFilterItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -156,7 +155,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		});
 
 		showOnMapItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
-		MenuItemCompat.setShowAsAction(showOnMapItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		showOnMapItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		showOnMapItem = showOnMapItem.setIcon(getMyApplication().getUIUtilities().getIcon(
 				R.drawable.ic_show_on_map));
 		showOnMapItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -176,10 +175,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		showOnMapItem.setEnabled(!isNameSearch() || amenityAdapter.getCount() > 0);
 		if (filter != null && !isNameSearch()) {
 			createMenuItem(omenu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item, R.drawable.ic_action_favorite,
-					MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+					MenuItem.SHOW_AS_ACTION_IF_ROOM);
 			if (!filter.isStandardFilter()) {
 				createMenuItem(omenu, DELETE_FILTER, R.string.shared_string_delete, R.drawable.ic_action_delete_dark,
-						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+						MenuItem.SHOW_AS_ACTION_IF_ROOM);
 			}
 		}
 		updateButtonState(false);

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

@@ -12,7 +12,6 @@ import android.view.animation.LinearInterpolator;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 
-import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 
 import net.osmand.plus.R;
@@ -129,7 +128,7 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
 		stopProgress();
 
 		progressBar.setProgress(0);
-		ViewCompat.setAlpha(progressBar, 1f);
+		progressBar.setAlpha(1f);
 		progressBar.setVisibility(View.VISIBLE);
 
 		animatorCompat = ValueAnimator.ofInt(0);

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

@@ -1036,11 +1036,11 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			try {
 				Method m = mr.getClass().getDeclaredMethod("setOrientationHint", Integer.TYPE);
 				Display display = ((WindowManager) mapActivity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-				if (display.getOrientation() == Surface.ROTATION_0) {
+				if (display.getRotation() == Surface.ROTATION_0) {
 					m.invoke(mr, 90);
-				} else if (display.getOrientation() == Surface.ROTATION_270) {
+				} else if (display.getRotation() == Surface.ROTATION_270) {
 					m.invoke(mr, 180);
-				} else if (display.getOrientation() == Surface.ROTATION_180) {
+				} else if (display.getRotation() == Surface.ROTATION_180) {
 					m.invoke(mr, 270);
 				}
 			} catch (Exception e) {

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

@@ -4,10 +4,10 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.ClipboardManager;
 import android.util.TypedValue;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;

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

@@ -101,7 +101,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		if (mapView != null) {
 			WindowManager wm = (WindowManager) app.getSystemService(Context.WINDOW_SERVICE);
 			if (wm != null) {
-				int orientation = wm.getDefaultDisplay().getOrientation();
+				int orientation = wm.getDefaultDisplay().getRotation();
 				app.getLocationProvider().updateScreenOrientation(orientation);
 				mapView.setMapLocationListener(this);
 			}

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

@@ -13,7 +13,6 @@ import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
 
 import androidx.annotation.NonNull;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
@@ -106,7 +105,7 @@ public abstract class OsmandExpandableListFragment extends BaseOsmAndFragment
 				return onOptionsItemSelected(item);
 			}
 		});
-		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
+		menuItem.setShowAsAction(menuItemType);
 		return menuItem;
 	}
 

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

@@ -21,7 +21,7 @@ public class BaseBottomSheetItem {
 	protected int layoutId = INVALID_ID;
 	private Object tag;
 	private boolean disabled;
-	private View.OnClickListener onClickListener;
+	protected View.OnClickListener onClickListener;
 	protected int position = INVALID_POSITION;
 
 	public View getView() {

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

@@ -0,0 +1,76 @@
+package net.osmand.plus.base.bottomsheetmenu;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.annotation.ColorRes;
+import androidx.annotation.LayoutRes;
+
+import net.osmand.plus.R;
+
+import static net.osmand.plus.UiUtilities.*;
+import static net.osmand.plus.UiUtilities.DialogButtonType.PRIMARY;
+
+public class BottomSheetItemButton extends SimpleBottomSheetItem {
+
+	protected CharSequence description;
+
+	DialogButtonType buttonType;
+
+	LinearLayout buttonView;
+
+	public BottomSheetItemButton(View customView,
+	                             @LayoutRes int layoutId,
+	                             Object tag,
+	                             boolean disabled,
+	                             View.OnClickListener onClickListener,
+	                             int position,
+	                             Drawable icon,
+	                             Drawable background,
+	                             CharSequence title,
+	                             @ColorRes int titleColorId,
+	                             boolean iconHidden,
+	                             DialogButtonType buttonType) {
+		super(customView, layoutId, tag, disabled, onClickListener, position, icon, background, title,
+				titleColorId, iconHidden);
+		this.buttonType = buttonType;
+	}
+
+	@Override
+	public void inflate(Context context, ViewGroup container, boolean nightMode) {
+		super.inflate(context, container, nightMode);
+		buttonView = view.findViewById(R.id.button);
+		if (buttonView != null) {
+			setupDialogButton(nightMode, buttonView, buttonType, title);
+			buttonView.setOnClickListener(onClickListener);
+		}
+	}
+
+	public static class Builder extends SimpleBottomSheetItem.Builder {
+
+		protected DialogButtonType buttonType = PRIMARY;
+
+		public Builder setButtonType(DialogButtonType buttonType) {
+			this.buttonType = buttonType;
+			return this;
+		}
+
+		public BottomSheetItemButton create() {
+			return new BottomSheetItemButton(customView,
+					layoutId,
+					tag,
+					disabled,
+					onClickListener,
+					position,
+					icon,
+					background,
+					title,
+					titleColorId,
+					iconHidden,
+					buttonType);
+		}
+	}
+}

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

@@ -1,6 +1,7 @@
 package net.osmand.plus.dashboard;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.location.Location;
 import android.os.Bundle;
@@ -9,8 +10,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -37,10 +38,10 @@ public abstract class DashBaseFragment extends Fragment {
 	}
 
 	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		if (activity instanceof MapActivity) {
-			dashboard = ((MapActivity) activity).getDashboard();
+	public void onAttach(@NonNull Context context) {
+		super.onAttach(context);
+		if (context instanceof MapActivity) {
+			dashboard = ((MapActivity) context).getDashboard();
 			dashboard.onAttach(this);
 		}
 	}
@@ -171,8 +172,8 @@ public abstract class DashBaseFragment extends Fragment {
 		@Override
 		public void onDismiss() {
 			dashboardOnMap.blacklistFragmentByTag(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 			Snackbar.make(parentView, dashboardOnMap.getMyApplication().getResources()
 					.getString(R.string.shared_string_card_was_hidden), Snackbar.LENGTH_LONG)
 					.setAction(R.string.shared_string_undo, new View.OnClickListener() {
@@ -186,8 +187,8 @@ public abstract class DashBaseFragment extends Fragment {
 
 		public void onUndo() {
 			dashboardOnMap.unblacklistFragmentClass(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 		}
 	}
 }

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

@@ -9,8 +9,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.core.view.ViewCompat;
-
 import com.google.android.material.snackbar.Snackbar;
 
 import net.osmand.plus.OsmandApplication;
@@ -98,8 +96,8 @@ public class DashErrorFragment extends DashBaseFragment {
 		@Override
 		public void onDismiss() {
 			dashboardOnMap.hideFragmentByTag(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 			Snackbar.make(parentView, dashboardOnMap.getMyApplication().getResources()
 					.getString(R.string.shared_string_card_was_hidden), Snackbar.LENGTH_LONG)
 					.setAction(R.string.shared_string_undo, new View.OnClickListener() {
@@ -113,8 +111,8 @@ public class DashErrorFragment extends DashBaseFragment {
 
 		public void onUndo() {
 			dashboardOnMap.unhideFragmentByTag(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 		}
 	}
 }

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

@@ -1217,7 +1217,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 	}
 
 	private void setTranslationY(View v, int y) {
-		ViewCompat.setTranslationY(v, y);
+		v.setTranslationY(y);
 	}
 
 	@SuppressLint("NewApi")